[BACK]Return to lonpdfupload.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpdfupload.pm between versions 1.11 and 1.12

version 1.11, 2009/05/23 05:26:15 version 1.12, 2009/05/25 12:54:18
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Publication Handler  # PDF Form Upload Handler
 #  #
 # $Id$  # $Id$
 #  #
Line 217  sub grade_pdf { Line 217  sub grade_pdf {
     my $debug = ();      my $debug = ();
   
     $debug  .= "Found: ". scalar @pdfdata." Entries \n";      $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)) {      foreach my $entry (sort(@pdfdata)) {
         if ($entry =~ /^meta.*/) {          if ($entry =~ /^meta.*/) {
Line 233  sub grade_pdf { Line 226  sub grade_pdf {
             $user =~ s/(.*)\n/$1/; #TODO is that equals to chomp?              $user =~ s/(.*)\n/$1/; #TODO is that equals to chomp?
                           
             if($user ne $env{'user.name'} or  $domain ne $env{'user.domain'}) {              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.*/)  {          } elsif($entry =~ /^upload.*/)  {
Line 266  sub grade_pdf { Line 263  sub grade_pdf {
     }      }
     #$result .= $debug;      #$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)) {      foreach my $key (sort (keys %problems)) {
         my %problem = %{$problems{$key}};          my %problem = %{$problems{$key}};
         my ($problemname, $grade) = &grade_problem(%problem);          my ($problemname, $grade) = &grade_problem(%problem);
Removed from v.1.11  
changed lines
  Added in v.1.12

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>