Index: openacs-4/contrib/packages/portal/portal.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/portal.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/contrib/packages/portal/portal.info	15 Jan 2004 00:16:41 -0000	1.5
+++ openacs-4/contrib/packages/portal/portal.info	12 Feb 2004 14:59:05 -0000	1.6
@@ -5,7 +5,7 @@
     <package-name>Portal</package-name>
     <pretty-plural>Portals</pretty-plural>
     <initial-install-p>f</initial-install-p>
-    <singleton-p>t</singleton-p>
+    <singleton-p>f</singleton-p>
     
     <version name="0.9" url="http://dotlrn.openforce.net/portal-0.9.apm">
         <owner url="mailto:arjun@openforce.net">Arjun Sanyal</owner>
Index: openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl	22 Jan 2004 02:50:12 -0000	1.3
+++ openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl	12 Feb 2004 14:59:05 -0000	1.4
@@ -27,7 +27,7 @@
 
 namespace eval portal::datasource {
 
-    ad_proc new_from_spec {
+    ad_proc new {
         -spec:required
     } {
 
Index: openacs-4/contrib/packages/portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/portal-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	1 Feb 2004 03:08:11 -0000	1.11
+++ openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	12 Feb 2004 14:59:05 -0000	1.12
@@ -293,6 +293,7 @@
     ad_proc -public configure {
         {-referer ""}
         {-template_p f}
+        package_id
         portal_id
         return_url
     } {
@@ -369,6 +370,19 @@
         append theme_chunk "<input type=submit name=op value=\"Change Theme\"></form>"
         append template "$theme_chunk"
 
+        set datasource_html "<select name=datasource_id>\n"
+        foreach datasource {[datasource_list -package_id $package_id]} {
+            append datasource_chunk "<option value=[lindex $element 0]>[lindex $element 1]</option>\n"
+        }
+        append datasource_chunk "</select>\n"
+        append template "
+            <form method=post action=@action_string@>
+            <input type=hidden name=portal_id value=@portal_id@>
+            <input type=hidden name=return_url value=@return_url@>
+            $datasource_chunk
+            <input type=\"submit\" name=\"op\" value=\"Add new portlet\">\n
+            </form>\n"
+
         #
         # Per-page template chunks
         #
@@ -951,4 +965,13 @@
         return [db_list_of_lists select_hidden_elements {}]
     }
 
+    ad_proc datasource_list {
+        -package_id:required
+    } {
+        Returns a list of portal datasources which have been mapped to the given portal
+        package instance.
+    } {
+        return [db_list_of_lists select_datasources {}]
+    }
+
 }
Index: openacs-4/contrib/packages/portal/tcl/portal-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/portal-procs.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/contrib/packages/portal/tcl/portal-procs.xql	1 Feb 2004 03:08:11 -0000	1.5
+++ openacs-4/contrib/packages/portal/tcl/portal-procs.xql	12 Feb 2004 14:59:05 -0000	1.6
@@ -212,4 +212,14 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::datasource_list.select_datasources">
+        <querytext>
+            select pd.datasource_id, pd.name
+            from portal_datasources pd, portal_datasource_map pdm
+            where pdm.package_id = :package_id
+              and pd.datasource_id = pdm.datasource_id
+            order by pd.name
+        </querytext>
+    </fullquery>
+
 </queryset>