Index: openacs-4/packages/bookmarks/bookmarks.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/bookmarks/bookmarks.info	8 Sep 2001 23:05:37 -0000	1.18
+++ openacs-4/packages/bookmarks/bookmarks.info	9 Sep 2001 00:00:30 -0000	1.19
@@ -131,6 +131,8 @@
             <file type="content_page" path="www/index.adp"/>
             <file type="content_page" path="www/index.tcl"/>
             <file type="query_file" path="www/index.xql"/>
+            <file type="query_file" db_type="oracle" path="www/most-popular-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/most-popular-postgresql.xql"/>
             <file type="content_page" path="www/most-popular.adp"/>
             <file type="content_page" path="www/most-popular.tcl"/>
             <file type="query_file" path="www/most-popular.xql"/>
Index: openacs-4/packages/bookmarks/www/most-popular-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/most-popular-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/most-popular-oracle.xql	9 Sep 2001 00:00:30 -0000	1.1
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="popular_hosts">      
+      <querytext>
+      
+    select unique host_url,
+           $count_select_query as n_bookmarks
+    from  bm_urls
+    order by n_bookmarks desc
+
+      </querytext>
+</fullquery>
+
+
+<fullquery name="popular_urls">      
+      <querytext>
+      
+    select nvl(url_title, complete_url) as local_title, 
+           complete_url, 
+           $count_select_query as n_bookmarks
+    from   bm_urls
+    order by n_bookmarks desc
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/most-popular-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/most-popular-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/most-popular-postgresql.xql	9 Sep 2001 00:00:30 -0000	1.1
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+
+<fullquery name="popular_hosts">      
+      <querytext>
+      
+select distinct host_url,
+       (
+	select count(*) 
+	from 
+	(
+		select 	o2.bookmark_id, o2.url_id
+		from bm_bookmarks o1, bm_bookmarks o2
+		where 
+			o1.parent_id = :root_folder_id
+			and o2.tree_sortkey >= o1.tree_sortkey
+			and o2.tree_sortkey like (o1.tree_sortkey || '%')
+		order by o2.tree_sortkey
+	) b 
+	where b.url_id = bm_urls.url_id
+        and acs_permission__permission_p(b.bookmark_id, :browsing_user_id, 'read') = 't') as n_bookmarks
+from  bm_urls
+order by n_bookmarks desc
+
+      </querytext>
+</fullquery>
+
+ 
+<fullquery name="popular_urls">      
+      <querytext>
+      
+    select coalesce(url_title, complete_url) as local_title, 
+           complete_url, 
+                      (
+	select count(*) 
+	from 
+	(
+		select 	o2.bookmark_id, o2.url_id
+		from bm_bookmarks o1, bm_bookmarks o2
+		where 
+			o1.parent_id = :root_folder_id
+			and o2.tree_sortkey >= o1.tree_sortkey
+			and o2.tree_sortkey like (o1.tree_sortkey || '%')
+		order by o2.tree_sortkey
+	) b 
+	where b.url_id = bm_urls.url_id
+        and acs_permission__permission_p(b.bookmark_id, :browsing_user_id, 'read') = 't') as n_bookmarks
+    from   bm_urls
+    order by n_bookmarks desc
+
+      </querytext>
+</fullquery>
+
+
+ 
+</queryset>
Index: openacs-4/packages/bookmarks/www/most-popular.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/most-popular.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/most-popular.xql	3 Jun 2001 04:22:52 -0000	1.1
+++ openacs-4/packages/bookmarks/www/most-popular.xql	9 Sep 2001 00:00:30 -0000	1.2
@@ -4,7 +4,7 @@
 <fullquery name="popular_hosts">      
       <querytext>
       
-    select unique host_url,
+    select distinct host_url,
            $count_select_query as n_bookmarks
     from  bm_urls
     order by n_bookmarks desc