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

Diff for /loncom/interface/lonprintout.pm between versions 1.557.2.1 and 1.558

version 1.557.2.1, 2009/07/14 09:30:20 version 1.558, 2009/07/03 16:13:13
Line 943  sub old_character_chart { Line 943  sub old_character_chart {
     $result =~ s/&(ldquo|#8220);/\`\`/g;      $result =~ s/&(ldquo|#8220);/\`\`/g;
     $result =~ s/&(rdquo|#8221);/\'\'/g;      $result =~ s/&(rdquo|#8221);/\'\'/g;
   
 &Apache::lonnet::logthis("After pass through old character chart: '$result'");  
   
   
     return $result;      return $result;
 }  }
Line 1308  sub unsupported { Line 1306  sub unsupported {
 }  }
   
   
 sub print_page_in_course {  
     my ($helper, $currentURL, $resources) = @_;  
     my @page_resources = @$resources;  
     my $mode = $helper->{'VARS'}->{'LATEX_TYPE'};  
     my $symb = $helper->{'VARS'}->{'symb'};  
   
     if ($mode ne '') {$mode='\\'.$mode}  
     my $result.= &print_latex_header($mode);  
     if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {  
  $currentURL=~s|^(/adm/wrapper/)?ext/|http://|;  
  my $title=&Apache::lonnet::gettitle($symb);  
  $title = &Apache::lonxml::latex_special_symbols($title);  
  $result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';  
     } else {  
  $result.=$currentURL;  
     }  
   
     # First is theo verall page description.  This is then followed by the   
     # components of the page. Each of which must be printed independently.  
   
     my $the_page = shift(@page_resources);   
     $result .= "URL: $currentURL " .'\\\\';  
   
     foreach my $resource (@page_resources) {  
  my $resource_src   = $resource->src();  
  my $resource_symb  = $resource->symb();  
  $resource_symb     = &Apache::lonnet::clutter($resource_symb);  
  my $resource_kind  = $resource->kind();  
  my $resource_title = $resource->title();  
   
  $result .= &Apache::lonxml::latex_special_symbols("Src:  $resource_src   symb:  $resource_symb ");   
  $result .= &Apache::lonxml::latex_special_symbols("Kind: $resource_kind  Title: $resource_title");  
  $result .=  '\\\\';  
     }  
   
     $result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';  
     return $result;  
 }  
   
   
 #  #
 # List of recently generated print files  # List of recently generated print files
 #  #
Line 1591  sub output_data { Line 1549  sub output_data {
 ENDPART  ENDPART
   
   
       # Breadcrumbs
     my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);      #FIXME: Choose better/different breadcrumbs?!? Links?
       my $brcrum = [{'href' => '',
                      'text' => 'Helper'}, #FIXME: Different origin possible than print out helper?
                     {'href' => '',
                      'text' => 'Preparing Printout'}];
   
       my $start_page  = &Apache::loncommon::start_page('Preparing Printout',
                                                        $js,
                                                        {'bread_crumbs' => $brcrum,});
     my $msg = &mt('Please stand by while processing your print request, this may take some time ...');      my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
   
     $r->print($start_page."\n<p>\n$msg\n</p>\n");      $r->print($start_page."\n<p>\n$msg\n</p>\n");
Line 1767  ENDPART Line 1733  ENDPART
         } elsif ($cleanURL!~m|^/adm/|          } elsif ($cleanURL!~m|^/adm/|
  && $currentURL=~/\.(sequence|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {   && $currentURL=~/\.(sequence|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {
             #printing content of sequence from the construction space              #printing content of sequence from the construction space
   
     &Apache::lonnet::logthis("Printing sequence/page but construction space??");  
   
     $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;      $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
 #    $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});  #    $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
     $result .= &print_construction_sequence($currentURL, $helper, %form,      $result .= &print_construction_sequence($currentURL, $helper, %form,
Line 1805  ENDPART Line 1768  ENDPART
  } elsif ($cleanURL =~ /\.pdf$/i) {   } elsif ($cleanURL =~ /\.pdf$/i) {
     $result .= &include_pdf($cleanURL);      $result .= &include_pdf($cleanURL);
     $result .= '\end{document}';      $result .= '\end{document}';
  } elsif ($cleanURL =~ /\.page$/i) { #  Print page in non construction space contexts.  
     &Apache::lonnet::logthis("Printing .page $cleanURL  at " . __LINE__);  
   
     # Determine the set of resources in the map of the page:  
   
     my $navmap         =  Apache::lonnavmaps::navmap->new();  
     my @page_resources =  $navmap->retrieveResources($cleanURL);  
     $result           .=  &print_page_in_course($helper, $cleanURL, \@page_resources);  
   
          
  } else {   } else {
     &Apache::lonnet::logthis("Unsupported type handler");  
     $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},      $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
   $helper->{'VARS'}->{'symb'});    $helper->{'VARS'}->{'symb'});
  }   }
Line 1883  ENDPART Line 1835  ENDPART
     my $texversion='';      my $texversion='';
     if ($urlp!~m|^/adm/|      if ($urlp!~m|^/adm/|
  && $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {   && $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
  &Apache::lonnet::logthis("At line 1834 printing $urlp");  
  $resources_printed .= $urlp.':';   $resources_printed .= $urlp.':';
  &Apache::lonxml::remember_problem_counter();   &Apache::lonxml::remember_problem_counter();
  $texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);   $texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
  if ($urlp=~/\.page$/) {   if ($urlp=~/\.page$/) {
     &Apache::lonnet::logthis("Handling a .page at ". __LINE__);  
   
     ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);      ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
     if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}       if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
     $texversion =~ s/\\end{document}\d*/\\end{document}/;      $texversion =~ s/\\end{document}\d*/\\end{document}/;
Line 2478  sub print_resources { Line 2427  sub print_resources {
  if ($res_url!~m|^ext/|   if ($res_url!~m|^ext/|
     && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {      && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
     $printed .= $curresline.':';      $printed .= $curresline.':';
     &Apache::lonnet::logthis("At line 2427 printing $curresline");  
     &Apache::lonxml::remember_problem_counter();          &Apache::lonxml::remember_problem_counter();    
   
     my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);      my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
Line 3245  CHOOSE_ANON2 Line 3194  CHOOSE_ANON2
     ))       )) 
  && $helper->{VARS}->{'assignment'} eq ""   && $helper->{VARS}->{'assignment'} eq ""
  ) {   ) {
   
  my $pretty_dir = &Apache::lonnet::hreflocation($subdir);   my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
         push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from current subdirectory [_3]','<b>','</b>','<b><i>'.$pretty_dir.'</i></b>','<b>','</b>'), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];          push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from current subdirectory [_3]','<b>','</b>','<b><i>'.$pretty_dir.'</i></b>','<b>','</b>'), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;          my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
Removed from v.1.557.2.1  
changed lines
  Added in v.1.558

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