Index: openacs-4/packages/assessment/tcl/as-item-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-form-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/tcl/as-item-form-procs.tcl	17 Nov 2004 17:16:07 -0000	1.5
+++ openacs-4/packages/assessment/tcl/as-item-form-procs.tcl	2 Dec 2004 11:08:40 -0000	1.6
@@ -54,10 +54,12 @@
 	    set optionlist [list]
 	    db_foreach item_choices_2 "" {
 	        #for multiple choice item with multimedia
-	        if {![empty_string_p $content_value]} {
+	        if {[empty_string_p $content_value]} {
+		    lappend optionlist [list $title $choice_id]
+		} elseif {[db_string mime_type {SELECT mime_type LIKE 'image%' FROM cr_revisions WHERE revision_id = :content_value}]} {
 		    lappend optionlist [list "$title<img src=\"view/?revision_id=$content_value\">" $choice_id]
 		} else {
-		    lappend optionlist [list $title $choice_id]
+		    lappend optionlist [list "$title<embed src=\"view/?revision_id=$content_value\">" $choice_id]
 		}
 	    }
 	    set options $optionlist
@@ -78,10 +80,12 @@
 	    set optionlist [list]
 	    db_foreach item_choices_2 "" {
 	        #for multiple choice item with multimedia
-	        if {![empty_string_p $content_value]} {
+	        if {[empty_string_p $content_value]} {
+		    lappend optionlist [list $title $choice_id]
+		} elseif {[db_string mime_type {SELECT mime_type LIKE 'image%' FROM cr_revisions WHERE revision_id = :content_value}]} {
 		    lappend optionlist [list "$title<img src=\"view/?revision_id=$content_value\">" $choice_id]
 		} else {
-		    lappend optionlist [list $title $choice_id]
+		    lappend optionlist [list "$title<embed src=\"view/?revision_id=$content_value\">" $choice_id]
 		}    
 	    }
 	    set options $optionlist