Diff for /loncom/interface/lonprintout.pm between versions 1.43 and 1.54

version 1.43, 2002/07/26 18:40:43 version 1.54, 2002/09/05 15:51:07
Line 43  use strict; Line 43  use strict;
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::loncommon;
 use Apache::inputtags;  use Apache::inputtags;
   use Apache::loncoursedata;
   use Apache::grades;
 use Apache::edit;  use Apache::edit;
 use Apache::File();  use Apache::File();
 use POSIX qw(strftime);  use POSIX qw(strftime);
Line 72  sub menu_for_output { Line 75  sub menu_for_output {
 <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
 (you will print what you see on the screen)<br />  (you will print what you see on the screen)<br />
 ENDMENUOUT1  ENDMENUOUT1
     if (not $ENV{'request.role'}=~m/^au\./) {      if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
     $r->print(<<ENDMENUOUT2);   $r->print(<<ENDMENUOUT2);
 <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 />  <br />
 ENDMENUOUT2  ENDMENUOUT2
       }
       if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) { 
    $r->print(<<ENDMENUOUT6);
     <input type="radio" name="choice" value="All class print">  Print assignment (all problems from the primary sequence) for group of students<br />
   ENDMENUOUT6
       }
       my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});        my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
       $subdirtoprint =~ s/\/[^\/]+$//;        $subdirtoprint =~ s/\/[^\/]+$//;
       if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {        if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
Line 86  ENDMENUOUT2 Line 95  ENDMENUOUT2
   <input type="radio" name="choice" value="Subdirectory print">  All problems from current subdirectory (where this particular problem is)<br />    <input type="radio" name="choice" value="Subdirectory print">  All problems from current subdirectory (where this particular problem is)<br />
 ENDMENUOUT4  ENDMENUOUT4
       }        }
     }  
     $r->print(<<ENDMENUOUT5);      $r->print(<<ENDMENUOUT5);
 <br /><hr /><br />  <br /><hr /><br />
 <h1>And what page format do you prefer?</h1>  <h1>And what page format do you prefer?</h1>
Line 98  ENDMENUOUT4 Line 106  ENDMENUOUT4
    </td>     </td>
    <td>&nbsp;</td>     <td>&nbsp;</td>
    <td rawspan="2">     <td rawspan="2">
      Number of columns: <input type="text" size="2" name="numberofcolumns" value="2">        Number of columns: <select name="numberofcolumns">
                            <option selected> 1 </option>
                            <option> 2 </option>
                            <option> 3 </option>
                            <option> 4 </option>
                            <option> 5 </option>
                            <option> 6 </option>
                            <option> 7 </option>
                            <option> 8 </option>
                            <option> 9 </option>
                           </select> 
    </td>     </td>
  </tr>   </tr>
 </table>  </table>
 </br>   </br> 
 <input type="submit" value="Submit your choice">  <input type="submit" value="Submit your choice">
 </form>  
 </body>  
 </html>  
 ENDMENUOUT5  ENDMENUOUT5
 }  }
   
   
   sub additional_class_menu {
       my $r = shift;
       $r->print(<<ENDMENUOUT1);
   <input type="hidden" name="url" value="$ENV{'form.url'}">
   <input type="hidden" name="choice" value="$ENV{'form.choice'}">
   <input type="hidden" name="layout" value="$ENV{'form.layout'}">
   <input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
   <h1>Mark students which assignments you want to print</h1>
   ENDMENUOUT1
       my $c = $r->connection;    
       my %cache;
       my $courseID = $ENV{'request.course.id'};
       my $classlist = &Apache::loncoursedata::DownloadClasslist($courseID,$cache{'ClasslistTimestamp'},$c);
       &Apache::loncoursedata::ProcessClasslist(\%cache,$classlist,$courseID,$c);    
       my @all_students = split(':::',$cache{'NamesOfStudents'});
       my @active_students = ();
       foreach my $student (@all_students) {
    if ($cache{$student.':Status'} eq 'Active') {
       push @active_students,$student;
    }
       }
       my $what_to_print = '<table border="1">';    
       my $i = 0;
       foreach my $student (@active_students) {
    $what_to_print .= '<tr><td><input type="checkbox" name="whomtoprint'.$i.'" value="'.$student.'">'.$cache{$student.':fullname'}.'</td></tr>';
   # $what_to_print .= '<tr><td><input type="checkbox" name="whomtoprint'.$i.'" value="'.$cache{$student.':fullname'}.'">'.$cache{$student.':fullname'}.'</td></tr>';
    $i++;
       }
       $what_to_print .= '</table>';
       $r->print(<<ENDMENUOUT2);
       $what_to_print <br />
   <input type="hidden" name="numberofstudents" value="$i">
   <input type="hidden" name="phase" value="three">
   <input type="submit" value="Submit">
   ENDMENUOUT2
   }
   
   
   sub additional_print_menu { 
       my $r = shift;
       my $what_to_print = '';
       for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
    $what_to_print .= '<input type="hidden" name="whomtoprint'.$i.'" value="'.$ENV{'form.whomtoprint'.$i}.'">';
       }
       $r->print(<<ENDMENUOUT);
       $what_to_print
   <input type="hidden" name="url" value="$ENV{'form.url'}">
   <input type="hidden" name="choice" value="$ENV{'form.choice'}">
   <input type="hidden" name="layout" value="$ENV{'form.layout'}">
   <input type="hidden" name="numberofstudents" value="$ENV{'form.numberofstudents'}">
   <input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
   Enter width of the page: <input type="text" name="width" width="10" value="9cm"> <br />
   <input type="hidden" name="phase" value="four">
   <input type="submit" value="Submit">
   </form>
   </body>
   </html>
   ENDMENUOUT
   }
   
   
 sub output_data {  sub output_data {
Line 135  ENDPART Line 209  ENDPART
       #-- single document - problem, page, html, xml          #-- single document - problem, page, html, xml  
       my %moreenv;        my %moreenv;
       $moreenv{'form.grade_target'}='tex';        $moreenv{'form.grade_target'}='tex';
       if ($ENV{'request.role'}=~m/^au\./) {$ENV{'form.url'}=~s/http:\/\/[^\/]+//;}        if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
     $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
         }
       $moreenv{'request.filename'}=$ENV{'form.url'};        $moreenv{'request.filename'}=$ENV{'form.url'};
       &Apache::lonnet::appenv(%moreenv);        &Apache::lonnet::appenv(%moreenv);
       my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});        my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
Line 172  ENDPART Line 248  ENDPART
     &Apache::lonnet::delenv('form.grade_target');      &Apache::lonnet::delenv('form.grade_target');
     $result .= $texversion;              $result .= $texversion;        
  }   }
     } else {      } elsif ($urlp =~ /\S+/) {
  my %moreenv;   my %moreenv;
  $moreenv{'form.grade_target'}='tex';   $moreenv{'form.grade_target'}='tex';
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
Line 183  ENDPART Line 259  ENDPART
  }   }
  $result = &additional_cleanup($result);   $result = &additional_cleanup($result);
     }  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 = ();          # where is the main sequence of the course?
  my @add_file_seq = ();  
 #-- 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);
 #-- do we have any other sequence inside?   for (my $iu=0;$iu<=$#file_seq;$iu++) {
       $file_seq[$iu]=~s/^"//;
       $file_seq[$iu]=~s/"$//;
       if ($file_seq[$iu]=~m/\S+/) {
    $file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);
       } else {
    $file_seq[$iu]= 'REMOVE IT PLEASE';
       }
    }
  my $i=0;   my $i=0;
  while ($i<=$#file_seq) {          my $limit = $#file_seq;    
     $_ = $file_seq[$i];          while ($i<=$limit) {
     if (/\.sequence$/) {      unless ($file_seq[$i]=~m/\.(problem|page)/) {
  $file = &Apache::lonnet::filelocation("",$file_seq[$i]);   if ($file_seq[$i]=~m/\.sequence/) {
  $filecontents=&Apache::lonnet::getfile($file);      my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);
  @add_file_seq = &content_map($filecontents);      my @newfile_seq = &content_map($filecontents);
  splice(@file_seq,$i,1,@add_file_seq);      for (my $iu=0;$iu<=$#newfile_seq;$iu++) {
  @add_file_seq = ();   $newfile_seq[$iu]=~s/^"//;
  $i = -1;                  $newfile_seq[$iu]=~s/"$//;
    if ($newfile_seq[$iu]=~m/\S+/) {
       $newfile_seq[$iu]=&Apache::lonnet::filelocation("",$newfile_seq[$iu]);
    } else {
       $newfile_seq[$iu]= 'REMOVE IT PLEASE';
    }
       }
       splice @file_seq,$i,1,@newfile_seq;
       $i=0;
       $limit = $#file_seq;
    } else {
       splice @file_seq,$i,1,'REMOVE IT PLEASE';
    }
     }      }
     $i++;      $i++;
  }   }
  @master_seq = @file_seq;   for (my $iu=0;$iu<=$#file_seq;$iu++) {
 #-- produce an output string      if ($file_seq[$iu]=~m/REMOVE IT PLEASE/) {
  for (my $i=0;$i<=$#master_seq;$i++) {   splice @file_seq,$iu,1;
     $_ = $master_seq[$i];      }
     m/\"(.*)\"/;   }
             $_ = $1;   if ($file_seq[-1]=~m/REMOVE IT PLEASE/) {
             my $urlp = $1;      pop @file_seq;
             if (/\.(problem|exam|quiz|assess|survey|form|library)/) {   }
           #-- produce an output string
    for (my $i=0;$i<=$#file_seq;$i++) {
               my $urlp = $file_seq[$i];
       $urlp=~s/\/home\/httpd\/html//;    
               if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
  my %moreenv;   my %moreenv;
  $moreenv{'form.grade_target'}='tex';   $moreenv{'form.grade_target'}='tex';
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
Line 221  ENDPART Line 320  ENDPART
     }      }
  }       }    
  $result = &additional_cleanup($result);   $result = &additional_cleanup($result);
       } elsif ($choice eq 'All class print') { 
       #-- prints assignments for whole class or for selected students  
           my (@students,@st_output) = ((),());
    for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
       if ($ENV{'form.whomtoprint'.$i}=~/:/) {
    push @students,$ENV{'form.whomtoprint'.$i};
       }
    }
    #where is the primary sequence containing current resource (the same for all students)?
    my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
    $symbolic =~ m/([^_]+)_/;
    my $primary_sequence = '/res/'.$1;
    #opens and analyses the primary sequence file, produces the array of resources
    my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
    my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);
    my @master_seq = &content_map($sequencefilecontents);
           #loop over students
    foreach my $person (@students) {
       my $current_output = ''; 
       my ($username,$userdomain) = split /:/,$person;
       my $fullname = &Apache::grades::get_fullname($username,$userdomain);
               #goes through all resources, checks if they are available for current student, and produces output 
       foreach my $curres (@master_seq)  {
    $curres =~ s/^"//;
    $curres =~ s/"$//;
                   if ($curres=~/\w+/) {
       my $symb = &Apache::lonnet::symbread($curres);
       my ($map,$id,$res_url) = split(/___/,$symb);
       if (&Apache::lonnet::allowed('bre',$res_url)) {
    my $rendered = &Apache::loncommon::get_student_view($symb,$username,$userdomain,
                                                                           $ENV{'request.course.id'},'tex');
    $current_output .= $rendered;
       }
    }
       }
       $current_output =~ s/\\begin{document}/\\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$fullname}}\\hskip 1\.4in } \\vskip 5 mm /;
       $result .= $current_output;
    }
   
    $result = &additional_cleanup($result);
   
   
   
   
   
   
     } elsif ($choice eq 'Subdirectory print') {            } elsif ($choice eq 'Subdirectory print') {      
  my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});   my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
  $subdirtoprint =~ s/\/[^\/]+$//;   $subdirtoprint =~ s/\/[^\/]+$//;
  my @list_of_files = ();   my @list_of_files = ();
  my $localdirectory = $subdirtoprint;   if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
  $localdirectory =~ s/.*(\/res\/)/$1/;      $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
  my @content_directory = &Apache::lonnet::dirlist($localdirectory);   } else {
       $subdirtoprint =~ s/.*(\/res\/)/$1/;
    }
    my @content_directory = ();
    if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
       @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
    } else {
       @content_directory = &Apache::lonnet::dirlist($subdirtoprint);
    }
  for (my $iy=0;$iy<=$#content_directory;$iy++) {   for (my $iy=0;$iy<=$#content_directory;$iy++) {
     my @tempo_array = split(/&/,$content_directory[$iy]);      my @tempo_array = split(/&/,$content_directory[$iy]);
     $content_directory[$iy] = $tempo_array[0];      if ($tempo_array[0] =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/) {
     if ($content_directory[$iy] =~ m/^[^\.]+\.problem$/) {   push(@list_of_files,$tempo_array[0]);
  push @list_of_files,$content_directory[$iy];  
     }      }
  }   }
  $localdirectory =~ s/\/$//;   $subdirtoprint =~ s/\/$//;
  for (my $i=0;$i<=$#list_of_files;$i++) {   for (my $i=0;$i<=$#list_of_files;$i++) {
     my $urlp = $localdirectory.'/'.$list_of_files[$i];           my $urlp = $subdirtoprint.'/'.$list_of_files[$i];
     my %moreenv;      my %moreenv;
     $moreenv{'form.grade_target'}='tex';      $moreenv{'form.grade_target'}='tex';
     &Apache::lonnet::appenv(%moreenv);      &Apache::lonnet::appenv(%moreenv);
       if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) { 
    $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; 
       }
     my $texversion=&Apache::lonnet::ssi($urlp);      my $texversion=&Apache::lonnet::ssi($urlp);
     &Apache::lonnet::delenv('form.grade_target');      &Apache::lonnet::delenv('form.grade_target');
     $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;      $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
Line 248  ENDPART Line 403  ENDPART
  }   }
  $result = &additional_cleanup($result);   $result = &additional_cleanup($result);
   
          
   
   
   
   
     }      }
 #-- corrections for the different page formats  #-- corrections for the different page formats
     if ($layout eq 'CBI' and $numberofcolumns eq '1') {      if ($layout eq 'CBI' and $numberofcolumns eq '1') {
Line 270  ENDPART Line 421  ENDPART
  $result =~ s/\\includegraphics{/\\includegraphics\[width=9\.0 cm\]{/g;   $result =~ s/\\includegraphics{/\\includegraphics\[width=9\.0 cm\]{/g;
 # $result =~ s/\\includegraphics{/\\includegraphics\[width=\\textwidth\]{/g;  # $result =~ s/\\includegraphics{/\\includegraphics\[width=\\textwidth\]{/g;
 # $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;  # $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;
  $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;   $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny \\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright Michigan State University Board of Trustees $1/;
 #        $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[9\.0cm\]\[b\]{\\hrulefill})/$2$1/g;  #        $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[9\.0cm\]\[b\]{\\hrulefill})/$2$1/g;
         $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;          $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
         $result =~ s/(\\end{longtable}\s*)\\newline/$1/g;          $result =~ s/(\\end{longtable}\s*)\\newline/$1/g;
  $result =~ s/\$number_of_columns/$number_of_columns/g;   $result =~ s/\$number_of_columns/$number_of_columns/g;
     }      }
       #changes page's parameters for the one column output 
       if ($ENV{'form.numberofcolumns'} == 1) {
    $result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/;
       }
 #-- LaTeX corrections       #-- LaTeX corrections     
     my $first_comment = index($result,'<!--',0);      my $first_comment = index($result,'<!--',0);
     while ($first_comment != -1) {      while ($first_comment != -1) {
Line 284  ENDPART Line 439  ENDPART
  $first_comment = index($result,'<!--',$first_comment);   $first_comment = index($result,'<!--',$first_comment);
     }      }
     $result =~ s/^\s+$//gm; #remove empty lines      $result =~ s/^\s+$//gm; #remove empty lines
     $result =~ s/([^\\])%/\$1\%/g;   #corrects %  
     $result =~ s/(\s)+/$1/g; #removes more than one empty space      $result =~ s/(\s)+/$1/g; #removes more than one empty space
     $result =~ s/\\\\\s*\\vskip/\\vskip/gm;      $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
     $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >  
     $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;      $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
     $result =~ s/{\\par }\s*\\\\/\\\\/gm;      $result =~ s/{\\par }\s*\\\\/\\\\/gm;
  $result =~ s/\\\\\s+\[/ \[/g;   $result =~ s/\\\\\s+\[/ \[/g;
Line 308  ENDPART Line 461  ENDPART
     }       } 
     print $temp_file $result;      print $temp_file $result;
 $r->print(<<FINALEND);  $r->print(<<FINALEND);
 <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle">  <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns">
 </body>  </body>
 </html>  </html>
 FINALEND  FINALEND
Line 687  sub content_map { Line 840  sub content_map {
  $_ = $chunk;   $_ = $chunk;
         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.'"',0);
  $startlink = rindex($map_string,'<link ',$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].'"',0);
     while ($stalink != -1) {      while ($stalink != -1) {
  $startlink = rindex($map_string,'<link ',$stalink);   $startlink = rindex($map_string,'<link ',$stalink);
  $endlink = index($map_string,'</link>',$startlink);   $endlink = index($map_string,'</link>',$startlink);
Line 739  sub handler { Line 892  sub handler {
     unless  ($ENV{'form.phase'}) {      unless  ($ENV{'form.phase'}) {
  &menu_for_output($r);   &menu_for_output($r);
     }      }
   #-- additional menu for class printing
        if ($ENV{'form.phase'} eq 'two') {
    if($ENV{'form.choice'} eq 'All class print') {
        &additional_class_menu($r);
    } else {
        $ENV{'form.phase'} = 'three';
    }
        }
   #-- additional menu for page layout (one column case)
       if ($ENV{'form.phase'} eq 'three') {
    if($ENV{'form.numberofcolumns'} == 1) {
       &additional_print_menu($r);
    } else {
       $ENV{'form.phase'} = 'four';
    }
       }
 #-- core part   #-- core part 
     if ($ENV{'form.phase'} eq 'two') {      if ($ENV{'form.phase'} eq 'four') {
  &output_data($r);   &output_data($r);
     }      }
     return OK;      return OK;

Removed from v.1.43  
changed lines
  Added in v.1.54


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