Index: openacs-4/packages/bookmarks/bookmarks.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/bookmarks/bookmarks.info	11 Sep 2001 19:53:11 -0000	1.20
+++ openacs-4/packages/bookmarks/bookmarks.info	13 Sep 2001 20:27:19 -0000	1.21
@@ -139,7 +139,11 @@
             <file type="content_page" path="www/one-host.adp"/>
             <file type="content_page" path="www/one-host.tcl"/>
             <file type="query_file" path="www/one-host.xql"/>
+            <file type="query_file" db_type="oracle" path="www/permissions-reset-all-2-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/permissions-reset-all-2-postgresql.xql"/>
             <file type="content_page" path="www/permissions-reset-all-2.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/permissions-reset-all-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/permissions-reset-all-postgresql.xql"/>
             <file type="content_page" path="www/permissions-reset-all.adp"/>
             <file type="content_page" path="www/permissions-reset-all.tcl"/>
             <file type="content_page" path="www/pics/docqmark.gif"/>
Index: openacs-4/packages/bookmarks/www/permissions-reset-all-2-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all-2-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/permissions-reset-all-2-oracle.xql	13 Sep 2001 20:27:19 -0000	1.1
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="delete_individual_permissions">      
+      <querytext>
+      delete from acs_permissions where object_id in (select bookmark_id from bm_bookmarks
+start with parent_id = :root_folder_id
+connect by prior bookmark_id = parent_id)
+and grantee_id <> :viewed_user_id
+      </querytext>
+</fullquery>
+
+ 
+<fullquery name="turn_on_security_inheritance">      
+      <querytext>
+      update acs_objects set security_inherit_p = 't'
+where object_id in (select bookmark_id from bm_bookmarks
+start with parent_id = :root_folder_id
+connect by prior bookmark_id = parent_id)
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/permissions-reset-all-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all-2-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/permissions-reset-all-2-postgresql.xql	13 Sep 2001 20:27:19 -0000	1.1
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="delete_individual_permissions">      
+      <querytext>
+
+delete from 
+	acs_permissions 
+where 
+	object_id in 
+	(
+	select bookmark_id from bm_bookmarks
+	where tree_sortkey like
+		(
+		select tree_sortkey || '%'
+		from bm_bookmarks
+		where bookmark_id = :root_folder_id
+		)
+	)
+and grantee_id <> :viewed_user_id
+      </querytext>
+</fullquery>
+
+ 
+<fullquery name="turn_on_security_inheritance">      
+      <querytext>
+
+update 
+	acs_objects 
+set 
+	security_inherit_p = 't'
+where 
+	object_id in 
+	(
+	select bookmark_id from bm_bookmarks
+	where tree_sortkey like
+		(
+		select tree_sortkey || '%'
+		from bm_bookmarks
+		where bookmark_id = :root_folder_id
+		)
+	)
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/permissions-reset-all-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/permissions-reset-all-oracle.xql	13 Sep 2001 20:27:19 -0000	1.1
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="direct_bookmark_permissions">      
+      <querytext>
+      select bookmark_id, local_title from bm_bookmarks
+where acs_permission.permission_p(bookmark_id, acs.magic_object_id('registered_users'), 'read') <> :public_p
+start with parent_id = :root_folder_id
+connect by prior bookmark_id = parent_id
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/permissions-reset-all-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/permissions-reset-all-postgresql.xql	13 Sep 2001 20:27:19 -0000	1.1
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="direct_bookmark_permissions">      
+      <querytext>
+
+select 
+	bookmark_id, local_title 
+from 
+	bm_bookmarks
+where 
+	tree_sortkey like
+		(
+		select tree_sortkey || '%'
+		from bm_bookmarks
+		where bookmark_id = :root_folder_id
+			)
+	order by tree_sortkey
+and
+	acs_permission__permission_p(bookmark_id, acs__magic_object_id('registered_users'), 'read') <> :public_p
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>