--- loncom/interface/lonpdfupload.pm 2009/05/23 05:26:15 1.11
+++ loncom/interface/lonpdfupload.pm 2009/05/25 12:54:18 1.12
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
-# Publication Handler
+# PDF Form Upload Handler
#
-# $Id: lonpdfupload.pm,v 1.11 2009/05/23 05:26:15 onken Exp $
+# $Id: lonpdfupload.pm,v 1.12 2009/05/25 12:54:18 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -217,13 +217,6 @@ sub grade_pdf {
my $debug = ();
$debug .= "Found: ". scalar @pdfdata." Entries \n";
- $result .= '
'.&mt('Results of PDF Form problems').'
';
- $result .= &Apache::loncommon::start_data_table()
- .&Apache::loncommon::start_data_table_header_row()
- .''.&mt('Problem Name').' | '
- .''.&mt('Grading').' | '
- .&Apache::loncommon::start_data_table_header_row()
- .&Apache::loncommon::end_data_table_header_row();
foreach my $entry (sort(@pdfdata)) {
if ($entry =~ /^meta.*/) {
@@ -233,7 +226,11 @@ sub grade_pdf {
$user =~ s/(.*)\n/$1/; #TODO is that equals to chomp?
if($user ne $env{'user.name'} or $domain ne $env{'user.domain'}) {
- return "".&mt('Wrong username in PDF-File').": $user $domain -> $env{'user.domain'} $env{'user.name'}
";
+ return ''
+ .&mt('Wrong username ([_1]) found in PDF file. Expected username: [_2]'
+ ,$user.':'.$domain
+ ,$env{'user.domain'}.':'.$env{'user.name'})
+ .'
';
}
} elsif($entry =~ /^upload.*/) {
@@ -266,6 +263,14 @@ sub grade_pdf {
}
#$result .= $debug;
+ $result .= ''.&mt('Results of PDF Form problems').'
';
+ $result .= &Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .''.&mt('Problem Name').' | '
+ .''.&mt('Grading').' | '
+ .&Apache::loncommon::start_data_table_header_row()
+ .&Apache::loncommon::end_data_table_header_row();
+
foreach my $key (sort (keys %problems)) {
my %problem = %{$problems{$key}};
my ($problemname, $grade) = &grade_problem(%problem);