Index: openacs-4/packages/bookmarks/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index-oracle.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/index-oracle.xql	29 Nov 2001 02:04:15 -0000	1.5
+++ openacs-4/packages/bookmarks/www/index-oracle.xql	25 Sep 2003 17:06:02 -0000	1.6
@@ -105,6 +105,29 @@
       </querytext>
 </fullquery>
 
+<fullquery name="bm_info">      
+      <querytext>
+      
+        select   b.bookmark_id, 
+	         b.url_id, 
+                 b.local_title, 
+	         acs_objects.creation_date, 
+	         b.parent_id,
+                 bm_urls.complete_url, 
+	         b.folder_p
+        from     (select /*+INDEX(bm_bookmarks bm_bookmarks_local_title_idx)*/ bookmark_id, url_id, local_title, folder_p, level lev, 
+	          parent_id, owner_id, rownum ord_num from bm_bookmarks 
+	          start with parent_id = :root_folder_id connect by prior bookmark_id = parent_id) b, 
+	         bm_urls,
+	         acs_objects
+        where    owner_id       = :user_id
+	and      acs_objects.object_id = b.bookmark_id
+        and      b.url_id = bm_urls.url_id(+)
+	order by ord_num
+    
+      </querytext>
+</fullquery>
+
  
 </queryset>
 
Index: openacs-4/packages/bookmarks/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index-postgresql.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bookmarks/www/index-postgresql.xql	17 Aug 2002 18:01:43 -0000	1.9
+++ openacs-4/packages/bookmarks/www/index-postgresql.xql	25 Sep 2003 17:06:02 -0000	1.10
@@ -95,6 +95,29 @@
         order by b.tree_sortkey
       </querytext>
 </fullquery>
+
+<fullquery name="bm_info">      
+      <querytext>
+
+        select   b.bookmark_id, 
+	         b.url_id, 
+                 b.local_title, 
+	         acs_objects.creation_date, 
+	         b.parent_id,
+                 bm_urls.complete_url, 
+	         b.folder_p
+        from     (select bm.bookmark_id, bm.url_id, bm.local_title, bm.folder_p, 
+		  bm.parent_id, bm.owner_id, bm.tree_sortkey from bm_bookmarks bm, bm_bookmarks bm2
+		  where bm2.bookmark_id = :root_folder_id
+                    and bm.tree_sortkey between bm2.tree_sortkey and tree_right(bm2.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 b.tree_sortkey
+    
+      </querytext>
+</fullquery>
  
 </queryset>
 
Index: openacs-4/packages/bookmarks/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.vuh,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookmarks/www/index.vuh	25 Sep 2003 17:06:02 -0000	1.1
@@ -0,0 +1,76 @@
+#
+# Outputs an html file in the format used by netscape/mozilla
+# for it's bookmarks menu
+#
+
+# index.vuh created from the original registered proc
+# because registered procs seem not to play with server
+# 404s
+
+# Mark Aufflick (mark@pumptheory.com)
+# 26 September 2003
+# $Id: index.vuh,v 1.1 2003/09/25 17:06:02 marka Exp $
+
+set user_id [ad_maybe_redirect_for_registration]
+
+set package_id [ad_conn package_id]
+
+set root_folder_id [bm_get_root_folder_id $package_id $user_id]
+
+set name [db_string name "
+    select first_names||' '||last_name as name 
+    from   cc_users 
+    where  user_id = :user_id"]
+
+set folder_list 0
+
+db_foreach bm_info { } {
+
+if { [string equal $folder_list 0] } {
+	    lappend folder_list $parent_id
+} else {
+	    set previous_parent_id [lindex $folder_list [expr [llength $folder_list]-1]]	
+	    if {$parent_id != $previous_parent_id} {
+
+		set parent_location [lsearch -exact $folder_list $parent_id]
+		
+		
+
+		if {$parent_location==-1} {
+		    lappend folder_list $parent_id
+		    append bookmark_html "<DL><p>\n\n"
+		} else { 	    
+		    set drop [expr [llength $folder_list]-$parent_location]
+		    set folder_list [lrange $folder_list 0 $parent_location]
+		    for {set i 1} {$i<$drop} {incr i} {
+			append bookmark_html "</DL><p>\n\n"
+		    }
+        }
+    } elseif { [string equal $folder_p "t"] && [string equal $previous_folder_p "t"] } {
+		# The previous folder was empty
+		append bookmark_html "<DL><p>\n</DL><p>\n\n"
+	    }
+    }
+
+    if {$folder_p=="t"} {
+	    append bookmark_html "<DT><H3 ADD_DATE=\"[ns_time]\">$local_title</H3>\n\n"
+    } else {
+	    append bookmark_html "<DT><A HREF=\"$complete_url\" ADD_DATE=\"[ns_time]\" LAST_VISIT=\"0\" LAST_MODIFIED=\"0\">$local_title</A>\n\n"
+    }
+
+	set previous_folder_p $folder_p
+}
+
+set html "<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<!-- This is an automatically generated file.
+     It will be read and overwritten.
+     Do Not Edit! -->
+<TITLE>Bookmarks for $name</TITLE>
+<H1>Bookmarks for $name</H1>
+<DL><p>
+$bookmark_html
+</DL><p>
+"
+
+    
+doc_return  200 text/html $html
Index: openacs-4/packages/bookmarks/www/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/index.xql	2 Jun 2001 07:33:06 -0000	1.1
+++ openacs-4/packages/bookmarks/www/index.xql	25 Sep 2003 17:06:02 -0000	1.2
@@ -13,6 +13,5 @@
       select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id
       </querytext>
 </fullquery>
-
  
 </queryset>