Index: openacs-4/packages/bookmarks/bookmarks.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/bookmarks/bookmarks.info	7 Jun 2001 22:12:52 -0000	1.6
+++ openacs-4/packages/bookmarks/bookmarks.info	12 Jul 2001 00:38:53 -0000	1.7
@@ -68,9 +68,14 @@
             <file type="content_page" path="www/bookmark-add-one-2.tcl"/>
             <file type="content_page" path="www/bookmark-add-one.adp"/>
             <file type="content_page" path="www/bookmark-add-one.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/bookmark-delete-2-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/bookmark-delete-2-postgresql.xql"/>
             <file type="content_page" path="www/bookmark-delete-2.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/bookmark-delete-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/bookmark-delete-postgresql.xql"/>
             <file type="content_page" path="www/bookmark-delete.adp"/>
             <file type="content_page" path="www/bookmark-delete.tcl"/>
+            <file type="query_file" path="www/bookmark-delete.xql"/>
             <file type="content_page" path="www/bookmark-edit-2.tcl"/>
             <file type="content_page" path="www/bookmark-edit.adp"/>
             <file type="content_page" path="www/bookmark-edit.tcl"/>
Index: openacs-4/packages/bookmarks/www/bookmark-delete-2-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete-2-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmark-delete-2-oracle.xql	12 Jul 2001 00:38:53 -0000	1.1
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="bookmark_add">      
+      <querytext>
+      
+    begin
+      bookmark.delete (
+       bookmark_id => :bookmark_id
+	);       
+ end;
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmark-delete-2-postgresql.xql	12 Jul 2001 00:38:53 -0000	1.1
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="bookmark_add">      
+      <querytext>
+      FIX ME PLSQL
+
+    begin
+      bookmark__delete (
+       bookmark_id => :bookmark_id
+	);       
+ end;
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/bookmark-delete-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmark-delete-oracle.xql	12 Jul 2001 00:38:53 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="contained_bookmarks">      
+      <querytext>
+      select local_title, level as indentation 
+from bm_bookmarks start with bookmark_id = :bookmark_id 
+connect by prior bookmark_id = parent_id
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmark-delete-postgresql.xql	12 Jul 2001 00:38:53 -0000	1.1
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="contained_bookmarks">      
+      <querytext>
+select local_title, tree_level(tree_sorkkey) as indentation 
+from bm_bookmarks
+where tree_sortkey like
+(
+	select tree_sortkey || ''%'' from bm_bookmarks
+	where bookmark_id  = :bookmark_id 
+)
+order by tree_sortkey
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/bookmark-delete.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmark-delete.xql	12 Jul 2001 00:38:53 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="bookmark_title">      
+      <querytext>
+      select local_title from bm_bookmarks
+                                              where bookmark_id = :bookmark_id
+      </querytext>
+</fullquery>
+
+ 
+</queryset>