--- loncom/homework/grades.pm 2004/09/14 13:30:09 1.209
+++ loncom/homework/grades.pm 2004/09/16 17:47:23 1.212
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.209 2004/09/14 13:30:09 ng Exp $
+# $Id: grades.pm,v 1.212 2004/09/16 17:47:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4719,7 +4719,8 @@ sub scantron_upload_scantron_data_save {
}
return '';
}
-# $r->print("Doing upload to ".$ENV{'form.courseid'}."
");
+ my %coursedata=&Apache::lonnet::coursedescription($ENV{'form.domainid'}.'_'.$ENV{'form.courseid'});
+ $r->print("Doing upload to ".$coursedata{'description'}."
");
my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'},
$ENV{'form.domainid'});
my $fname=$ENV{'form.upfile.filename'};
@@ -4742,17 +4743,14 @@ sub scantron_upload_scantron_data_save {
$r->print("Error: The file you attempted to upload, ".&HTML::Entities::encode($ENV{'form.upfile.filename'},'<>&"').", 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/|) {
- if ($result !~ m|^/uploaded/|) {
-# $r->print("Success: Successfully uploaded ".(length($ENV{'form.upfile'})-1)." bytes of data into location ".$result."");
-# } else {
+ if ($result =~ m|^/uploaded/|) {
+ $r->print("Success: Successfully uploaded ".(length($ENV{'form.upfile'})-1)." bytes of data into location ".$result."");
+ } else {
$r->print("Error: An error (".$result.") occurred when attempting to upload the file, ".&HTML::Entities::encode($ENV{'form.upfile.filename'},'<>&"')."");
}
}
if ($symb) {
-# $r->print(&show_grading_menu_form($symb,$url));
$r->print(&scantron_selectphase($r,$uploadedfile));
-
} else {
$r->print($doanotherupload);
}
@@ -5116,8 +5114,7 @@ sub send_header {
sub send_footer {
my ($request)= @_;
- $request->print('');
- $request->print(&Apache::lontexconvert::footer());
+ $request->print('