Index: openacs-4/contrib/packages/survey/www/admin/question-modify.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-modify.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/question-modify.tcl	14 Feb 2004 19:57:59 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/question-modify.tcl	13 Jan 2005 13:54:40 -0000	1.4
@@ -43,10 +43,14 @@
 	{warning:text(inform) {label "[_ survey.Warning]"} {value "<span style=\"color: #f00;\">[_ survey.lt_There_isare_n_respons]"}}
     }
 }
+
 ad_form -extend -name modify_question -export {sort_order} -form {
     {question_number:text(inform) {label "[_ survey.Modify_Question__]"}}
     {survey_name:text(inform) {label "[_ survey.From_1]"} {value $survey_name}}
     {question_text:text(textarea) {label "[_ survey.Question]"} {html {rows 5 cols 70}}}
+    {pretty_id:text {label "Variable name"}
+        {help_text "This will be the name of the variable when creating reports. No spaces or special characers."}
+    }
 }
 
 if {$allow_question_deactivation == 1} {
@@ -70,12 +74,29 @@
 
 if {($presentation_type=="checkbox" || $presentation_type=="select" || $presentation_type=="radio") && $abstract_data_type != "boolean" && $block_p=="f"} {
     ad_form -extend -name modify_question -form {
-	{presentation_type:text(radio) {options {{"[_ survey.Radio_buttons]" radio} {"[_ survey.Checkboxes]" checkbox} {"[_ survey.Select_box]" select}}} {value $presentation_type} {label "[_ survey.Presentation]"}}
+	{presentation_type:text(radio) {
+	    options {
+		{"[_ survey.Radio_buttons]" radio} 
+		{"[_ survey.Checkboxes]" checkbox} 
+		{"[_ survey.Select_box]" select} 
+		{"[_ survey.Radio_buttons_text]" radio_text} 
+		{"[_ survey.Checkboxes_text]" checkbox_text} 
+		{"[_ survey.Select_box_text]" select_text}
+	    }
+	} 
+	    {value $presentation_type} 
+	    {label "[_ survey.Presentation]"}
+	}
     }
-    set valid_responses_list [db_list survey_question_valid_responses {}]
+
     set response_list ""
-    foreach response $valid_responses_list {
-	append valid_responses "$response\n"
+    set response_list ""
+    db_foreach survey_question_valid_responses "" {
+	if {![empty_string_p $numeric_value]} {
+	    append valid_responses "[join [list $response_label $numeric_value] ","]\n"
+	} else {
+	    append valid_responses "${response_label}\n"
+	}
     }
     ad_form -extend -name modify_question -form {
         {valid_responses:text(textarea)
@@ -118,13 +139,16 @@
 	    set count 0
 	    set response_list ""
 	    foreach response $responses {
+		set numeric_value ""
+		regexp {(.+),\s*(\d+)} $response discard response numeric_value
 		set trimmed_response [string trim $response]
+		set numeric_value [string trim $numeric_value]
 		if { [empty_string_p $trimmed_response] } {
 		    # skip empty lines
 		    continue
 		}
 		
-		lappend response_list [list "$trimmed_response" "$count"]
+		lappend response_list [list "$trimmed_response" "$count" ${numeric_value}]
 		incr count
 	    }
 	    
@@ -133,6 +157,7 @@
 	    foreach one_response $response_list {
 		set choice_label [lindex $one_response 0]
 		set sort_order [lindex $one_response 1]
+		set numeric_value [lindex $one_response 2]
 		set choice_id_to_update [lindex $choice_id_to_update_list $sort_order]
 		if {[empty_string_p $choice_id_to_update]} {
 		    set new_choice_id [db_nextval survey_choice_id_sequence]