Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl,v diff -u -r1.77 -r1.77.2.1 --- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl 9 Aug 2002 18:39:28 -0000 1.77 +++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl 18 Feb 2003 01:49:23 -0000 1.77.2.1 @@ -511,28 +511,26 @@ # first, get the contents of the old root folder and public folder_id set user_id [ad_conn user_id] - set old_root_contents [fs::get_folder_contents \ + set old_root_contents [fs::get_folder_objects \ -folder_id $old_root_folder \ -user_id $user_id ] set old_public_folder_id [get_public_folder_id -parent_id $old_root_folder] # go through the list of stuff - foreach item $old_root_contents { - # ns_set print $item - set object_id [ns_set get $item object_id] + foreach object_id $old_root_contents { if {$object_id == $old_public_folder_id} { # this is the old public folder so, copy # it's _contents_ into the new public folder - set old_public_contents [fs::get_folder_contents \ + set old_public_contents [fs::get_folder_objects \ -folder_id $object_id \ -user_id $user_id ] - foreach public_item $old_public_contents { + foreach public_item_id $old_public_contents { copy_fs_object \ - -object_id [ns_set get $public_item object_id] \ + -object_id $public_item_id \ -target_folder_id $public_folder_id \ -user_id $user_id } @@ -612,15 +610,15 @@ } # we gotta copy the contents of the folder now - set folder_contents [fs::get_folder_contents \ + set folder_contents [fs::get_folder_objects \ -folder_id $object_id \ -user_id $user_id ] - foreach item $folder_contents { + foreach item_id $folder_contents { copy_fs_object \ - -object_id [ns_set get $item object_id] \ + -object_id $item_id] \ -target_folder_id $new_folder_id \ -user_id $user_id \ -node_id $node_id