Index: openacs-4/packages/bookmarks/bookmarks.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/bookmarks/bookmarks.info 29 Jul 2001 23:16:50 -0000 1.12
+++ openacs-4/packages/bookmarks/bookmarks.info 30 Jul 2001 00:00:02 -0000 1.13
@@ -106,9 +106,13 @@
+
+
+
+
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.11 -r1.12
--- openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql 19 Jul 2001 15:15:26 -0000 1.11
+++ openacs-4/packages/bookmarks/sql/postgresql/bookmarks-create.sql 30 Jul 2001 00:00:02 -0000 1.12
@@ -368,7 +368,7 @@
now(),
p_creation_user,
p_creation_ip,
- p_context_id
+ p_parent_id
);
if p_last_access_date is null then
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.5 -r1.6
--- openacs-4/packages/bookmarks/tcl/bookmarks-procs-postgresql.xql 17 Jul 2001 01:52:44 -0000 1.5
+++ openacs-4/packages/bookmarks/tcl/bookmarks-procs-postgresql.xql 30 Jul 2001 00:00:02 -0000 1.6
@@ -15,6 +15,7 @@
select tree_sortkey || '%'
from bm_bookmarks
where parent_id = :package_id
+ and owner_id = :user_id
)
order by tree_sortkey
)
@@ -34,12 +35,13 @@
select tree_sortkey || '%'
from bm_bookmarks
where parent_id = :package_id
+ and owner_id = :user_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
Index: openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl 17 Jul 2001 01:52:44 -0000 1.2
+++ openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl 30 Jul 2001 00:00:02 -0000 1.3
@@ -102,3 +102,4 @@
+
Index: openacs-4/packages/bookmarks/www/bookmarks-user-list-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-user-list-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmarks-user-list-oracle.xql 30 Jul 2001 00:00:02 -0000 1.1
@@ -0,0 +1,27 @@
+
+
+
+ oracle8.1.6
+
+
+
+ select u.first_names,
+ u.last_name,
+ b.owner_id as viewed_user_id,
+ count(b.bookmark_id) as number_of_bookmarks
+ from cc_users u, (select bookmark_id, url_id, folder_p, owner_id from bm_bookmarks
+ start with parent_id = :package_id connect by prior bookmark_id = parent_id) b
+ where u.object_id = b.owner_id
+ and acs_permission.permission_p(b.bookmark_id, :browsing_user_id, 'read') = 't'
+ and b.owner_id <> :browsing_user_id
+ and b.folder_p = 'f'
+ and b.bookmark_id <> :package_id
+ group by u.first_names,
+ u.last_name,
+ b.owner_id
+ order by number_of_bookmarks desc
+
+
+
+
+
Index: openacs-4/packages/bookmarks/www/bookmarks-user-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-user-list-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmarks-user-list-postgresql.xql 30 Jul 2001 00:00:02 -0000 1.1
@@ -0,0 +1,37 @@
+
+
+
+ postgresql7.1
+
+
+
+
+select u.first_names,
+u.last_name,
+b.owner_id as viewed_user_id,
+count(b.bookmark_id) as number_of_bookmarks
+from
+cc_users u,
+(
+ select o2.bookmark_id, o2.url_id, o2.folder_p, o2.owner_id
+ from bm_bookmarks o1, bm_bookmarks o2
+ where o1.parent_id = :package_id
+ and o2.tree_sortkey >= o1.tree_sortkey
+ and o2.tree_sortkey like (o1.tree_sortkey || '%')
+ order by o2.tree_sortkey
+) b
+where u.object_id = b.owner_id
+and acs_permission__permission_p(b.bookmark_id, :browsing_user_id, 'read') = 't'
+and b.owner_id <> :browsing_user_id
+and b.folder_p = 'f'
+and b.bookmark_id <> :package_id
+group by
+u.first_names,
+u.last_name,
+b.owner_id
+order by number_of_bookmarks desc
+
+
+
+
+
Index: openacs-4/packages/bookmarks/www/delete-dead-links-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/delete-dead-links-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/delete-dead-links-oracle.xql 30 Jul 2001 00:00:02 -0000 1.1
@@ -0,0 +1,42 @@
+
+
+
+ oracle8.1.6
+
+
+
+ select bookmark_id
+ from (select bookmark_id, url_id from bm_bookmarks
+ start with parent_id = :root_folder_id
+ connect by prior bookmark_id = parent_id) bm
+ where acs_permission.permission_p(bm.bookmark_id, :browsing_user_id, 'delete') = 't'
+ and bm.url_id = :url_id
+
+
+
+
+
+
+
+ begin
+ bookmark.delete (
+ bookmark_id => :bookmark_id
+ );
+ end;
+
+
+
+
+
+
+
+ begin
+ bookmark.delete (
+ bookmark_id => :bookmark_id
+ );
+ end;
+
+
+
+
+
Index: openacs-4/packages/bookmarks/www/delete-dead-links-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/delete-dead-links-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/delete-dead-links-postgresql.xql 30 Jul 2001 00:00:02 -0000 1.1
@@ -0,0 +1,55 @@
+
+
+
+ postgresql7.1
+
+
+
+
+select bookmark_id
+from
+(
+ select bookmark_id, url_id
+ from bm_bookmarks
+ where tree_sortkey like
+ (
+ select tree_sortkey || '%'
+ from bm_bookmarks
+ where parent_id = :root_folder_id
+ )
+ order by tree_sortkey
+) bm
+where acs_permission__permission_p(bm.bookmark_id, :browsing_user_id, 'delete') = 't'
+and bm.url_id = :url_id
+
+
+
+
+
+
+ FIX ME PLSQL
+FIX ME PLSQL
+
+ begin
+ bookmark__delete (
+ bookmark_id => :bookmark_id
+ );
+ end;
+
+
+
+
+
+
+
+begin
+ perform bookmark__delete (
+ bookmark_id => :bookmark_id
+ );
+ return 0;
+end;
+
+
+
+
+