Index: openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl	18 Sep 2002 12:13:16 -0000	1.4
+++ openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl	29 Jun 2004 10:17:48 -0000	1.5
@@ -161,10 +161,10 @@
 }
 
 
-ad_proc bm_context_bar_args { arg_string viewed_user_id } {
+ad_proc bm_context_bar_args { arg_list viewed_user_id } {
     If viewed_user_id <> browsing_user_id we need to prefix the 
     context bar args with an entry for bookmarks of the viewed user. If the
-    arg_string is empty it is assumed that we are on the index page and that otherwise
+    arg_list is empty it is assumed that we are on the index page and that otherwise
     the page has been linked from the index page.
 } {
     set browsing_user_id [ad_conn user_id]
@@ -175,15 +175,15 @@
 	# he can go back to viewing his own bookmarks
 	set user_name [db_string user_name "select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id" -default ""]
 
-	if { [empty_string_p $arg_string] } {
+	if { [empty_string_p $arg_list] } {
 	    # We are on the index page
-	    return "\"Bookmarks of $user_name\""
+	    return [list "Bookmarks of $user_name"]
 	} else {
 	    # We were linked from the index page
-	    return "\[list \"index?viewed_user_id=$viewed_user_id\" \"Bookmarks of $user_name\"\] $arg_string"
+	    return [linsert $arg_list 0 [list "index?viewed_user_id=$viewed_user_id" "Bookmarks of $user_name"]]
 	}
     } else {
-	return $arg_string
+	return $arg_list
     }
 }
 
@@ -247,12 +247,33 @@
 }
 
 
-ad_proc bm_initialize_in_closed_p { viewed_user_id in_closed_p_id } {
+ad_proc bm_initialize_in_closed_p { viewed_user_id in_closed_p_id package_id} {
 
 } {
 	db_exec_plsql initialize_in_closed_p {
 	    begin
-	       bookmark.initialize_in_closed_p(:viewed_user_id, :in_closed_p_id);
+	       bookmark.initialize_in_closed_p(:viewed_user_id, :in_closed_p_id, :package_id);
 	    end;
 	}    
 }
+
+ad_proc -private bm_close_js_brackets {prev_folder_p prev_lev lev} {
+	This helper function is used by the tree-dynamic.tcl page in
+	constructing the bookmark tree for the javascript page.
+} {
+	set result ""
+	if {$prev_folder_p && ($prev_lev >= $lev)} {
+		# Empty folder. We need to add a fake bookmark to the folder or else
+		# it will not have a folder icon attached to it.
+		set i_str [string repeat "\t" $prev_lev]
+		append result "$i_str\t\['Empty folder']\n"
+		append result "$i_str],\n"
+	}
+	while {$prev_lev > $lev} {
+		set i_str [string repeat "\t" [expr $prev_lev - 1]]
+		append result "$i_str],\n"
+		incr prev_lev -1
+	}
+
+	return $result
+}