Index: openacs-4/packages/bookmarks/bookmarks.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/bookmarks/bookmarks.info	19 Jul 2001 16:01:00 -0000	1.10
+++ openacs-4/packages/bookmarks/bookmarks.info	23 Jul 2001 03:01:40 -0000	1.11
@@ -97,6 +97,8 @@
             <file type="content_page" path="www/bookmark-view.adp"/>
             <file type="content_page" path="www/bookmark-view.tcl"/>
             <file type="query_file" path="www/bookmark-view.xql"/>
+            <file type="query_file" db_type="oracle" path="www/bookmarks-check-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/bookmarks-check-postgresql.xql"/>
             <file type="content_page" path="www/bookmarks-check.tcl"/>
             <file type="content_page" path="www/bookmarks-export.adp"/>
             <file type="content_page" path="www/bookmarks-export.tcl"/>
Index: openacs-4/packages/bookmarks/www/bookmarks-check-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmarks-check-oracle.xql	23 Jul 2001 03:01:40 -0000	1.1
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+
+<partialquery name="set_last_live_date_to_now">
+	<querytext>
+		now()
+	</querytext>
+</partialquery>
+ 
+
+<fullquery name="bookmark_list">      
+      <querytext>
+      
+select url_id,
+       complete_url,
+       nvl(url_title, complete_url) as url_title
+       from bm_urls
+       where exists (select 1 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 bm.url_id = bm_urls.url_id
+                                      and acs_permission.permission_p(bm.bookmark_id, :browsing_user_id, 'delete')= 't' )
+      </querytext>
+</fullquery>
+
+ 
+<fullquery name="bookmark_update_last_checked">      
+      <querytext>
+      
+    update bm_urls 
+    set    last_checked_date = sysdate,
+
+    url_title= :title,
+    meta_description= :description,
+    meta_keywords= :keywords
+
+    $last_live_clause
+
+    where  url_id = :url_id
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/bookmarks-check-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/bookmarks-check-postgresql.xql	23 Jul 2001 03:01:40 -0000	1.1
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="bookmark_list">      
+      <querytext>
+
+	select url_id,
+       	complete_url,
+       	coalesce(url_title, complete_url) as url_title
+       	from bm_urls
+       	where exists 
+	(
+		select 1 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 bm.url_id = bm_urls.url_id
+        	and acs_permission__permission_p(bm.bookmark_id, :browsing_user_id, 'delete')= 't' 
+	)
+      
+	</querytext>
+</fullquery>
+
+<partialquery name="set_last_live_date_to_now">
+	<querytext>
+		now()
+	</querytext>
+</partialquery>
+ 
+<fullquery name="bookmark_update_last_checked">      
+      <querytext>
+      
+    update bm_urls 
+    set    last_checked_date = current_timestamp,
+
+    url_title= :title,
+    meta_description= :description,
+    meta_keywords= :keywords
+
+    $last_live_clause
+
+    where  url_id = :url_id
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/bookmarks-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmarks-check.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmarks-check.tcl	23 Jul 2001 03:01:40 -0000	1.2
@@ -143,7 +143,9 @@
 	incr dead_count
 
 	} else {
-	    ns_set put $checked_url last_live_date "sysdate"
+	    set set_last_live_date_to_now [db_map set_last_live_date_to_now]
+	    ns_set put $checked_url last_live_date $set_last_live_date_to_now
+	    # ns_set put $checked_url last_live_date "sysdate"
 	    set url_content ""
 	    if {![catch {ns_httpget $complete_url 3 1} url_content]} {