Index: openacs-4/packages/assessment/tcl/as-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/tcl/as-item-procs.tcl	8 Dec 2004 15:30:34 -0000	1.4
+++ openacs-4/packages/assessment/tcl/as-item-procs.tcl	10 Dec 2004 11:42:23 -0000	1.5
@@ -7,16 +7,17 @@
 namespace eval as::item {}
 
 ad_proc -public as::item::new {
+    {-name:required}
     {-title:required}
     {-description ""}
     {-subtext ""}
     {-field_code ""}
-    {-definition ""}
     {-required_p ""}
     {-data_type ""}
     {-max_time_to_complete ""}
     {-feedback_right ""}
     {-feedback_wrong ""}
+    {-points ""}
 } {
     @author Eduardo Perez (eperez@it.uc3m.es)
     @creation-date 2004-07-26
@@ -28,19 +29,23 @@
 
     # Insert as_item in the CR (and as_items table) getting the revision_id (as_item_id)
     db_transaction {
-        set item_item_id [content::item::new -parent_id $folder_id -content_type {as_items} -name [exec uuidgen] -title $title ]
+	set item_item_id [db_nextval acs_object_id_seq]
+	if {[empty_string_p $name]} {
+	    set name "ITE_$item_item_id"
+	}
+        set item_item_id [content::item::new -item_id $item_item_id -parent_id $folder_id -content_type {as_items} -name $name -title $title ]
         set as_item_id [content::revision::new -item_id $item_item_id \
 			    -content_type {as_items} \
 			    -title $title \
 			    -description $description \
 			    -attributes [list [list subtext $subtext] \
 					     [list field_code $field_code] \
-					     [list definition $definition] \
 					     [list required_p $required_p] \
 					     [list data_type $data_type] \
 					     [list max_time_to_complete $max_time_to_complete] \
 					     [list feedback_right $feedback_right] \
-					     [list feedback_wrong $feedback_wrong] ] ]
+					     [list feedback_wrong $feedback_wrong] \
+					     [list points $points] ] ]
     }
 
     return $as_item_id
@@ -52,12 +57,12 @@
     {-description ""}
     {-subtext ""}
     {-field_code ""}
-    {-definition ""}
     {-required_p ""}
     {-data_type ""}
     {-max_time_to_complete ""}
     {-feedback_right ""}
     {-feedback_wrong ""}
+    {-points ""}
 } {
     @author Timo Hentschel (timo@timohentschel.de)
     @creation-date 2004-12-07
@@ -74,12 +79,12 @@
 			     -description $description \
 			     -attributes [list [list subtext $subtext] \
 					      [list field_code $field_code] \
-					      [list definition $definition] \
 					      [list required_p $required_p] \
 					      [list data_type $data_type] \
 					      [list max_time_to_complete $max_time_to_complete] \
 					      [list feedback_right $feedback_right] \
-					      [list feedback_wrong $feedback_wrong] ] ]
+					      [list feedback_wrong $feedback_wrong] \
+					      [list points $points] ] ]
 
 	copy_types -as_item_id $as_item_id -new_item_id $new_item_id
     }
@@ -105,12 +110,12 @@
 			     -description $description \
 			     -attributes [list [list subtext $subtext] \
 					      [list field_code $field_code] \
-					      [list definition $definition] \
 					      [list required_p $required_p] \
 					      [list data_type $data_type] \
 					      [list max_time_to_complete $max_time_to_complete] \
 					      [list feedback_right $feedback_right] \
-					      [list feedback_wrong $feedback_wrong] ] ]
+					      [list feedback_wrong $feedback_wrong] \
+					      [list points $points] ] ]
 
 	copy_types -as_item_id $as_item_id -new_item_id $new_item_id
 	as::assessment::copy_categories -from_id $as_item_id -to_id $new_item_id
@@ -121,6 +126,7 @@
 
 ad_proc -public as::item::copy {
     -as_item_id:required
+    -name:required
 } {
     @author Timo Hentschel (timo@timohentschel.de)
     @creation-date 2004-12-07
@@ -135,20 +141,24 @@
 	db_1row item_data {}
 	append title "[_ assessment.copy_appendix]"
 
-        set item_item_id [content::item::new -parent_id $folder_id -content_type {as_items} -name [exec uuidgen] -title $title ]
+	set item_item_id [db_nextval acs_object_id_seq]
+	if {[empty_string_p $name]} {
+	    set name "ITE_$item_item_id"
+	}
+        set item_item_id [content::item::new -item_id $item_item_id -parent_id $folder_id -content_type {as_items} -name $name -title $title ]
         set new_item_id [content::revision::new \
 			     -item_id $item_item_id \
 			     -content_type {as_items} \
 			     -title $title \
 			     -description $description \
 			     -attributes [list [list subtext $subtext] \
 					      [list field_code $field_code] \
-					      [list definition $definition] \
 					      [list required_p $required_p] \
 					      [list data_type $data_type] \
 					      [list max_time_to_complete $max_time_to_complete] \
 					      [list feedback_right $feedback_right] \
-					      [list feedback_wrong $feedback_wrong] ] ]
+					      [list feedback_wrong $feedback_wrong] \
+					      [list points $points] ] ]
 
 	as::assessment::copy_categories -from_id $as_item_id -to_id $new_item_id