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.2 -r1.3
--- openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	15 Jan 2004 02:38:09 -0000	1.2
+++ openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	16 Jan 2004 01:43:40 -0000	1.3
@@ -53,29 +53,29 @@
                     element_id:integer
                 }
             }
-        }
-        Show {
-            description {
-                Render the portal element, returning a chunk of HTML.
+            Show {
+                description {
+                    Render the portal element, returning a chunk of HTML.
+                }
+                input {
+                    cf:string
+                }
+                output {
+                    output:string
+                }
             }
-            input {
-                cf:string
+            RemoveSelfFromPage {
+                description {
+                    Tell the PE to remove itself from a page.
+                }
+                input {
+                    page_id:integer
+                    instance_id:integer
+                }
+                output {
+                }
             }
-            output {
-                output:string
-            }
         }
-        RemoveSelfFromPage {
-            description {
-                Tell the PE to remove itself from a page.
-            }
-            input {
-                page_id:integer
-                instance_id:integer
-            }
-            output {
-            }
-        }
     }
 }
 
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.2 -r1.3
--- openacs-4/contrib/packages/portal/tcl/datasource-procs.xql	15 Jan 2004 02:38:09 -0000	1.2
+++ openacs-4/contrib/packages/portal/tcl/datasource-procs.xql	16 Jan 2004 01:43:40 -0000	1.3
@@ -2,6 +2,22 @@
 
 <queryset>
 
+    <fullquery name="portal::datasource::get.select_datasource">
+        <querytext>
+            select *
+            from portal_datasources
+            where datasource_id = :datasource_id
+        </querytext>
+    </fullquery>
+
+    <fullquery name="portal::datasource::get_id.select_id">
+        <querytext>
+            select datasource_id
+            from portal_datasources
+            where name = :name
+        </querytext>
+    </fullquery>
+
     <fullquery name="portal::datasource::delete.get_datasource_id">
         <querytext>
            select datasource_id