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

Diff for /loncom/interface/lonprintout.pm between versions 1.140 and 1.143

version 1.140, 2003/05/01 20:37:32 version 1.143, 2003/05/02 15:48:26
Line 1389  ENDPART Line 1389  ENDPART
   
   
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {      if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...          #-- single document - problem, page, html, xml, ...
    my $currentURL;
    if (defined $helper->{'VARS'}->{'url'}) {
       $currentURL=$helper->{'VARS'}->{'url'};
    } else {
       $currentURL=$helper->{'VARS'}->{'postdata'};
    }
  $selectionmade = 1;   $selectionmade = 1;
  if ($helper->{'VARS'}->{'url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {   if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
         my %moreenv;          my %moreenv;
         $moreenv{'form.grade_target'}='tex';          $moreenv{'form.grade_target'}='tex';
         if (&Apache::lonnet::allowed('bre',$helper->{'VARS'}->{'url'})) {   if (&Apache::lonnet::allowed('bre',$currentURL)) {
   $helper->{'VARS'}->{'url'}=~s/http:\/\/[^\/]+//;      $currentURL=~s/http:\/\/[^\/]+//;
         }   }
         $moreenv{'request.filename'}=$helper->{'VARS'}->{'url'};          $moreenv{'request.filename'}=$currentURL;
         $moreenv{'form.textwidth'}=$LaTeXwidth;          $moreenv{'form.textwidth'}=$LaTeXwidth;
         &Apache::lonnet::appenv(%moreenv);          &Apache::lonnet::appenv(%moreenv);
         my $texversion=&Apache::lonnet::ssi($helper->{'VARS'}->{'url'});          my $texversion=&Apache::lonnet::ssi($currentURL);
         &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');          &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
         $result .= $texversion;          $result .= $texversion;
         if ($helper->{'VARS'}->{'url'}=~m/\.page\s*$/) {          if ($currentURL=~m/\.page\s*$/) {
   ($result,$number_of_columns) = &page_cleanup($result);    ($result,$number_of_columns) = &page_cleanup($result);
         }          }
       } else {        } else {
Line 1417  ENDPART Line 1423  ENDPART
       }        }
   
   
 #    } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or       } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
 #             $choice eq 'Standard LaTeX output for whole primary sequence') {               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
 #      #-- minimal sequence to which the current document belongs               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { 
 #        #-- where is the primary sequence containing file?          #-- produce an output string
 #        my @master_seq = ();   my $flag_latex_header_remove = 'NO';
 # for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) {   my $flag_page_in_sequence = 'NO';
 #    if ($ENV{'form.whatfile'.$i}=~/\S/) {   my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 # push @master_seq,$ENV{'form.whatfile'.$i};  
 #    }  # foreach  my $key (@master_seq) {
 # }  #    $r->print(' '.$key.'<br />');
 #        #-- produce an output string  
 # my $flag_latex_header_remove = 'NO';  
 # my $flag_page_in_sequence = 'NO';  
 # for (my $i=0;$i<=$#master_seq;$i++) {  
 #           my ($urlp,$symb) = split /&&/, $master_seq[$i];  
 #    if ($choice eq 'Standard LaTeX output for the primary sequence') {  
 #              $selectionmade = 2;  
 #    } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') {  
 #              $selectionmade = 3;  
 #    }  
 #   my %moreenv;  
 #   $moreenv{'form.grade_target'}='tex';  
 #   $moreenv{'form.textwidth'}=$LaTeXwidth;  
 #   &Apache::lonnet::appenv(%moreenv);  
 #   #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb");  
 #   my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));  
 #   &Apache::lonnet::delenv('form.grade_target','form.textwidth');  
 #   if ($urlp =~ m/\.page/) {  
 #     ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);  
 #     if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}   
 #     $texversion =~ s/\\end{document}\d*/\\end{document}/;  
 #     $flag_page_in_sequence = 'YES';  
 #   }   
 #   if ($flag_latex_header_remove ne 'NO') {  
 #     $texversion = &latex_header_footer_remove($texversion);  
 #   } else {  
 #     $texversion =~ s/\\end{document}//;  
 #   }  
 #   $result .= $texversion;           
 #   $flag_latex_header_remove = 'YES';     
 # }  # }
 # &Apache::lonnet::delenv('form.counter');  # return OK;
 # if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}  
 # $result .= '\end{document}';   for (my $i=0;$i<=$#master_seq;$i++) {
       $master_seq[$i]=~/___\d+___(.*)$/;
       my $urlp='/res/'.$1;
       if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
    $selectionmade = 2;
       } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {
    $selectionmade = 3;
       } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
    $selectionmade = 4;
       }
       my %moreenv;
       $moreenv{'form.grade_target'}='tex';
       $moreenv{'form.textwidth'}=$LaTeXwidth;
       &Apache::lonnet::appenv(%moreenv);
       #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
       my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$master_seq[$i]));
       &Apache::lonnet::delenv('form.grade_target','form.textwidth');
       if ($urlp=~/\.page$/) {
    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
    if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
    $texversion =~ s/\\end{document}\d*/\\end{document}/;
    $flag_page_in_sequence = 'YES';
       } 
       if ($flag_latex_header_remove ne 'NO') {
    $texversion = &latex_header_footer_remove($texversion);
       } else {
    $texversion =~ s/\\end{document}//;
       }
       $result .= $texversion;         
       $flag_latex_header_remove = 'YES';   
    }
    &Apache::lonnet::delenv('form.counter');
    if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}
    $result .= '\end{document}';
 #    }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {  #    }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
 #        # where is the main sequence of the course?  #        # where is the main sequence of the course?
 # $selectionmade = 4;  # $selectionmade = 4;
Line 1636  ENDPART Line 1645  ENDPART
     }       } 
     print $temp_file $result;      print $temp_file $result;
   
   #<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
 $r->print(<<FINALEND);  $r->print(<<FINALEND);
 <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">  <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
 </body>  </body>
Line 1664  sub handler { Line 1673  sub handler {
 #    foreach $key (keys %{$helper->{'VARS'}}) {  #    foreach $key (keys %{$helper->{'VARS'}}) {
 # $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<br />');  # $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<br />');
 #    }  #    }
   # return OK;
   
   
   
  &output_data_new($r,$helper);   &output_data_new($r,$helper);
   
   
Removed from v.1.140  
changed lines
  Added in v.1.143

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