Index: openacs-4/packages/bookmarks/bookmarks.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/bookmarks/bookmarks.info	19 Jul 2001 15:15:26 -0000	1.9
+++ openacs-4/packages/bookmarks/bookmarks.info	19 Jul 2001 16:01:00 -0000	1.10
@@ -62,6 +62,8 @@
             <file type="content_page" path="www/admin/site-info.tcl"/>
             <file type="content_page" path="www/bm-master.adp"/>
             <file type="content_page" path="www/bm-master.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/bookmark-access-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/bookmark-access-postgresql.xql"/>
             <file type="content_page" path="www/bookmark-access.tcl"/>
             <file type="content_page" path="www/bookmark-add-import.adp"/>
             <file type="content_page" path="www/bookmark-add-import.tcl"/>
Index: openacs-4/packages/bookmarks/tcl/bookmarks-init-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/tcl/bookmarks-init-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bookmarks/tcl/bookmarks-init-postgresql.xql	2 Jun 2001 07:33:06 -0000	1.1
+++ openacs-4/packages/bookmarks/tcl/bookmarks-init-postgresql.xql	19 Jul 2001 16:01:00 -0000	1.2
@@ -25,19 +25,19 @@
 	         b.parent_id,
                  bm_urls.complete_url, 
 	         b.folder_p
-        from     (select bookmark_id, url_id, local_title, folder_p, tree_level(tree_sortkey) lev, 
-	          parent_id, owner_id, 999 ord_num from bm_bookmarks 
+        from     (select bookmark_id, url_id, local_title, folder_p, 
+		  parent_id, owner_id from bm_bookmarks 
 		  where tree_sortkey like
 			(
-			select tree_sortkey || ''%''
+			select tree_sortkey || '%'
 			from bm_bookmarks
 			where bookmark_id = :root_folder_id
 			)
-		  order by tree_sortkey) b left join bm_urls using (url_id),
+		 order by tree_sortkey) b left join bm_urls using (url_id),
 	         acs_objects
         where    owner_id       = :user_id
 	and      acs_objects.object_id = b.bookmark_id
-	order by ord_num
+	order by tree_sortkey
     
       </querytext>
 </fullquery>
Index: openacs-4/packages/bookmarks/www/bookmark-access-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-access-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmark-access-oracle.xql	19 Jul 2001 16:01:00 -0000	1.1
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="update_access_date">      
+      <querytext>
+      update bm_bookmarks set last_access_date = sysdate where bookmark_id = :bookmark_id
+or bookmark_id in (select bookmark_id from bm_bookmarks 
+start with bookmark_id = (select parent_id from bm_bookmarks where bookmark_id = :bookmark_id) 
+connect by prior parent_id = bookmark_id)
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/bookmark-access-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-access-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmark-access-postgresql.xql	19 Jul 2001 16:01:00 -0000	1.1
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="update_access_date">      
+      <querytext>
+
+	update bm_bookmarks set last_access_date = current_timestamp 
+        where bookmark_id = :bookmark_id
+        or bookmark_id in 
+		(
+		select bookmark_id from bm_bookmarks 
+		where tree_sortkey like 
+		(
+			select tree_sortkey || '%'
+			from bm_bookmarks where 
+			bookmark_id = :bookmark_id
+		)
+		)
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
+