Index: openacs-4/packages/bookmarks/www/bookmark-add-one-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmark-add-one-2-postgresql.xql	19 Jul 2001 15:15:26 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmark-add-one-2-postgresql.xql	27 Sep 2001 01:37:50 -0000	1.2
@@ -5,10 +5,8 @@
 
 <fullquery name="url_add">      
       <querytext>
-	declare
-	   v_url_id integer;
-	begin
-	   v_url_id := url__new (
+
+	select url__new (
            		:url_id,
            		:url_title,
 	   		:host_url,
@@ -19,17 +17,16 @@
            		:creation_ip,
 			null
 			);
-	return v_url_id;
-	end;
+
       </querytext>
 </fullquery>
 
  
 <fullquery name="bookmark_add">      
       <querytext>
-begin
 
-	perform	     bookmark__new (
+
+	select bookmark__new (
 		    :bookmark_id,
 		    :viewed_user_id,
 		    :url_id,
@@ -40,8 +37,7 @@
 		    :user_id,
 		    :creation_ip,
 		    null);
-   	return '';
-end;
+
       </querytext>
 </fullquery>
 
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.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmarks-import-postgresql.xql	23 Sep 2001 04:48:47 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmarks-import-postgresql.xql	27 Sep 2001 01:37:50 -0000	1.3
@@ -5,8 +5,8 @@
 
 <fullquery name="folder_insert">      
       <querytext>
-begin
-	perform	   bookmark__new (
+
+	select 	bookmark__new (
 			:bookmark_id,
 			:viewed_user_id,
 			null,
@@ -18,14 +18,14 @@
 			:creation_ip,
 			null
 		);       
-	return '';
-end;
+
       </querytext>
 </fullquery>
 
  
 <fullquery name="new_url">      
       <querytext>
+
 	select url__new (
            		:url_id,
            		:local_title,
@@ -37,13 +37,15 @@
            		:creation_ip,
 			null
 			);
+
       </querytext>
 </fullquery>
 
  
 <fullquery name="bookmark_insert">      
       <querytext>
-select	   bookmark__new (
+
+	select	   bookmark__new (
 			:bookmark_id,
 			:viewed_user_id,
 			:url_id,
@@ -54,6 +56,7 @@
 			:user_id,
 			:creation_ip,
 			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.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmarks-import.tcl	23 Sep 2001 04:48:47 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmarks-import.tcl	27 Sep 2001 01:37:50 -0000	1.3
@@ -262,5 +262,13 @@
     }
 }    
 
+# Test for empty import_list before returning
+if { [info exists import_list] } {
+    # Do nothing..it's ok...
+} else {
+    # For some reason, nothing got inserted
+    lappend import_list "Hmmm...the file seemed ok, but nothing was imported. Sorry!"
+}
 
+
 ad_return_template