Index: openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	15 Jan 2004 00:16:41 -0000	1.1
+++ openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	15 Jan 2004 02:38:09 -0000	1.2
@@ -79,7 +79,9 @@
     }
 }
 
-ad_proc portal::install::package_uninstall {
+ad_proc portal::install::package_uninstall {} {
+    Uninstall portal_datasource service contract
+} {
     acs_sc::contract::delete -name portal_datasource
 }
 
Index: openacs-4/contrib/packages/portal/tcl/datasource-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/datasource-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/tcl/datasource-procs.xql	25 Oct 2002 21:29:17 -0000	1.1
+++ openacs-4/contrib/packages/portal/tcl/datasource-procs.xql	15 Jan 2004 02:38:09 -0000	1.2
@@ -2,20 +2,12 @@
 
 <queryset>
 
-    <fullquery name="portal::datasource::get.select_datasource">
+    <fullquery name="portal::datasource::delete.get_datasource_id">
         <querytext>
-            select *
-            from portal_datasources
-            where datasource_id = :datasource_id
+           select datasource_id
+           from portal_datasources
+           where name = :name;
         </querytext>
     </fullquery>
 
-    <fullquery name="portal::datasource::get_id.select_id">
-        <querytext>
-            select datasource_id
-            from portal_datasources
-            where name = :name
-        </querytext>
-    </fullquery>
-
 </queryset>