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

Diff for /loncom/interface/lonpdfupload.pm between versions 1.6 and 1.7

version 1.6, 2009/05/16 00:28:38 version 1.7, 2009/05/21 03:09:01
Line 65  sub handler() { Line 65  sub handler() {
     $env{'request.uri'}=$r->uri;      $env{'request.uri'}=$r->uri;
     $r->content_type('text/html');      $r->content_type('text/html');
     $r->send_http_header();      $r->send_http_header();
     $r->print(&Apache::loncommon::start_page('Upload PDF Form'));      $r->print(&Apache::loncommon::start_page(&mt('Upload PDF Form')));
   
     #load post data into environment      #load post data into environment
     &Apache::lonacc::get_posted_cgi($r);      &Apache::lonacc::get_posted_cgi($r);
Line 89  sub handler() { Line 89  sub handler() {
     );      );
   
     #&dumpenv($r); #debug -> prints the environment      #&dumpenv($r); #debug -> prints the environment
     $r->print("  </body> \n</html>\n");      $r->print(&Apache::loncommon::end_page());
     return OK;      return OK;
 }  }
   
Line 270  sub grade_pdf { Line 270  sub grade_pdf {
         my %problem = %{$problems{$key}};          my %problem = %{$problems{$key}};
         my ($problemname, $grade) = &grade_problem(%problem);          my ($problemname, $grade) = &grade_problem(%problem);
   
         $problemname =~ s/(.*)\s*-\sPart\s0/$1/; #cut part when there is only one part in problem  
   
         $result .= &Apache::loncommon::start_data_table_row();          $result .= &Apache::loncommon::start_data_table_row();
         $result .= "<td>$problemname</td><td class='";          $result .= "<td>$problemname</td><td class='";
         if($grade eq "EXACT_ANS") {          if($grade eq "EXACT_ANS") {
Line 290  sub grade_pdf { Line 288  sub grade_pdf {
   
 sub grade_problem {  sub grade_problem {
     my %problem = @_;      my %problem = @_;
       my ($title, $part) = ();
   
     my ($content) =  &Apache::loncommon::ssi_with_retries('/res/'.      &Apache::loncommon::ssi_with_retries('/res/'.$problem{'resource'}, 5, %problem);
             $problem{'resource'}, 5, %problem);  
       
     #TODO ? filter html response can't be the answer   
     #     ! find an other way to get a problemname and Part  
     $content =~ s/.*class="LC_current_location".*>(.*)<\/td>.*/$1/g;  
     $content = $1;  
   
     my $part = $problem{submitted};      $title = &Apache::lonnet::gettitle($problem{'symb'});    
       $part = $problem{submitted};
     $part =~ s/part_(.*)/$1/;      $part =~ s/part_(.*)/$1/;
     $content .= " - Part $part";      unless($part eq '0') {
           #add information about part number
           $title .= " - Part $part";
       }
     
     my %problemhash = &Apache::lonnet::restore($problem{'symb'});      my %problemhash = &Apache::lonnet::restore($problem{'symb'});
     my $grade = $problemhash{"resource.$part.award"};      my $grade = $problemhash{"resource.$part.award"};
   
     return ($content, $grade);          return ($title, $grade);    
 }  }
   
 sub dumpenv  {  sub dumpenv  {
Removed from v.1.6  
changed lines
  Added in v.1.7

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