Index: openacs-4/packages/bookmarks/bookmarks.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/bookmarks.info	7 Jun 2001 20:26:06 -0000	1.5
+++ openacs-4/packages/bookmarks/bookmarks.info	7 Jun 2001 22:12:52 -0000	1.6
@@ -129,6 +129,8 @@
             <file type="content_page" path="www/pics/spacer.gif"/>
             <file type="content_page" path="www/search.adp"/>
             <file type="content_page" path="www/search.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/toggle-open-close-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/toggle-open-close-postgresql.xql"/>
             <file type="content_page" path="www/toggle-open-close.tcl"/>
             <file type="content_page" path="www/top-frame.tcl"/>
             <file type="content_page" path="www/tree-dynamic.tcl"/>
Index: openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql	7 Jun 2001 20:26:06 -0000	1.5
+++ openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql	7 Jun 2001 22:12:52 -0000	1.6
@@ -482,7 +482,7 @@
  		acs_object__delete(c_bookmark_id_one_level.bookmark_id);
  	    END LOOP;
  	END LOOP;
-
+	RETURN 0;
 END;
 ' LANGUAGE 'plpgsql';
 
@@ -533,7 +533,6 @@
 END;
 ' LANGUAGE 'plpgsql';
 
-
 CREATE FUNCTION bookmark__update_in_closed_p_one_user (integer, integer)
 RETURNS integer AS '
 DECLARE
@@ -545,7 +544,7 @@
 	-- the toggled folder in the tree for one particular user/session.
 
 	-- First set all in_closed_p flags to f ...
-	UPDATE bm_in_closed_p SET in_closed_p = ''f'' 
+	UPDATE bm_in_closed_p SET in_closed_p = FALSE
 	WHERE bookmark_id IN 
 	      (
 	      select bookmark_id from bm_bookmarks
@@ -560,7 +559,7 @@
 	AND in_closed_p_id = p_browsing_user_id;
 
         -- then set all in_closed_p flags to t that lie under a closed folder
-	UPDATE bm_in_closed_p set in_closed_p = ''t'' 
+	UPDATE bm_in_closed_p set in_closed_p = TRUE 
 	WHERE bookmark_id IN 
 	      (
 	      select bookmark_id from bm_bookmarks
@@ -578,7 +577,6 @@
 			  and bip.in_closed_p_id = p_browsing_user_id
 			  )
 		    )
-	      order by tree_sortkey
 	      INTERSECT
 	      select bookmark_id from bm_bookmarks
 	      where tree_sortkey like
@@ -587,14 +585,14 @@
 		    from bm_bookmarks 
 		    where bookmark_id = p_bookmark_id 
 		    )
-	      order by tree_sortkey
 	      )
 	AND in_closed_p_id = p_browsing_user_id;
-
+	RETURN 0;
 END;
 ' LANGUAGE 'plpgsql';
 
 
+
 CREATE FUNCTION bookmark__update_in_closed_p_all_users (integer, integer)
 RETURNS integer AS '
 DECLARE
@@ -613,11 +611,10 @@
 	    -- under the folder
 	    update_in_closed_p_one_user (p_bookmark_id, c_viewing_in_closed_p_ids.in_closed_p_id);
 	END LOOP;
-
+	RETURN 0;
 END;
 ' LANGUAGE 'plpgsql';
 
-
 CREATE FUNCTION bookmark__toggle_open_close (integer, integer)
 RETURNS integer AS '
 DECLARE
@@ -628,7 +625,7 @@
 	-- Toggle the closed_p flag
 	UPDATE bm_in_closed_p SET closed_p = 
 	       (
-	       SELECT CASE WHEN closed_p = ''t'' THEN ''f'' ELSE ''t''
+	       SELECT CASE WHEN closed_p = TRUE THEN FALSE ELSE TRUE END
 	       FROM bm_in_closed_p 
 	       WHERE bookmark_id = p_bookmark_id
 	       AND in_closed_p_id = p_browsing_user_id
@@ -638,12 +635,13 @@
 
 	-- Now update the in_closed_p status for this user for all bookmarks under
 	-- the toggled folder
-	update_in_closed_p_one_user (p_bookmark_id, p_browsing_user_id);
-
+	perform bookmark__update_in_closed_p_one_user (p_bookmark_id, p_browsing_user_id);
+	RETURN 0;
 END;
 ' LANGUAGE 'plpgsql';
 
 
+
 CREATE FUNCTION bookmark__toggle_open_close_all (integer, boolean, integer)
 RETURNS integer AS '
 DECLARE
@@ -686,7 +684,7 @@
 		) 
 	AND in_closed_p_id = p_browsing_user_id;	 	
 
-
+	RETURN 0;
 END;
 ' LANGUAGE 'plpgsql';
 
@@ -814,14 +812,14 @@
 
 BEGIN
 
-	IF p_private_p = ''f'' THEN
+	IF p_private_p = FALSE THEN
 	   -- Turn on security inheritance
-	   UPDATE acs_objects SET security_inherit_p = ''t'' WHERE object_id = p_bookmark_id;
+	   UPDATE acs_objects SET security_inherit_p = TRUE WHERE object_id = p_bookmark_id;
 	
 	ELSE
 		-- Private case
 		-- turn off inheritance
-		UPDATE acs_objects SET security_inherit_p = ''f'' WHERE object_id = p_bookmark_id;
+		UPDATE acs_objects SET security_inherit_p = FALSE WHERE object_id = p_bookmark_id;
 
 		-- Grant admin rights to the owner
 		SELECT owner_id INTO v_owner_id FROM bm_bookmarks WHERE bookmark_id = p_bookmark_id;	
@@ -832,8 +830,8 @@
 		''admin'');
 	    
 	END IF;
+	RETURN 0;
 
-
 END;
 ' LANGUAGE 'plpgsql';
 
Index: openacs-4/packages/bookmarks/www/toggle-open-close-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/toggle-open-close-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/toggle-open-close-oracle.xql	7 Jun 2001 22:12:52 -0000	1.1
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="toggle_open_close">      
+      <querytext>
+      
+    begin
+   bookmark.toggle_open_close(
+   bookmark_id => :bookmark_id,
+   browsing_user_id => :browsing_user_id
+    );
+    end;
+      </querytext>
+</fullquery>
+
+ 
+<fullquery name="toggle_open_close_all">      
+      <querytext>
+      
+    begin
+   bookmark.toggle_open_close_all(
+   browsing_user_id => :browsing_user_id,
+   closed_p => :closed_p,
+   root_id => bookmark.get_root_folder(
+                package_id => :package_id,
+                user_id    => :viewed_user_id
+              )
+    );
+    end;
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/toggle-open-close-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/toggle-open-close-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/toggle-open-close-postgresql.xql	7 Jun 2001 22:12:52 -0000	1.1
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="toggle_open_close">      
+      <querytext>
+begin
+	perform bookmark__toggle_open_close (:bookmark_id,:browsing_user_id);
+end;
+      </querytext>
+</fullquery>
+
+ 
+<fullquery name="toggle_open_close_all">      
+	<querytext>
+begin
+	perform bookmark__toggle_open_close_all(
+				:browsing_user_id,
+ 				:closed_p,
+   				bookmark__get_root_folder(:package_id,:viewed_user_id)
+    				);
+end;
+      </querytext>
+</fullquery>
+
+ 
+</queryset>