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

Diff for /loncom/interface/lonprintout.pm between versions 1.16 and 1.20

version 1.16, 2002/03/06 20:43:06 version 1.20, 2002/04/01 18:23:12
Line 70  sub menu_for_output { Line 70  sub menu_for_output {
 <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">  Current document  <input type="radio" name="choice" value="Standard LaTeX output for current document">  Current document
 (you will print what you see on the screen)<br />  (you will print what you see on the screen)<br />
 <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  Standard LaTeX output for 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 the top level sequence">  All documents from the top level 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 the top level sequence">  All problems from the top level sequence<br />
 <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" checked>  CBI <br />  <input type="radio" name="layout" value="CBI" checked>  CBI <br />
Line 117  ENDPART Line 118  ENDPART
       &Apache::lonnet::appenv(%moreenv);        &Apache::lonnet::appenv(%moreenv);
       $result .= $texversion;        $result .= $texversion;
   
     } elsif ($choice eq 'Standard LaTeX output for the primary sequence') {      } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') {
       my @master_seq = ();  #-- where is the primary sequence containing file?
       my $keyword = 0;   my %moreenv;
       my $output_seq = '';   my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
       my $current_file = '/res/'.$ENV{'request.ambiguous'};   $_ = $symbolic;
       $current_file =~ s/(\/res\/physnet\/physnet)(\/m\d+)\/(.*)/$1$2$2\.sequence/;   m/([^_]+)_/;
       while ($current_file ne '') {   my $primary_sequence = '/res/'.$1;
  my $file=&Apache::lonnet::filelocation("",$current_file);  #-- open and analyses the primary sequence
  my $filecontents=&Apache::lonnet::getfile($file);   my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
  my @file_seq = &content_map($filecontents);   my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);
  if (defined @file_seq) {   my @master_seq = &content_map($sequencefilecontents);
 #-- adding an additional array to the master one  #-- produce an output string
   if (defined @master_seq) {   for (my $i=0;$i<=$#master_seq;$i++) {
     my $old_value = $#master_seq;      $_ = $master_seq[$i];
     my $total_value = $#master_seq + $#file_seq +2;      m/\"(.*)\"/;
     for (my $j=0; $j<=$old_value-$keyword+1; $j++) {              $_ = $1;
       $master_seq[$total_value-$j] = $master_seq[$old_value-$j];              my $urlp = $1;
     }      if ($choice eq 'Standard LaTeX output for the primary sequence') {
     for (my $j=0; $j<=$#file_seq; $j++){   if (/\.problem/) {
       $master_seq[$keyword+$j] = $file_seq[$j];      my %moreenv;
       $moreenv{'form.grade_target'}='tex';
       &Apache::lonnet::appenv(%moreenv);
       my $texversion=&Apache::lonnet::ssi($urlp);
       &Apache::lonnet::delenv('form.grade_target');
       $texversion =~ s!\.gif!\.eps!g;
       $result .= $texversion;        
    }
       } else {
    $moreenv{'form.grade_target'}='tex';
    &Apache::lonnet::appenv(%moreenv);
    my $texversion=&Apache::lonnet::ssi($urlp);
    &Apache::lonnet::delenv('form.grade_target');
    $texversion =~ s!\.gif!\.eps!g;
    $result .= $texversion;    
     }      }
     @file_seq = ();  
     $keyword = 0;  
   } else {  
     @master_seq = @file_seq;  
     @file_seq = ();  
   }  
  }  
 #-- checking wether .sequence file is among the set of files  
  $current_file = '';  
  for (my $i=0; $i<=$#file_seq; $i++) {  
   $_ = $file_seq[$i];  
   if (m/(.*)\.sequence/) {  
     $current_file = $_;  
     $keyword = $i;  
     last;  
   }  
  }   }
       }  #-- additional cleanup for output
 #-- produce an output string   my $first_app = index($result,'\documentclass',0);
       for (my $i=0;$i<=$#master_seq;$i++) {   $first_app = index($result,'\documentclass',$first_app+5);
  $_ = $master_seq[$i];   while ($first_app != -1) {
  m/\"(.*)\"/;      my $second_app = index($result,'begin{document}',$first_app);
  if (index($1,'-tc.xml',0)==-1) {      $first_app = rindex($result,'\end{document}',$first_app);
   my $file=&Apache::lonnet::filelocation("",$1);      substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 mm';
   my $filecontents=&Apache::lonnet::getfile($file);      $first_app = index($result,'\documentclass',$first_app+5);
   $output_seq .= $filecontents;  
  }   }
       }  
 #-- cleanup of output string (temporary cbi-specific)  
       $output_seq =~ s/<physnet>//g;  
       $output_seq =~ s/<\/physnet>//g;  
       $output_seq = '<physnet>'.$output_seq.' </physnet>';  
 #-- final accord  
       $result = &Apache::lonxml::xmlparse('tex',$output_seq,'',%mystyle);  
     }  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 $keyword = 0;   my @add_file_seq = ();
  my $output_seq = '';  
 #-- where is the main sequence of the course?  #-- where is the main sequence of the course?
  my $main_seq = '/res/'.$ENV{'request.course.uri'};   my $main_seq = '/res/'.$ENV{'request.course.uri'};
  my $file=&Apache::lonnet::filelocation("",$main_seq);   my $file=&Apache::lonnet::filelocation("",$main_seq);
  my $filecontents=&Apache::lonnet::getfile($file);   my $filecontents=&Apache::lonnet::getfile($file);
  my @file_seq = &content_map($filecontents);   my @file_seq = &content_map($filecontents);
 #-- temporary solution (without sequence inside sequence) - have to be generalized  #-- do we have any other sequence inside?
    my $i=0;
    while ($i<=$#file_seq) {
       $_ = $file_seq[$i];
       if (/\.sequence$/) {
 # if (defined @master_seq) {   $file = &Apache::lonnet::filelocation("",$file_seq[$i]);
 #                    my $old_value = $#master_seq;   $filecontents=&Apache::lonnet::getfile($file);
 #    my $total_value = $#master_seq + $#file_seq +2;   @add_file_seq = &content_map($filecontents);
 #                    for (my $j=0; $j<=$old_value-$keyword+1; $j++) {   splice(@file_seq,$i,1,@add_file_seq);
 # $master_seq[$total_value-$j] = $master_seq[$old_value-$j];   @add_file_seq = ();
 #    }   $i = -1;
 #                    for (my $j=0; $j<=$#file_seq; $j++){      }
 # $master_seq[$keyword+$j] = $file_seq[$j];      $i++;
 #    }   }
 #    @file_seq = ();   @master_seq = @file_seq;
 #    $keyword = 0;  
 # } else {  
     @master_seq = @file_seq;  
 #                    @file_seq = ();  
 # }  
   
 #-- checking wether .sequence file is among the set of files  
 #    my  $current_file = '';  
 #    for (my $i=0; $i<=$#file_seq; $i++) {  
 # $_ = $file_seq[$i];  
 # if (m/(.*)\.sequence/) {  
 #    $current_file = $_;  
 #    $keyword = $i;  
 #    last;  
 # }  
 #    }          
   
 #-- produce an output string  #-- produce an output string
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#master_seq;$i++) {
     $_ = $master_seq[$i];      $_ = $master_seq[$i];
Line 235  ENDPART Line 208  ENDPART
  while ($first_app != -1) {   while ($first_app != -1) {
     my $second_app = index($result,'begin{document}',$first_app);      my $second_app = index($result,'begin{document}',$first_app);
     $first_app = rindex($result,'\end{document}',$first_app);      $first_app = rindex($result,'\end{document}',$first_app);
     substr($result,$first_app,$second_app-$first_app+15) = '\vskip 7 mm';      substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 mm';
     $first_app = index($result,'\documentclass',$first_app+5);      $first_app = index($result,'\documentclass',$first_app+5);
  }   }
     }      }
Line 249  ENDPART Line 222  ENDPART
         m/.*\/(.*)/;          m/.*\/(.*)/;
         $courseidinfo = $ENV{'course.physnet_'.$1.'.description'};          $courseidinfo = $ENV{'course.physnet_'.$1.'.description'};
  $result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass\[twocolumn\]{article}/;   $result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass\[twocolumn\]{article}/;
  $result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 7\.7in\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo\\newline\\noindent\\textit{Physics for Scientists and Engineers}\\newline\\noindent\\textbf{Due Thursday, March 7, 2002 at 8:00PM}\\vskip 5 mm/;   $result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 7\.7in\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo \\vskip 5 mm /;
  $result =~ s/\\includegraphics/\\includegraphics\[width=9\.0 cm\]/g;   $result =~ s/\\includegraphics/\\includegraphics\[width=9\.0 cm\]/g;
    $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.0cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPS $1/;
     }      }
   #-- LaTeX corrections 
       $result =~ s/^\s+$//gm; #remove empty lines
       $result =~ s/%/\\%/g;   #corrects %
       $result =~ s/(\s)+/$1/g; #removes more than one empty space
       $result =~ s/\\\\\s*(\\vskip)/ $1/gm;
 #-- writing .tex file in prtspool   #-- writing .tex file in prtspool 
     my $temp_file;      my $temp_file;
     $filename = "/home/httpd/prtspool/$ENV{'environment.firstname'}$ENV{'environment.lastname'}temp$ENV{'user.login.time'}.tex";      $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.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 289  sub content_map { Line 268  sub content_map {
         m/to=\"(\d+)\"/;          m/to=\"(\d+)\"/;
  push @number_seq,$1;   push @number_seq,$1;
  $startlink = index($map_string,'from="'.$1.'"',$startlink);   $startlink = index($map_string,'from="'.$1.'"',$startlink);
    $startlink = rindex($map_string,'<link ',$startlink);
     }      }
     my $stalink = index($map_string,' to="'.$number_seq[0].'"',$startlink);      my $stalink = index($map_string,' to="'.$number_seq[0].'"',$startlink);
     while ($stalink != -1) {      while ($stalink != -1) {
Removed from v.1.16  
changed lines
  Added in v.1.20

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