Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl	29 Sep 2013 13:40:40 -0000	1.11
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl	27 Oct 2014 16:41:01 -0000	1.12
@@ -4,11 +4,11 @@
     @author Timo Hentschel (timo@timohentschel.de)
     @cvs-id $Id:
 } {
-    assessment_id:integer
-    section_id:integer
-    as_item_id:integer
+    assessment_id:naturalnum,notnull
+    section_id:naturalnum,notnull
+    as_item_id:naturalnum,notnull
     after:integer
-    mc_id:integer
+    mc_id:naturalnum,notnull
     display_type
     feedback:array,optional
     fixed_pos:array,optional
@@ -66,7 +66,7 @@
 	    set answer_value $answer_val($choice_id)
 
 	    eval set content "\$content_$choice_id"
-	    if {![empty_string_p $content]} {
+	    if {$content ne ""} {
 		set filename [lindex $content 0]
 		set tmp_filename [lindex $content 1]
 		set file_mimetype [lindex $content 2]
@@ -117,7 +117,7 @@
 # (apparently the author does not want the respondee to give a correct answer.
  
 if {$count_correct > 0} {
-    set percentage [expr 100 / $count_correct]
+    set percentage [expr {100 / $count_correct}]
 } else {
     set percentage 0
 }
@@ -142,7 +142,7 @@
 	    set answer_value $answer_val($choice_id)
 
 	    eval set content "\$content_$choice_id"
-	    if {![empty_string_p $content]} {
+	    if {$content ne ""} {
 		set filename [lindex $content 0]
 		set tmp_filename [lindex $content 1]
 		set file_mimetype [lindex $content 2]