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.3 -r1.4 --- openacs-4/packages/bookmarks/tcl/bookmarks-procs-postgresql.xql 7 Jun 2001 20:26:06 -0000 1.3 +++ openacs-4/packages/bookmarks/tcl/bookmarks-procs-postgresql.xql 12 Jul 2001 22:56:39 -0000 1.4 @@ -75,7 +75,6 @@ where bookmark_id = :bookmark_id ) and acs_permission__permission_p(bookmark_id, :browsing_user_id, 'delete') = 'f' - order by tree_sortkey Index: openacs-4/packages/bookmarks/www/bookmark-delete-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete-2-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/bookmarks/www/bookmark-delete-2-postgresql.xql 12 Jul 2001 00:38:53 -0000 1.1 +++ openacs-4/packages/bookmarks/www/bookmark-delete-2-postgresql.xql 12 Jul 2001 22:56:39 -0000 1.2 @@ -3,14 +3,15 @@ postgresql7.1 - + - FIX ME PLSQL - - begin - bookmark__delete ( - bookmark_id => :bookmark_id - ); +begin + perform + bookmark__delete + ( + :bookmark_id + ); + return 0; end; Index: openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl 12 Jul 2001 22:56:39 -0000 1.2 @@ -21,7 +21,7 @@ bm_require_delete_permission $bookmark_id -if [catch {db_exec_plsql bookmark_add " +if [catch {db_exec_plsql bookmark_delete " begin bookmark.delete ( bookmark_id => :bookmark_id Index: openacs-4/packages/bookmarks/www/bookmark-delete-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/bookmarks/www/bookmark-delete-postgresql.xql 12 Jul 2001 00:38:53 -0000 1.1 +++ openacs-4/packages/bookmarks/www/bookmark-delete-postgresql.xql 12 Jul 2001 22:56:39 -0000 1.2 @@ -5,11 +5,11 @@ -select local_title, tree_level(tree_sorkkey) as indentation +select local_title, tree_level(tree_sortkey) as indentation from bm_bookmarks where tree_sortkey like ( - select tree_sortkey || ''%'' from bm_bookmarks + select tree_sortkey || '%' from bm_bookmarks where bookmark_id = :bookmark_id ) order by tree_sortkey