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.6 -r1.7
--- openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql	7 Jun 2001 22:12:52 -0000	1.6
+++ openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql	26 Jun 2001 00:15:29 -0000	1.7
@@ -641,7 +641,6 @@
 ' LANGUAGE 'plpgsql';
 
 
-
 CREATE FUNCTION bookmark__toggle_open_close_all (integer, boolean, integer)
 RETURNS integer AS '
 DECLARE
@@ -652,7 +651,7 @@
 BEGIN
 	-- Change the value of closed_p for all folders belonging to the
 	-- user (except the root folder)
-	UPDATE bm_in_closed_p bm_outer SET closed_p = p_closed_p
+	UPDATE bm_in_closed_p SET closed_p = p_closed_p
 	WHERE bookmark_id IN 
 	(
 		SELECT bookmark_id FROM bm_bookmarks
@@ -662,7 +661,6 @@
 		    FROM bm_bookmarks 
 		    WHERE parent_id = p_root_id
 		    )
-		ORDER BY tree_sortkey
 	); 
 
 	-- Update the value of in_closed_p for all bookmarks belonging to 
@@ -680,8 +678,8 @@
 			SELECT bookmark_id FROM bm_bookmarks 
 			WHERE parent_id = p_root_id
 		    )
-		ORDER BY tree_sortkey
-		) 
+		)
+	) 
 	AND in_closed_p_id = p_browsing_user_id;	 	
 
 	RETURN 0;
Index: openacs-4/packages/bookmarks/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/index-postgresql.xql	7 Jun 2001 20:26:06 -0000	1.3
+++ openacs-4/packages/bookmarks/www/index-postgresql.xql	26 Jun 2001 00:15:29 -0000	1.4
@@ -77,14 +77,14 @@
 		where object_id = bookmark_id and party_id in 
 		(:browsing_user_id, -1)
 		and privilege = 'read'
-		and tree_sortkey like
-		    (
-			select tree_sortkey || '%'
-			from bm_bookmarks
-			where bookmark_id = '2249'
-		    )
-		order by tree_sortkey 	
-	) 
+	)
+	and tree_sortkey like
+		(
+		select tree_sortkey || '%'
+		from bm_bookmarks
+		where bookmark_id = b.bookmark_id
+		)
+	order by tree_sortkey 	
 )
 and b.bookmark_id <> :root_folder_id
 order by ord_num
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 -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/toggle-open-close-postgresql.xql	7 Jun 2001 22:12:52 -0000	1.1
+++ openacs-4/packages/bookmarks/www/toggle-open-close-postgresql.xql	26 Jun 2001 00:15:29 -0000	1.2
@@ -7,6 +7,8 @@
       <querytext>
 begin
 	perform bookmark__toggle_open_close (:bookmark_id,:browsing_user_id);
+	
+	return 0;
 end;
       </querytext>
 </fullquery>
@@ -20,6 +22,8 @@
  				:closed_p,
    				bookmark__get_root_folder(:package_id,:viewed_user_id)
     				);
+	
+	return 0;
 end;
       </querytext>
 </fullquery>