Index: openacs-4/packages/new-portal/new-portal.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/new-portal.info,v
diff -u -N -r1.17.2.2 -r1.17.2.3
--- openacs-4/packages/new-portal/new-portal.info	5 May 2003 09:22:34 -0000	1.17.2.2
+++ openacs-4/packages/new-portal/new-portal.info	12 Jun 2003 01:33:29 -0000	1.17.2.3
@@ -18,7 +18,7 @@
         <vendor url="http://openforce.net/">OpenForce, Inc.</vendor>
         <description format="text/plain">New Portal Package aka NPP. Portals are used to aggregate content from different sources within a single page.  Props to Ian Baker for &quot;Portal&quot;.</description>
 
-        <provides url="new-portal" version="0.1a"/>
+        <provides url="new-portal" version="0.1b"/>
         <requires url="acs-kernel" version="4.0"/>
 
         <parameters>
Index: openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql,v
diff -u -N -r1.20 -r1.20.2.1
--- openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql	21 Aug 2002 15:22:39 -0000	1.20
+++ openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql	12 Jun 2003 01:33:30 -0000	1.20.2.1
@@ -174,4 +174,39 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::datasource_new.new_datasource">
+        <querytext>
+           begin
+             :1 := portal_datasource.new(
+    		     name => :name,
+    		     description => :description     
+  	     );
+           end;
+        </querytext>
+    </fullquery>
+
+    <fullquery name="portal::datasource_set_def_param.set_def_param">
+        <querytext>
+           begin
+             :1 := portal_datasource.set_def_param(
+		     datasource_id => :datasource_id,
+		     config_required_p => :config_required_p,
+		     configured_p => :configured_p, 
+		     key => :key, 
+		     value => :value
+	     ):
+           end;
+        </querytext>
+    </fullquery>
+
+    <fullquery name="portal::datasource_delete.delete_datasource">
+        <querytext>
+           begin
+             portal_datasource.delete(
+               datasource_id => :datasource_id
+  	     );
+           end;
+        </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql,v
diff -u -N -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql	23 May 2003 12:23:35 -0000	1.9.2.1
+++ openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql	12 Jun 2003 01:33:30 -0000	1.9.2.2
@@ -198,4 +198,12 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::datasource_delete.delete_datasource">
+        <querytext>
+             select portal_datasource__delete(
+    		:datasource_id
+  	     )
+        </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -N -r1.156.2.7 -r1.156.2.8
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	5 Jun 2003 17:10:18 -0000	1.156.2.7
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	12 Jun 2003 01:33:30 -0000	1.156.2.8
@@ -2307,7 +2307,6 @@
 
 }
 
-
 ad_proc -private portal::datasource_new {
     {-name:required}
     {-description:required}
@@ -2318,7 +2317,6 @@
 } {
     return [db_exec_plsql new_datasource {}]
 }
-
 ad_proc -private portal::datasource_set_def_param {
     {-datasource_id:required}
     {-config_required_p:required}
@@ -2333,4 +2331,20 @@
     db_exec_plsql set_def_param {}
 }
 
+ad_proc -private portal::datasource_delete {
+    {-name:required}
+} {
 
+    @author Don Baccus (dhogaza@pacifier.com)
+
+} {
+
+    if { ![db_0or1row get_datasource_id {}] } {
+        ad_return -code error "Datasource \"$name\" does not exist"
+    }
+
+    return [db_exec_plsql delete_datasource {}]
+
+}
+
+
Index: openacs-4/packages/new-portal/tcl/portal-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v
diff -u -N -r1.41.2.1 -r1.41.2.2
--- openacs-4/packages/new-portal/tcl/portal-procs.xql	17 Oct 2002 09:39:44 -0000	1.41.2.1
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql	12 Jun 2003 01:33:30 -0000	1.41.2.2
@@ -747,4 +747,12 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::datasource_delete.get_datasource_id">
+        <querytext>
+           select datasource_id
+           from portal_datasources
+           where name = :name;
+        </querytext>
+    </fullquery>
+
 </queryset>