--- loncom/homework/grades.pm	2004/03/04 14:09:47	1.179
+++ loncom/homework/grades.pm	2004/03/19 04:20:24	1.183
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.179 2004/03/04 14:09:47 albertel Exp $
+# $Id: grades.pm,v 1.183 2004/03/19 04:20:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1704,8 +1704,10 @@ KEYWORDS
 	    ($ENV{'form.command'} eq 'processGroup' && $counter == $total)) {
 	    $toGrade.='</form>'.&show_grading_menu_form($symb,$url) 
 	}
-	$request = print($toGrade);
+	$request->print($toGrade);
 	return;
+    } else {
+	$request->print('</td></tr></table></td></tr></table>'."\n");
     }
 
     # essay grading message center
@@ -4202,7 +4204,8 @@ sub scantron_upload_scantron_data {
     my ($r)=@_;
     $r->print(&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'}));
     my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
-							  'domainid');
+							  'domainid',
+							  'coursename');
     my $domsel=&Apache::loncommon::select_dom_form($ENV{'request.role.domain'},
 						   'domainid');
     my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
@@ -4219,12 +4222,14 @@ sub scantron_upload_scantron_data {
 
 <form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
 $default_form_data
-Course: <input name='courseid' type='text' />
-Domain: $domsel $select_link
-<br />
+<table>
+<tr><td>$select_link </td></tr>
+<tr><td>Course ID:   </td><td><input name='courseid' type='text' />  </td></tr>
+<tr><td>Course Name: </td><td><input name='coursename' type='text' /></td></tr>
+<tr><td>Domain:      </td><td>$domsel                                </td></tr>
+<tr><td>File to upload:</td><td><input type="file" name="upfile" size="50" /></td></tr>
+</table>
 <input name='command' value='scantronupload_save' type='hidden' />
-File to upload:<input type="file" name="upfile" size="50" />
-<br />
 <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
 </form>
 UPLOAD
@@ -4233,11 +4238,21 @@ UPLOAD
 
 sub scantron_upload_scantron_data_save {
     my($r)=@_;
+    my ($symb,$url)=&get_symb_and_url($r,1);
+    my $doanotherupload=
+	'<br /><form action="/adm/grades" method="post">'."\n".
+	'<input type="hidden" name="command" value="scantronupload" />'."\n".
+	'<input type="submit" name="submit" value="Do Another Upload" />'."\n".
+	'</form>'."\n";
     if (!&Apache::lonnet::allowed('usc',$ENV{'form.domainid'}) &&
 	!&Apache::lonnet::allowed('usc',
 			    $ENV{'form.domainid'}.'_'.$ENV{'form.courseid'})) {
 	$r->print("You are not allowed to upload Scantron data to the requested course.<br />");
-	$r->print(&show_grading_menu_form(&get_symb_and_url($r)));
+	if ($symb) {
+	    $r->print(&show_grading_menu_form($symb,$url));
+	} else {
+	    $r->print($doanotherupload);
+	}
 	return '';
     }
     $r->print("Doing upload to ".$ENV{'form.courseid'}." <br />");
@@ -4258,17 +4273,20 @@ sub scantron_upload_scantron_data_save {
     # See if there is anything left
     unless ($fname) { return 'error: no uploaded file'; }
     $fname='scantron_orig_'.$fname;
-    $r->print(&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},
-						    $ENV{'form.domainid'},
-						    $home,'upfile',$fname));
-    my ($symb,$url)=&get_symb_and_url($r);
+    if (length($ENV{'form.upfile'}) < 2) {
+	$r->print("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($ENV{'form.upfile.filename'})."</tt>, contained no information. Please check that you entered the correct filename.");
+    } else {
+	my $result=&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},$ENV{'form.domainid'},$home,'upfile',$fname);
+	if ($result =~ m|^/uploaded/|) {
+	    $r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($ENV{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
+	} else {
+	    $r->print("<font color='red'>Error:</font> An error (".$result.") occured when attempting to upload the file, <tt>".&HTML::Entities::encode($ENV{'form.upfile.filename'})."</tt>");
+	}
+    }
     if ($symb) {
-	$r->print(&show_grading_menu_form(&get_symb_and_url($r)));
+	$r->print(&show_grading_menu_form($symb,$url));
     } else {
-	$r->print('<br /><form action="/adm/grades" method="post">'."\n".
-		  '<input type="hidden" name="command" value="scantronupload" />'."\n".
-		  '<input type="submit" name="submit" value="Do Another Upload" />'."\n".
-		  '</form>'."\n");
+	$r->print($doanotherupload);
     }
     return '';
 }