Diff for /loncom/interface/lonprintout.pm between versions 1.27 and 1.31

version 1.27, 2002/05/09 18:56:21 version 1.31, 2002/05/22 21:10:42
Line 65  ENDHEADER Line 65  ENDHEADER
   
 sub menu_for_output {  sub menu_for_output {
     my $r = shift;      my $r = shift;
     $r->print(<<ENDMENUOUT);      $r->print(<<ENDMENUOUT1);
 <input type="hidden" name="phase" value="two">  <input type="hidden" name="phase" value="two">
 <input type="hidden" name="url" value="$ENV{'form.postdata'}">  <input type="hidden" name="url" value="$ENV{'form.postdata'}">
 <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document  <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document
Line 73  sub menu_for_output { Line 73  sub menu_for_output {
 <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />  <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />
 <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />  <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />
 <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems from the top level sequence<br />  <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems from the top level sequence<br />
   <br />
   ENDMENUOUT1
       my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
       $subdirtoprint =~ s/\/[^\/]+$//;
       if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
    $r->print(<<ENDMENUOUT2);
   <input type="radio" name="choice" value="Subdirectory print">  All problems from current subdirectory (where this particular problem is)<br />
   ENDMENUOUT2
   }
       $r->print(<<ENDMENUOUT3);
 <br /><hr /><br />  <br /><hr /><br />
 <h1>And what page format do you prefer?</h1>  <h1>And what page format do you prefer?</h1>
 <input type="radio" name="layout" value="CBI"> Two columns landscape (<small>CBI</small>) <br />  <input type="radio" name="layout" value="CBI"> Two columns landscape <br />
 <input type="radio" name="layout" value="CAPA" checked>  Two columns portrait (<small>CAPA</small>) <br />  <input type="radio" name="layout" value="CAPA" checked>  Two columns portrait <br />
 <input type="submit" value="Submit your choice">  <input type="submit" value="Submit your choice">
 </form>  </form>
 </body>  </body>
 </html>  </html>
 ENDMENUOUT  ENDMENUOUT3
 }  }
   
   
Line 100  ENDPART Line 110  ENDPART
   
     my $choice = $ENV{'form.choice'};      my $choice = $ENV{'form.choice'};
     my $layout = $ENV{'form.layout'};      my $layout = $ENV{'form.layout'};
       my $subdirtoprint = $ENV{'form.subdirect'};
     my $laystyle = 'book';      my $laystyle = 'book';
     my $result = '';      my $result = '';
     my %mystyle;      my %mystyle;
Line 117  ENDPART Line 128  ENDPART
       $moreenv{'request.filename'}=$currequest;        $moreenv{'request.filename'}=$currequest;
       &Apache::lonnet::appenv(%moreenv);        &Apache::lonnet::appenv(%moreenv);
       $result .= $texversion;        $result .= $texversion;
         $result = &additional_cleanup($result);
     } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') {      } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') {
 #-- where is the primary sequence containing file?  #-- where is the primary sequence containing file?
  my %moreenv;   my %moreenv;
Line 151  ENDPART Line 162  ENDPART
  &Apache::lonnet::delenv('form.grade_target');   &Apache::lonnet::delenv('form.grade_target');
  $result .= $texversion;       $result .= $texversion;    
     }      }
  }   }
 #-- additional cleanup for output   $result = &additional_cleanup($result);
  my $first_app = index($result,'\documentclass',0);  
  $first_app = index($result,'\documentclass',$first_app+5);  
  while ($first_app != -1) {  
     my $second_app = index($result,'begin{document}',$first_app);  
     $first_app = rindex($result,'\end{document}',$first_app);  
     substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 mm';  
     $first_app = index($result,'\documentclass',$first_app+5);  
  }  
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {      }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
  my @master_seq = ();   my @master_seq = ();
  my @add_file_seq = ();   my @add_file_seq = ();
Line 198  ENDPART Line 201  ENDPART
  &Apache::lonnet::delenv('form.grade_target');   &Apache::lonnet::delenv('form.grade_target');
  $result .= $texversion;           $result .= $texversion;        
     }      }
    }    
    $result = &additional_cleanup($result);
       } elsif ($choice eq 'Subdirectory print') {      
    my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
    $subdirtoprint =~ s/\/[^\/]+$//;
    my @list_of_files = ();
    my $localdirectory = $subdirtoprint;
    $localdirectory =~ s/.*(\/res\/)/$1/;
    my @content_directory = &Apache::lonnet::dirlist($localdirectory);
    for (my $iy=0;$iy<=$#content_directory;$iy++) {
       my @tempo_array = split(/&/,$content_directory[$iy]);
       $content_directory[$iy] = $tempo_array[0];
       if ($content_directory[$iy] =~ m/^[^\.]+\.problem$/) {
    push @list_of_files,$content_directory[$iy];
       }
  }   }
 #-- additional cleanup for output   $localdirectory =~ s/\/$//;
  my $first_app = index($result,'\documentclass',0);   for (my $i=0;$i<=$#list_of_files;$i++) {
  $first_app = index($result,'\documentclass',$first_app+5);      my $urlp = $localdirectory.'/'.$list_of_files[$i];     
  while ($first_app != -1) {      my %moreenv;
     my $second_app = index($result,'begin{document}',$first_app);      $moreenv{'form.grade_target'}='tex';
     $first_app = rindex($result,'\end{document}',$first_app);      &Apache::lonnet::appenv(%moreenv);
     substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 mm';      my $texversion=&Apache::lonnet::ssi($urlp);
     $first_app = index($result,'\documentclass',$first_app+5);      &Apache::lonnet::delenv('form.grade_target');
       $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
       $result .= $texversion;   
  }   }
    $result = &additional_cleanup($result);
   
   
   
   
   
   
     }      }
 #-- corrections for the different page formats  #-- corrections for the different page formats
     if ($layout eq 'CBI') {      if ($layout eq 'CBI') {
Line 239  ENDPART Line 266  ENDPART
     $result =~ s/{\\par }\s*\\\\/\\\\/gm;      $result =~ s/{\\par }\s*\\\\/\\\\/gm;
  $result =~ s/\\\\\s+\[/ \[/g;   $result =~ s/\\\\\s+\[/ \[/g;
     $result =~ s/&#952;/\$\\theta\$/g; #converts theta from html into tex      $result =~ s/&#952;/\$\\theta\$/g; #converts theta from html into tex
       $result =~ s/\b_+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
 #-- writing .tex file in prtspool   #-- writing .tex file in prtspool 
     my $temp_file;      my $temp_file;
     $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.tex";      $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
     unless ($temp_file = Apache::File->new('>'.$filename)) {      unless ($temp_file = Apache::File->new('>'.$filename)) {
  $r->log_error("Couldn't open $filename for output $!");   $r->log_error("Couldn't open $filename for output $!");
  return SERVER_ERROR;    return SERVER_ERROR; 
Line 254  $r->print(<<FINALEND); Line 282  $r->print(<<FINALEND);
 FINALEND  FINALEND
 }  }
   
   sub additional_cleanup {
       my $result = shift;
       my $first_app = index($result,'\documentclass',0);
       $first_app = index($result,'\documentclass',$first_app+5);
       while ($first_app != -1) {
    my $second_app = index($result,'begin{document}',$first_app);
    $first_app = rindex($result,'\end{document}',$first_app);
    substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 mm';
    $first_app = index($result,'\documentclass',$first_app+5);
       }
       return $result;
   }
   
   
 sub content_map {  sub content_map {

Removed from v.1.27  
changed lines
  Added in v.1.31


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