Index: openacs-4/packages/assessment/tcl/as-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-callback-procs.xql,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/assessment/tcl/as-callback-procs.xql	10 Oct 2005 12:59:34 -0000	1.1.2.3
+++ openacs-4/packages/assessment/tcl/as-callback-procs.xql	3 Nov 2005 09:29:04 -0000	1.1.2.4
@@ -140,15 +140,15 @@
     <fullquery name="callback::datamanager::move_assessment::impl::datamanager.update_as_it_acs_objects2">
     <querytext>
         update acs_objects
-        set package_id = :new_package_id        
+        set package_id = :package_id        
         where object_id = (select context_id from acs_objects where object_id=:object_id)
     </querytext>
     </fullquery>
 
     <fullquery name="callback::datamanager::move_assessment::impl::datamanager.update_as_as_acs_objects">
     <querytext>
         update acs_objects
-        set package_id =:new_package_id
+        set package_id =:package_id
         where object_id in (select object_id 
                             from acs_objects 
                             where context_id=
@@ -220,7 +220,7 @@
            sort_order,
            points
     FROM as_assessment_section_map  
-    WHERE section_id=:section_id
+    WHERE section_id=:section_id and assessment_id=:object_id
 </querytext>
 </fullquery>
 
Index: openacs-4/packages/file-storage/tcl/file-storage-copy-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/Attic/file-storage-copy-procs.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/file-storage/tcl/file-storage-copy-procs.tcl	10 Oct 2005 12:59:35 -0000	1.1.2.1
+++ openacs-4/packages/file-storage/tcl/file-storage-copy-procs.tcl	3 Nov 2005 09:26:23 -0000	1.1.2.2
@@ -9,15 +9,34 @@
     {-old_folder_id:required}
     {-new_parent_id:required}
     {-also_subfolders_p "t"}
-    {-also_files_p "t"}    
+    {-also_files_p "t"}   
+    {-mode: "both"}
 } {
     Copy a folder and its subfolders and files, if selected.
 } {
-#get the data
+
+    switch $mode {
+        "empty" { 
+            set also_subfolders_p "f"
+            set also_files_p "f"
+        }
+        "files" { 
+            set also_subfolders_p "f"
+            set also_files_p "t"
+        }
+        "subfolders" { 
+            set also_subfolders_p "t"
+            set also_files_p "f"
+        }
+        "both" { 
+            set also_subfolders_p "t"
+            set also_files_p "t"
+        }
+    }
+#get data
     db_1row get_folder_data {}
 
-#create the copy of the folder
-
+#create forders  copy 
 	set new_folder_id [fs::new_folder -name $pretty_name\
     -pretty_name $name -parent_id $new_parent_id -creation_user $creation_user -creation_ip $creation_ip  -description $description]