Index: openacs-4/packages/assessment/assessment.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/assessment.info	21 Sep 2004 12:06:15 -0000	1.3
+++ openacs-4/packages/assessment/assessment.info	21 Sep 2004 14:50:17 -0000	1.4
@@ -24,7 +24,8 @@
         <requires url="acs-templating" version="4.1.2"/>
 	
 	 <callbacks>
-            <callback type="after-install"  proc="assessment::install::assessment_create_install"/>            
+            <callback type="after-install"  proc="assessment::install::assessment_create_install"/>
+	    <callback type="after-instantiate"  proc="assessment::install::package_instantiate"/>
         </callbacks>
 
         <parameters>
Index: openacs-4/packages/assessment/tcl/install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/Attic/install-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/tcl/install-procs.tcl	21 Sep 2004 12:06:13 -0000	1.1
+++ openacs-4/packages/assessment/tcl/install-procs.tcl	21 Sep 2004 14:50:18 -0000	1.2
@@ -115,14 +115,23 @@
 content::type::register_relation_type -content_type {as_items} -target_type {as_item_type_mc} -relation_tag {as_item_type_rel}
 content::type::register_relation_type -content_type {as_items} -target_type {as_item_display_rb} -relation_tag {as_item_display_rel}
 
-set folder_id [content::folder::new -name {as_items} -package_id [ad_conn package_id] ]
-content::folder::register_content_type -folder_id $folder_id -content_type {as_item_choices} -include_subtypes t
-content::folder::register_content_type -folder_id $folder_id -content_type {as_item_type_mc} -include_subtypes t
-content::folder::register_content_type -folder_id $folder_id -content_type {as_item_display_rb} -include_subtypes t
-content::folder::register_content_type -folder_id $folder_id -content_type {as_items} -include_subtypes t
-content::folder::register_content_type -folder_id $folder_id -content_type {as_sections} -include_subtypes t
-content::folder::register_content_type -folder_id $folder_id -content_type {as_assessments} -include_subtypes t
-content::folder::register_content_type -folder_id $folder_id -content_type {as_sessions} -include_subtypes t
-content::folder::register_content_type -folder_id $folder_id -content_type {as_section_data} -include_subtypes t
-content::folder::register_content_type -folder_id $folder_id -content_type {as_item_data} -include_subtypes t
 }
+
+ad_proc -public assessment::install::package_instantiate {
+    
+    Define folders
+    
+} {
+
+    set folder_id [content::folder::new -name {as_items} -package_id [ad_conn package_id] ]
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_choices} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_type_mc} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_display_rb} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_items} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_sections} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_assessments} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_sessions} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_section_data} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_data} -include_subtypes t
+
+}