Index: openacs-4/packages/evaluation/www/answer-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-add-edit.tcl,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/evaluation/www/answer-add-edit.tcl	17 Nov 2004 23:58:17 -0000	1.12.2.1
+++ openacs-4/packages/evaluation/www/answer-add-edit.tcl	8 Jun 2005 22:07:45 -0000	1.12.2.2
@@ -14,6 +14,7 @@
     upload_file:trim,optional
     upload_file.tmpfile:tmpfile,optional
     return_url:notnull
+    {comment ""}
 } -validate {
     late_submit -requires { task_id:integer } {
 	if { [string eq [db_string late_turn_in { *SQL* }] "f"] && [db_string compare_dates { *SQL* } -default 0] } {
@@ -26,7 +27,7 @@
 
 set user_id [ad_conn user_id]
 set party_id [db_string get_party_id { *SQL* }]
-
+set late_p [db_string compare_dates { *SQL* } -default 0]
 set package_id [ad_conn package_id]
 
 if { [ad_form_new_p -key answer_id] } {
@@ -57,94 +58,94 @@
 		{label "[_ evaluation.URL__1]"} 
 		{value "http://"}
 	}
-}
 
-ad_form -extend -name answer -form {
-
-} -edit_request {
+	{comment:text(textarea),optional
+	    {label "Comment text"}
+	    
+	}
 	
+    } -edit_request {
+	
 	db_1row item_data { *SQL* }
-
-} -validate {
-    {url
-	{ ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) || (![string eq $url "http://"] && [util_url_valid_p $url]) }
-	{ [_ evaluation.lt_Upload_a_file_OR_a_va] }
-    }
-    {upload_file
-	{ ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) }
-	{ [_ evaluation.lt_Upload_a_file_OR_a_ur] }
-    }
-} -on_submit {
 	
+    } -validate {
+	{url
+	    { ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) || (![string eq $url "http://"] && [util_url_valid_p $url]) }
+	    { [_ evaluation.lt_Upload_a_file_OR_a_va] }
+	}
+	{upload_file
+	    { ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) }
+	    { [_ evaluation.lt_Upload_a_file_OR_a_ur] }
+	}
+    } -on_submit {
 	db_transaction {
-
-		set mime_type "text/plain"
-		set title ""
-		set storage_type text
-		if { ![empty_string_p $upload_file] } {
-			
-			# Get the filename part of the upload file
-			if { ![regexp {[^//\\]+$} $upload_file filename] } {
-				# no match
-				set filename $upload_file
-			}
-        
-			set title [template::util::file::get_property filename $upload_file]
-			set mime_type [cr_filename_to_mime_type -create $title]
-
+	    
+	    set mime_type "text/plain"
+	    set title ""
+	    set storage_type text
+	    if { ![empty_string_p $upload_file] } {
+		
+		# Get the filename part of the upload file
+		if { ![regexp {[^//\\]+$} $upload_file filename] } {
+		    # no match
+		    set filename $upload_file
+		}
+		
+		set title [template::util::file::get_property filename $upload_file]
+		set mime_type [cr_filename_to_mime_type -create $title]
+		
 			if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
 			    set storage_type file
 			} else {
 			    set storage_type lob
 			}
-
-		}  elseif { ![string eq $url "http://"] } {
-			set mime_type "text/plain"
-			set title "link"
-			set storage_type text
-		}
 		
-		set title [evaluation::safe_url_name -name $title]
-		if { [ad_form_new_p -key answer_id] } {
-			set item_id $answer_id
-		} 
-
-		set revision_id [evaluation::new_answer -new_item_p [ad_form_new_p -key answer_id] -item_id $item_id -content_type evaluation_answers \
-							 -content_table evaluation_answers -content_id answer_id -storage_type $storage_type -task_item_id $task_item_id \
-							 -title $title -mime_type $mime_type -party_id $party_id]
-		
+	    }  elseif { ![string eq $url "http://"] } {
+		set mime_type "text/plain"
+		set title "link"
+		set storage_type text
+	    }
+	    
+	    set title [evaluation::safe_url_name -name $title]
+	    if { [ad_form_new_p -key answer_id] } {
+		set item_id $answer_id
+	    } 
+	    
+	    set revision_id [evaluation::new_answer -new_item_p [ad_form_new_p -key answer_id] -item_id $item_id -content_type evaluation_answers \
+				 -content_table evaluation_answers -content_id answer_id -storage_type $storage_type -task_item_id $task_item_id \
+				 -title $title -mime_type $mime_type -party_id $party_id -comment $comment]
+	    
 		evaluation::set_live -revision_id $revision_id
-
-		if { ![empty_string_p $upload_file] }  {
-
-			set tmp_file [template::util::file::get_property tmp_filename $upload_file]
-			set content_length [file size $tmp_file]
-			
-			if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
-			    # create the new item
-			    
-			    set filename [cr_create_content_file $item_id $revision_id $tmp_file]
-			    db_dml set_file_content { *SQL* }
-
-			} else {
-			    
-			    # create the new item
-			    db_dml lob_content { *SQL* } -blob_files [list $tmp_file]
-
-			    # Unfortunately, we can only calculate the file size after the lob is uploaded 
-			    db_dml lob_size { *SQL* }
-			}
-
-		} elseif { ![string eq $url "http://"] } {
-			
-			db_dml link_content { *SQL* }
-			set content_length 0
-			db_dml content_size { *SQL* }
-			
+	    
+	    if { ![empty_string_p $upload_file] }  {
+		
+		set tmp_file [template::util::file::get_property tmp_filename $upload_file]
+		set content_length [file size $tmp_file]
+		
+		if { [parameter::get -parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]] } {
+		    # create the new item
+		    
+		    set filename [cr_create_content_file $item_id $revision_id $tmp_file]
+		    db_dml set_file_content { *SQL* }
+		    
+		} else {
+		    
+		    # create the new item
+		    db_dml lob_content { *SQL* } -blob_files [list $tmp_file]
+		    
+		    # Unfortunately, we can only calculate the file size after the lob is uploaded 
+		    db_dml lob_size { *SQL* }
 		}
+		
+	    } elseif { ![string eq $url "http://"] } {
+		
+		db_dml link_content { *SQL* }
+		set content_length 0
+		db_dml content_size { *SQL* }
+		
+	    }
 	}
- 
- 	ad_returnredirect "answer-ok?return_url=\"$return_url\""
+	ad_returnredirect "[export_vars -base answer-ok {return_url}]"
  	ad_script_abort
 }