Index: openacs-4/packages/bookmarks/www/bookmarks-import-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmarks-import-postgresql.xql	16 Aug 2001 20:30:28 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmarks-import-postgresql.xql	23 Sep 2001 04:48:47 -0000	1.2
@@ -26,10 +26,7 @@
  
 <fullquery name="new_url">      
       <querytext>
-	declare
-	   v_url_id integer;
-	begin
-	   v_url_id := url__new (
+	select url__new (
            		:url_id,
            		:local_title,
 	   		:host_url,
@@ -40,16 +37,13 @@
            		:creation_ip,
 			null
 			);
-	return v_url_id;
-	end;
       </querytext>
 </fullquery>
 
  
 <fullquery name="bookmark_insert">      
       <querytext>
-begin
-	perform	   bookmark__new (
+select	   bookmark__new (
 			:bookmark_id,
 			:viewed_user_id,
 			:url_id,
@@ -59,10 +53,7 @@
 			null,
 			:user_id,
 			:creation_ip,
-			null
-		);       
-	return '';
-end;
+			null);       
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/bookmarks/www/bookmarks-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmarks-import.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmarks-import.tcl	23 Sep 2001 04:48:47 -0000	1.2
@@ -182,7 +182,7 @@
 
 		set url_id [db_nextval acs_object_id_seq]
 
-		if [catch {db_dml new_url "		
+		if [catch {db_exec_plsql new_url "		
 		declare
 		   dummy_var integer;
 		begin
@@ -216,7 +216,7 @@
 	    } else {
 	    
 		# try to insert bookmark into user's list	
-		if [catch {db_dml bookmark_insert  "
+		if [catch {db_exec_plsql bookmark_insert  "
 		
 		declare
 		   dummy_var integer;