Index: openacs-4/packages/bookmarks/tcl/bookmarks-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/tcl/bookmarks-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/tcl/bookmarks-procs-postgresql.xql	5 Jun 2001 01:14:35 -0000	1.2
+++ openacs-4/packages/bookmarks/tcl/bookmarks-procs-postgresql.xql	7 Jun 2001 20:26:06 -0000	1.3
@@ -3,6 +3,26 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
+<partialquery name="exclude_folders">
+	<querytext>
+		and bookmark_id not in 
+		(
+		select bookmark_id from bm_bookmarks 
+		where folder_p = 't' 
+		and owner_id = :user_id 
+		and tree_sortkey like
+			(
+			select tree_sortkey || '%'
+			from bm_bookmarks
+			where parent_id = :package_id
+			)
+		order by tree_sortkey
+		)
+	</querytext>
+</partialquery>
+
+
+
 <fullquery name="bm_folder_selection.folder_select">      
       <querytext>
     select bookmark_id, 
@@ -11,15 +31,15 @@
     from   bm_bookmarks
     where tree_sortkey like
 	(
-	select tree_sortkey || ''%''
+	select tree_sortkey || '%'
 	from bm_bookmarks
 	where parent_id = :package_id
 	)
     and folder_p = 't'
     and owner_id = :user_id
     and bookmark_id <> :bookmark_id
     and parent_id <> :package_id
-    and acs_permission__permission_p(bookmark_id, :user_id, 'write') = 't'
+    and acs_permission__permission_p(:bookmark_id, :user_id, 'write') = 't'
     $exclude_folders
     order by tree_sortkey
       </querytext>
@@ -50,7 +70,7 @@
 select count(*) from bm_bookmarks 
     where tree_sortkey like
 	(
-	select tree_sortkey || ''%''
+	select tree_sortkey || '%'
 	from bm_bookmarks
 	where  bookmark_id = :bookmark_id
 	)