Index: openacs-4/packages/assessment/tcl/as-qti-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-qti-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/assessment/tcl/as-qti-procs.tcl	5 Nov 2004 00:39:18 -0000	1.8
+++ openacs-4/packages/assessment/tcl/as-qti-procs.tcl	15 Nov 2004 17:17:15 -0000	1.9
@@ -27,8 +27,6 @@
 			# There are assessments
 			foreach assessment $assessmentNodes {
 				set as_assessments__title [$assessment getAttribute {title} {Assessment}]
-				#set as_assessments__name [$assessment getAttribute {ident}]
-				set as_assessments__name [ad_generate_random_string]
 				set nodesList [$assessment childNodes]
 				set as_assessments__definition ""
 				set as_assessments__instructions ""
@@ -55,15 +53,13 @@
 					}
 				}
 				# Insert assessment in the CR (and as_assessments table) getting the revision_id (assessment_id)
-				set as_assessments__assessment_id [as::assessment::new -name $as_assessments__name -title $as_assessments__title -description $as_assessments__definition -instructions $as_assessments__instructions]
+				set as_assessments__assessment_id [as::assessment::new -title $as_assessments__title -description $as_assessments__definition -instructions $as_assessments__instructions]
 				
 				# Section
 				set sectionNodes [$assessment selectNodes {section}]
 				foreach section $sectionNodes {
 					set as_assessment_section_map__sort_order 0
 					set as_sections__title [$section getAttribute {title} {Section}]
-					#set as_sections__name [$section getAttribute {ident}]
-					set as_sections__name [ad_generate_random_string]
 					set nodesList [$section childNodes]
 					set as_sections__definition ""
 					foreach node $nodesList {
@@ -83,7 +79,7 @@
 					        }
 					}
 					# Insert section in the CR (the and the as_sections table) getting the revision_id (section_id)
-					set as_sections__section_id [as::section::new -name $as_sections__name -title $as_sections__title -description $as_sections__definition]
+					set as_sections__section_id [as::section::new -title $as_sections__title -description $as_sections__definition]
 					
 					# Relation between as_sections and as_assessments
 					db_dml as_assessment_section_map_insert {}
@@ -107,8 +103,6 @@
 		# Order of the item_choices
 		set sort_order 0
 		set as_items__title [$item getAttribute {title} {Item}]
-		#set as_items__name [$item getAttribute {ident}]
-		set as_items__name [ad_generate_random_string]
 		array set as_item_choices__correct_answer_p {}
 		array set as_item_choices__score {}
 		set as_items__feedback_right {}
@@ -183,7 +177,7 @@
 					set rows [$render_fib getAttribute {rows} {15}]
 					set cols [$render_fib getAttribute {columns} {55}]
 					set html "rows $rows cols $cols"					
-					set as_item_display_id [as::item_display_ta::new -name [ad_generate_random_string] -abs_size $html]
+					set as_item_display_id [as::item_display_ta::new -abs_size $html]
 					foreach node $presentationChildNodes {
 					if {[$node nodeName] == {material}} {
 						set mattextNodes [$node selectNodes {mattext/text()}]
@@ -193,11 +187,11 @@
 						}
 					}
 					}
-					set as_item_type_id [as::item_type_oq::new -name [ad_generate_random_string]]
+					set as_item_type_id [as::item_type_oq::new]
 				} else {
-					set as_item_display_id [as::item_display_tb::new -name [ad_generate_random_string]]
+					set as_item_display_id [as::item_display_tb::new]
 				
-				set as_item_type_id [as::item_type_mc::new -name [ad_generate_random_string]]
+				set as_item_type_id [as::item_type_mc::new]
 				foreach node $presentationChildNodes {
 					if {[$node nodeName] == {material}} {
 						set mattextNodes [$node selectNodes {mattext/text()}]
@@ -206,52 +200,48 @@
 							append as_items__title " "
 						}
 					} elseif {[$node nodeName] == {response_str} || [$node nodeName] == {response_num} } {
-						#set as_item_choices__ident [$node getAttribute {ident}]
-						set as_item_choices__ident [ad_generate_random_string]
+						set as_item_choices__ident [$node getAttribute {ident}]
 						# get the correct response
 						set as_item_choices__choice_text_nodes [$node selectNodes "//conditionvar/or/varequal\[@respident='$as_item_choices__ident'\]/text()"]
 						set as_item_choices__choice_text {}
 						foreach respident $as_item_choices__choice_text_nodes {
 							lappend as_item_choices__choice_text [string trim [$respident nodeValue]]
 						}
 						# Insert as_item_choice in the CR (and as_item_choices table) getting the revision_id (choice_id)
-						set as_item_choice_id [as::item_choice::new -mc_id $as_item_type_id -name $as_item_choices__ident -title $as_item_choices__choice_text -sort_order $sort_order]
+						set as_item_choice_id [as::item_choice::new -mc_id $as_item_type_id -title $as_item_choices__choice_text -sort_order $sort_order]
 						# order of the item_choices
 						incr sort_order
 						append as_items__title " <textbox as_item_choice_id=$as_item_choice_id> "
 					}
 				    }	
 				}
 				# Insert as_item in the CR (and as_items table) getting the revision_id (as_item_id)
-				set as_item_id [as::item::new -name $as_items__name -title $as_items__title -feedback_right $as_items__feedback_right -feedback_wrong $as_items__feedback_wrong]
+				set as_item_id [as::item::new -title $as_items__title -feedback_right $as_items__feedback_right -feedback_wrong $as_items__feedback_wrong]
 				content::item::relate -item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_id"] -object_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_type_id"] -relation_tag {as_item_type_rel} -relation_type {cr_item_rel}
 				content::item::relate -item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_id"] -object_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_display_id"] -relation_tag {as_item_display_rel} -relation_type {cr_item_rel}
 			} else {
 				set response_lidNodes [$presentation selectNodes {.//response_lid}]
 				# The first node of the list. It may not be a good idea if it doesn't exist
 				set response_lid [lindex $response_lidNodes 0]
-				#set as_item_type__name [$response_lid getAttribute {ident}]
-				set as_item_type__name [ad_generate_random_string]
 				set as_items__rcardinality [$response_lid getAttribute {rcardinality} {Single}]
 				
 				# multiple choice either text (remember it can be internationalized or changed), images, sounds, videos
 				# this is the default
 				set as_item_display_id {}
 				if {$as_items__rcardinality == {Multiple}} {
 					# multiple response either text (remember it can be internationalized or changed), images, sounds, videos
-					set as_item_display_id [as::item_display_cb::new -name [ad_generate_random_string]]
+					set as_item_display_id [as::item_display_cb::new]
 				} else {
-					set as_item_display_id [as::item_display_rb::new -name [ad_generate_random_string]]
+					set as_item_display_id [as::item_display_rb::new]
 				}
-				set as_item_type_id [as::item_type_mc::new -name $as_item_type__name]
+				set as_item_type_id [as::item_type_mc::new]
 				# Insert as_item in the CR (and as_items table) getting the revision_id (as_item_id)
-				set as_item_id [as::item::new -name $as_items__name -title $as_items__title -feedback_right $as_items__feedback_right -feedback_wrong $as_items__feedback_wrong]
+				set as_item_id [as::item::new -title $as_items__title -feedback_right $as_items__feedback_right -feedback_wrong $as_items__feedback_wrong]
 				content::item::relate -item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_id"] -object_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_type_id"] -relation_tag {as_item_type_rel} -relation_type {cr_item_rel}
 				content::item::relate -item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_id"] -object_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_display_id"] -relation_tag {as_item_display_rel} -relation_type {cr_item_rel}
 				set response_labelNodes [$presentation selectNodes {.//response_label}]
 				foreach response_label $response_labelNodes {
-					#set as_item_choices__ident [$response_label getAttribute {ident}]
-					set as_item_choices__ident [ad_generate_random_string]
+					set as_item_choices__ident [$response_label getAttribute {ident}]
 					set mattextNodes [$response_label selectNodes {material/mattext/text()}]
 					set as_item_choices__choice_text [db_null]
 					foreach mattext $mattextNodes {
@@ -270,7 +260,7 @@
 					if {![info exists as_item_choices__score($as_item_choices__ident)]} {
 						set as_item_choices__score($as_item_choices__ident) 0
 					}
-					as::item_choice::new -mc_id $as_item_type_id -name $as_item_choices__ident -title $as_item_choices__choice_text -sort_order $sort_order -correct_answer_p $as_item_choices__correct_answer_p($as_item_choices__ident) -percent_score $as_item_choices__score($as_item_choices__ident) -content_value $as_item_choices__content_value
+					as::item_choice::new -mc_id $as_item_type_id -title $as_item_choices__choice_text -sort_order $sort_order -correct_answer_p $as_item_choices__correct_answer_p($as_item_choices__ident) -percent_score $as_item_choices__score($as_item_choices__ident) -content_value $as_item_choices__content_value
 					# order of the item_choices
 					incr sort_order
 				}