Index: openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql,v diff -u -r1.13 -r1.14 --- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql 26 Apr 2002 21:07:10 -0000 1.13 +++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql 26 Apr 2002 21:20:02 -0000 1.14 @@ -59,11 +59,6 @@ - - - - - begin Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v diff -u -r1.19 -r1.20 --- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql 26 Apr 2002 21:07:10 -0000 1.19 +++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql 26 Apr 2002 21:20:02 -0000 1.20 @@ -51,11 +51,6 @@ - - - - - select file_storage__get_folder_name(:folder_id); Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl 26 Apr 2002 21:07:10 -0000 1.11 +++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl 26 Apr 2002 21:20:02 -0000 1.12 @@ -326,7 +326,7 @@ ad_proc -public get_folder_contents { {-folder_id ""} - !{-user_id ""} + {-user_id ""} {-n_past_days "-1"} } { Retrieve the contents of the specified folder in the form of a list @@ -373,31 +373,4 @@ return [db_string select_folder_contents_count {}] } - ad_proc -public get_folder_items_recursive { - {-folder_id ""} - {-user_id ""} - {-n_past_days "-1"} - } { - Retrieve the contents of a folder and any of its child folders. - Returns a list of ns_sets, one for each row, with the following keys: - - file_id, name, live_revision, type, - last_modified, content_size, sort_key - - @param folder_id The folder for which to retrieve contents - @param user_id The viewer of the contents (to make sure they have - permission) - @param n_past_days Mark files that are newer than the past N days as new - } { - if {[empty_string_p $folder_id]} { - set folder_id [fs::get_root_folder -package_id [ad_conn package_id]] - } - - if {[empty_string_p $user_id]} { - set user_id [acs_magic_object "the_public"] - } - - return [db_list_of_ns_sets select_folder_items_recursive {}] - } - }