Index: openacs-4/packages/xowiki-portlet/xowiki-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/xowiki-portlet.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/xowiki-portlet/xowiki-portlet.info	27 Feb 2008 09:21:59 -0000	1.2
+++ openacs-4/packages/xowiki-portlet/xowiki-portlet.info	24 Apr 2008 08:38:30 -0000	1.3
@@ -18,7 +18,7 @@
         <provides url="xowiki-portlet" version="2.0"/>
         <requires url="dotlrn" version="1.0d1"/>
         <requires url="new-portal" version="0.2d1"/>
-        <requires url="xowiki" version="0.81"/>
+        <requires url="xowiki" version="0.83"/>
 
         <callbacks>
             <callback type="after-install"  proc="::xowiki_portlet::after-install"/>
Index: openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl	27 Feb 2008 09:22:00 -0000	1.2
+++ openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl	24 Apr 2008 08:38:30 -0000	1.3
@@ -161,16 +161,18 @@
       select datasource_id from portal_datasources where name = :name
     } -default "0"]
     
-    if {$ds_id == 0} {
-      error "No datasource id found for $name"
+    if {$ds_id != 0} {
+      #
+      # drop the datasource
+      #
+      ::xo::db::sql::portal_datasource delete -datasource_id $ds_id
+      #
+    } else {
+      ns_log notice "No datasource id found for $name"
     }
+
+    #  drop the operations
     #
-    # drop the datasource
-    #
-    ::xo::db::sql::portal_datasource delete -datasource_id $ds_id
-    #
-    #  drop the operation
-    #
     foreach operation {
       GetMyName GetPrettyName Link AddSelfToPage 
       Show Edit RemoveSelfFromPage
Index: openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl	27 Feb 2008 09:22:00 -0000	1.2
+++ openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl	24 Apr 2008 08:38:30 -0000	1.3
@@ -157,17 +157,20 @@
     set ds_id [db_string dbqd..get_ds_id {
       select datasource_id from portal_datasources where name = :name
     } -default "0"]
-    
-    if {$ds_id == 0} {
-      error "No datasource id found for $name"
-    }
+
+    if {$ds_id != 0} {
+      #
+      # drop the datasource
+      #
+      ::xo::db::sql::portal_datasource delete -datasource_id $ds_id
+      #
+    } else {
+      ns_log notice "No datasource id found for $name"
+    }    
+
     #
-    # drop the datasource
+    #  drop the operations
     #
-    ::xo::db::sql::portal_datasource delete -datasource_id $ds_id
-    #
-    #  drop the operation
-    #
     foreach operation {
       GetMyName GetPrettyName Link AddSelfToPage 
       Show Edit RemoveSelfFromPage
Index: openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl	9 Apr 2008 15:28:03 -0000	1.4
+++ openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl	24 Apr 2008 08:38:30 -0000	1.5
@@ -57,7 +57,7 @@
 	 -folder_id [::$xowiki_package_id folder_id] \
 	 -with_subtypes true \
 	 -from_clause ", xowiki_page P" \
-	 -where_clause "P.page_id = cr.revision_id" \
+	 -where_clause "P.page_id = bt.revision_id" \
 	 -orderby "ci.name" \
 	] {
 	  if {[regexp {^::[0-9]} $name]} continue