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.6 -r1.7
--- openacs-4/packages/bookmarks/www/index-postgresql.xql	12 Oct 2001 23:42:23 -0000	1.6
+++ openacs-4/packages/bookmarks/www/index-postgresql.xql	29 Nov 2001 02:04:15 -0000	1.7
@@ -31,98 +31,71 @@
  
 <fullquery name="bookmarks_select">      
       <querytext>
-select b.bookmark_id,
-b.url_id,
-b.local_title as bookmark_title,
-u.complete_url,
-u.last_live_date, 
-u.last_checked_date, 
-b.folder_p, 
-bm_in_closed_p.closed_p, 
-coalesce(admin_view.object_id, 0) as admin_p,
-coalesce(delete_view.object_id,0) as delete_p,
-b.lev as indentation
-$private_select
-from 
-bm_in_closed_p cross join
-((( bm_urls u right join (
-	select $index_order bookmark_id, url_id, local_title, folder_p, 
- 	tree_level(tree_sortkey) as lev, parent_id, tree_sortkey 
-	from bm_bookmarks
-	where tree_sortkey like
-	(
-		select tree_sortkey || '%'
-		from bm_bookmarks
-		where bookmark_id = :root_folder_id
-	)
-	order by tree_sortkey
-) 
-b on (u.url_id=b.url_id)) left join
-(
-	select object_id from acs_object_party_privilege_map
- 	where party_id in (:browsing_user_id, -1) and privilege = 'admin'
-) admin_view on (admin_view.object_id=b.bookmark_id)) left join
-(
-	select object_id from acs_object_party_privilege_map
- 	where party_id in (:browsing_user_id, -1) and privilege = 'delete'
-) delete_view on (delete_view.object_id = b.bookmark_id))
-where bm_in_closed_p.bookmark_id = b.bookmark_id
-and bm_in_closed_p.in_closed_p = 'f'
-and bm_in_closed_p.in_closed_p_id = :in_closed_p_id
-and exists 
-(
-	select 1 from bm_bookmarks where exists 
-	(
-		select 1 from acs_object_party_privilege_map 
-		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 = b.bookmark_id
-		)
-	order by tree_sortkey 	
-)
-and b.bookmark_id <> :root_folder_id
-order by b.tree_sortkey
+        select b.bookmark_id, b.url_id, b.local_title as bookmark_title,
+          u.complete_url, u.last_live_date, u.last_checked_date, 
+          b.folder_p, 
+          bm_in_closed_p.closed_p, 
+          coalesce(admin_view.object_id, 0) as admin_p,
+          coalesce(delete_view.object_id,0) as delete_p,
+          b.lev as indentation
+          $private_select
+        from 
+          bm_in_closed_p cross join
+          ((( bm_urls u right join (
+	    select $index_order bookmark_id, url_id, local_title, folder_p, 
+ 	      tree_level(tree_sortkey) as lev, parent_id, tree_sortkey 
+	    from bm_bookmarks
+	    where tree_sortkey like (select tree_sortkey || '%'
+		                     from bm_bookmarks
+		                     where bookmark_id = :root_folder_id)
+            ) b on (u.url_id=b.url_id)) left join (
+	    select distinct object_id
+            from all_object_party_privilege_map
+ 	    where party_id = :browsing_user_id and privilege = 'admin'
+            ) admin_view on (admin_view.object_id=b.bookmark_id)) left join (
+	    select distinct object_id
+            from all_object_party_privilege_map
+ 	    where party_id = :browsing_user_id and privilege = 'delete'
+            ) delete_view on (delete_view.object_id = b.bookmark_id))
+        where bm_in_closed_p.bookmark_id = b.bookmark_id
+          and bm_in_closed_p.in_closed_p = 'f'
+          and bm_in_closed_p.in_closed_p_id = :in_closed_p_id
+          and exists (select 1
+                      from bm_bookmarks
+                      where exists (select 1
+                                    from all_object_party_privilege_map 
+		                    where object_id = bookmark_id
+                                      and party_id = :browsing_user_id
+		                      and privilege = 'read')
+	              and tree_sortkey like (select tree_sortkey || '%'
+		                             from bm_bookmarks
+		                             where bookmark_id = b.bookmark_id))
+          and b.bookmark_id <> :root_folder_id
+        order by b.tree_sortkey
       </querytext>
 </fullquery>
 
 <fullquery name="my_bookmarks_select">      
       <querytext>
-select 
-	b.bookmark_id, b.url_id, b.local_title as bookmark_title,
-	u.complete_url, u.last_live_date, u.last_checked_date, 
-	b.folder_p, bm_in_closed_p.closed_p, 
-	b.bookmark_id as admin_p, b.bookmark_id as delete_p,
-	b.lev as indentation
-	$private_select
-from 
-	bm_in_closed_p 
-cross join ( 
-	bm_urls u 
-	right join (
-	select 
-		$index_order bookmark_id, url_id, local_title, folder_p, 
- 		tree_level(tree_sortkey) as lev, parent_id, tree_sortkey 
-	from bm_bookmarks
-	where 
-		tree_sortkey like (
-			select tree_sortkey || '%'
-			from bm_bookmarks
-			where bookmark_id = :root_folder_id
-		)
-	) 
-	b on (u.url_id=b.url_id)
-)
-where bm_in_closed_p.bookmark_id = b.bookmark_id
-and bm_in_closed_p.in_closed_p = 'f'
-and bm_in_closed_p.in_closed_p_id = :in_closed_p_id
-and b.bookmark_id <> :root_folder_id
-order by b.tree_sortkey
+        select 
+          b.bookmark_id, b.url_id, b.local_title as bookmark_title,
+          u.complete_url, u.last_live_date, u.last_checked_date, 
+          b.folder_p, bm_in_closed_p.closed_p, 
+          b.bookmark_id as admin_p, b.bookmark_id as delete_p,
+          b.lev as indentation
+          $private_select
+        from bm_in_closed_p cross join ( 
+	  bm_urls u right join (select $index_order bookmark_id, url_id, local_title, folder_p, 
+ 		                  tree_level(tree_sortkey) as lev, parent_id, tree_sortkey 
+	                        from bm_bookmarks
+	                        where tree_sortkey like (select tree_sortkey || '%'
+			                                 from bm_bookmarks
+			                                 where bookmark_id = :root_folder_id)) b on (u.url_id=b.url_id))
+        where bm_in_closed_p.bookmark_id = b.bookmark_id
+          and bm_in_closed_p.in_closed_p = 'f'
+          and bm_in_closed_p.in_closed_p_id = :in_closed_p_id
+          and b.bookmark_id <> :root_folder_id
+        order by b.tree_sortkey
       </querytext>
 </fullquery>