[LON-CAPA-cvs] cvs: loncom /interface lonpdfupload.pm

[bisitz]

bisitz		Mon May 25 12:54:18 2009 EDT

  Modified files:              
    /loncom/interface	lonpdfupload.pm 
  Log:
  - Corrected handler info text
  - First check for valid user, then start data_table
  - Optimized wrong-username-message:
      - Standard error style
      - Standard format username:domain
      - Optimized &mt usage
  
  
Index: loncom/interface/lonpdfupload.pm
diff -u loncom/interface/lonpdfupload.pm:1.11 loncom/interface/lonpdfupload.pm:1.12
--- loncom/interface/lonpdfupload.pm:1.11	Sat May 23 05:26:15 2009
+++ loncom/interface/lonpdfupload.pm	Mon May 25 12:54:18 2009
@@ -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 @@
     my $debug = ();
 
     $debug  .= "Found: ". scalar @pdfdata." Entries \n";
-    $result .= '<h2>'.&mt('Results of PDF Form problems').'</h2>';
-    $result .= &Apache::loncommon::start_data_table()
-              .&Apache::loncommon::start_data_table_header_row()
-              .'<th>'.&mt('Problem Name').'</th>'
-              .'<th>'.&mt('Grading').'</th>'
-              .&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 @@
             $user =~ s/(.*)\n/$1/; #TODO is that equals to chomp?
             
             if($user ne $env{'user.name'} or  $domain ne $env{'user.domain'}) {
-                return "<pre>".&mt('Wrong username in PDF-File').": $user $domain -> $env{'user.domain'} $env{'user.name'} </pre>";    
+                return '<p class="LC_error">'
+                      .&mt('Wrong username ([_1]) found in PDF file. Expected username: [_2]'
+                          ,$user.':'.$domain
+                          ,$env{'user.domain'}.':'.$env{'user.name'})
+                      .'</p>';
             }
 
         } elsif($entry =~ /^upload.*/)  {
@@ -266,6 +263,14 @@
     }
     #$result .= $debug;
 
+    $result .= '<h2>'.&mt('Results of PDF Form problems').'</h2>';
+    $result .= &Apache::loncommon::start_data_table()
+              .&Apache::loncommon::start_data_table_header_row()
+              .'<th>'.&mt('Problem Name').'</th>'
+              .'<th>'.&mt('Grading').'</th>'
+              .&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);