Diff for /loncom/interface/lonprintout.pm between versions 1.217 and 1.231

version 1.217, 2003/08/18 18:22:53 version 1.231, 2003/09/06 17:22:27
Line 49  use Apache::grades; Line 49  use Apache::grades;
 use Apache::edit;  use Apache::edit;
 use Apache::File();  use Apache::File();
 use Apache::lonnavmaps;  use Apache::lonnavmaps;
   use Apache::lonratedt;
 use POSIX qw(strftime);  use POSIX qw(strftime);
 use GDBM_File;  use GDBM_File;
   
Line 483  sub get_course { Line 484  sub get_course {
 sub page_format_transformation {  sub page_format_transformation {
     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist) = @_;       my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist) = @_; 
     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);      my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
     $assignment=~s/_/ /g;      $assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
     if ($numberofcolumns != 1) {      if ($numberofcolumns != 1) {
  ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);   ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
     } else {      } else {
Line 669  ENDPART Line 670  ENDPART
     $form{'problem_split'}=$parmhash{'problem_stream_switch'};      $form{'problem_split'}=$parmhash{'problem_stream_switch'};
     $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};      $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
     my $rndseed=time;      my $rndseed=time;
       if ($helper->{'VARS'}->{'curseed'}) {
    $rndseed=$helper->{'VARS'}->{'curseed'};
       }
     $form{'rndseed'}=$rndseed;      $form{'rndseed'}=$rndseed;
     &Apache::lonnet::appenv(%moreenv);      &Apache::lonnet::appenv(%moreenv);
     &Apache::lonnet::delenv('form.counter');      &Apache::lonnet::delenv('form.counter');
Line 687  ENDPART Line 691  ENDPART
     if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {      if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
  $texversion=&IndexCreation($texversion,$currentURL);   $texversion=&IndexCreation($texversion,$currentURL);
     }      }
       if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
    $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
   
       }
     $result .= $texversion;      $result .= $texversion;
     if ($currentURL=~m/\.page\s*$/) {      if ($currentURL=~m/\.page\s*$/) {
  ($result,$number_of_columns) = &page_cleanup($result);   ($result,$number_of_columns) = &page_cleanup($result);
     }      }
           } elsif ($currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
               #printing content of sequence from the construction space
       my $flag_latex_header_remove = 'NO'; 
       my $rndseed=time;
       if ($helper->{'VARS'}->{'curseed'}) {
    $rndseed=$helper->{'VARS'}->{'curseed'};
       }
       $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
       my $errtext=&Apache::lonratedt::mapread($currentURL);
       for (my $member=0;$member<=$#Apache::lonratedt::order;$member++) {
    $Apache::lonratedt::resources[$Apache::lonratedt::order[$member]]=~/^([^:]*):([^:]*):/;
    my $urlp=$2;
    if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
       my %form;
       $form{'grade_target'}='tex';
       $form{'textwidth'}=$LaTeXwidth;
       $form{'rndseed'}=$rndseed;
       my $texversion=&Apache::lonnet::ssi($urlp,%form);
       if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
    my %form;
    $form{'grade_target'}='answer';
    $form{'answer_output_mode'}='tex';
    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
    $form{'rndseed'}=$rndseed;
    my $answer=&Apache::lonnet::ssi($urlp,%form);
    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
       }
       if ($flag_latex_header_remove ne 'NO') {
    $texversion = &latex_header_footer_remove($texversion);
       } else {
    $texversion =~ s/\\end{document}//;
       }
       if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
    $texversion=&IndexCreation($texversion,$urlp);
       }
       if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
    $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
       }
       $result.=$texversion;
       $flag_latex_header_remove = 'YES';
    } elsif ($urlp=~/\.(sequence|page)$/) {
       $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
    }  
       }
       if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
       $result .= '\end{document}';   
  } else {   } else {
   $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';    $result.='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
   if ($currentURL=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {    if ($currentURL=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
       $result.=$1;        $result.=$1;
   } elsif ($currentURL=~/\/ext\//) {    } elsif ($currentURL=~/\/ext\//) {
Line 729  ENDPART Line 783  ENDPART
     }      }
     $form{'symb'}=$master_seq[$i];      $form{'symb'}=$master_seq[$i];
     $master_seq[$i]=~/(.*)___\d*___/;      $master_seq[$i]=~/(.*)___\d*___/;
     my $assignment=&Apache::lonnet::gettitle($1); #tittle of the assignment which contains this problem      my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($1),'header'); #tittle of the assignment which contains this problem
     #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");      #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
     my $texversion=&Apache::lonnet::ssi($urlp,%form);      my $texversion=&Apache::lonnet::ssi($urlp,%form);
     if ($urlp=~/\.page$/) {      if ($urlp=~/\.page$/) {
Line 812  ENDPART Line 866  ENDPART
     }      }
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
       my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     if ($current_output=~/\\documentclass/) {      if ($current_output=~/\\documentclass/) {
  $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$helper->{VARS}->{'assignment'}}}\\vskip 3 mm /;   $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
     } else {      } else {
  my $blanspages = '';   my $blanspages = '';
  for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}   for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
  $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$helper->{VARS}->{'assignment'}.'}}} \vskip -5 mm '.$current_output;   $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}}} \vskip -5 mm '.$current_output;
     }      }
     $result .= $current_output;      $result .= $current_output;
     &Apache::lonnet::delenv('form.counter');          &Apache::lonnet::delenv('form.counter');    
Line 836  ENDPART Line 890  ENDPART
  @list_of_files=sort @list_of_files;   @list_of_files=sort @list_of_files;
  my $flag_latex_header_remove = 'NO';    my $flag_latex_header_remove = 'NO'; 
  my $rndseed=time;   my $rndseed=time;
    if ($helper->{'VARS'}->{'curseed'}) {
       $rndseed=$helper->{'VARS'}->{'curseed'};
    }
  for (my $i=0;$i<=$#list_of_files;$i++) {   for (my $i=0;$i<=$#list_of_files;$i++) {
     my $urlp = $list_of_files[$i];      my $urlp = $list_of_files[$i];
     if ($urlp=~/\//) {      if ($urlp=~/\//) {
Line 886  ENDPART Line 943  ENDPART
  if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {   if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
     $texversion=&IndexCreation($texversion,$urlp);      $texversion=&IndexCreation($texversion,$urlp);
  }   }
    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
       $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
       
    }
  $result .= $texversion;   $result .= $texversion;
     }      }
     $flag_latex_header_remove = 'YES';        $flag_latex_header_remove = 'YES';  
Line 907  ENDPART Line 968  ENDPART
     if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {      if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
  if ($selectionmade<10) {$selectionmade*=100;} else {$selectionmade*=10;}   if ($selectionmade<10) {$selectionmade*=100;} else {$selectionmade*=10;}
     }      }
       if ($ENV{'request.role.adv'}) {$selectionmade*=10000;}
 #-- writing .tex file in prtspool   #-- writing .tex file in prtspool 
     my $temp_file;      my $temp_file;
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";      my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
Line 963  sub handler { Line 1025  sub handler {
   
 use Apache::lonhelper;  use Apache::lonhelper;
   
   sub addMessage {
       my $text = shift;
       my $paramHash = Apache::lonhelper::getParamHash();
       $paramHash->{MESSAGE_TEXT} = $text;
       Apache::lonhelper::message->new();
   }
   
 sub printHelper {  sub printHelper {
     my $r = shift;      my $r = shift;
   
Line 999  sub printHelper { Line 1068  sub printHelper {
     my $helper = Apache::lonhelper::helper->new("Printing Helper");      my $helper = Apache::lonhelper::helper->new("Printing Helper");
     $helper->declareVar('symb');      $helper->declareVar('symb');
     $helper->declareVar('postdata');          $helper->declareVar('postdata');    
       $helper->declareVar('curseed');    
     $helper->declareVar('filename');      $helper->declareVar('filename');
     $helper->declareVar('construction');      $helper->declareVar('construction');
     $helper->declareVar('assignment');      $helper->declareVar('assignment');
Line 1054  sub printHelper { Line 1124  sub printHelper {
         }          }
         $subdir = &Apache::lonnet::filelocation("", $url);          $subdir = &Apache::lonnet::filelocation("", $url);
     }      }
       if (!$helper->{VARS}->{'curseed'} && $ENV{'form.curseed'}) {
    $helper->{VARS}->{'curseed'}=$ENV{'form.curseed'};
       }
   
     my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();      my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
   
Line 1147  HELPERFRAGMENT Line 1220  HELPERFRAGMENT
       </resource>        </resource>
     </state>      </state>
   
   <state name="CHOOSE_STUDENTS" title="Choose Students whose assignments you want to print">    <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />      <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>      <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1">      <resource variable="RESOURCES" multichoice="1">
Line 1180  CHOOSE_STUDENTS Line 1253  CHOOSE_STUDENTS
 CHOOSE_FROM_SUBDIR  CHOOSE_FROM_SUBDIR
                   
         $xmlfrag .= <<'CHOOSE_FROM_SUBDIR';          $xmlfrag .= <<'CHOOSE_FROM_SUBDIR';
       <filefilter>return $filename =~         <filefilter>return Apache::lonhelper::files::not_old_version($filename) &&
            m/\.(problem|exam|quiz|assess|survey|form|library)$/;    $filename =~ m/\.(problem|exam|quiz|assess|survey|form|library)$/;
       </filefilter>        </filefilter>
       </files>        </files>
     </state>      </state>
Line 1190  CHOOSE_FROM_SUBDIR Line 1263  CHOOSE_FROM_SUBDIR
     }      }
   
     # Generate the first state, to select which resources get printed.      # Generate the first state, to select which resources get printed.
     Apache::lonhelper::state->new("START", "What do you want to print? Make a choice.");      Apache::lonhelper::state->new("START", "Select Printing Options:");
     $paramHash = Apache::lonhelper::getParamHash();      $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{MESSAGE_TEXT} = "";      $paramHash->{MESSAGE_TEXT} = "";
     Apache::lonhelper::message->new();      Apache::lonhelper::message->new();
Line 1200  CHOOSE_FROM_SUBDIR Line 1273  CHOOSE_FROM_SUBDIR
     $paramHash->{CHOICES} = $printChoices;      $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();      Apache::lonhelper::choices->new();
   
       my $startedTable = 0; # have we started an HTML table yet? (need
                             # to close it later)
   
     if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or       if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
  ($helper->{VARS}->{'construction'} eq '1')) {   ($helper->{VARS}->{'construction'} eq '1')) {
         $paramHash = Apache::lonhelper::getParamHash();   addMessage("<hr width='33%' /><table><tr><td align='right'>Print With Answers:</td><td>");
         $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next four options are available only for advanced users:  </i></b></big><br />";  
         Apache::lonhelper::message->new();  
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
  $paramHash->{'variable'} = 'ANSWER_TYPE';      $paramHash->{'variable'} = 'ANSWER_TYPE';   
  $helper->declareVar('ANSWER_TYPE');            $helper->declareVar('ANSWER_TYPE');         
         $paramHash->{CHOICES} = [          $paramHash->{CHOICES} = [
                                    ['Print without answer', 'yes'],                                     ['No', 'yes'],
                                    ['Print with answers', 'no'] ];                                     ['Yes', 'no'] ];
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
    addMessage("</td></tr>");
    $startedTable = 1;
     }      }
   
     if ($ENV{'request.role.adv'}) {      if ($ENV{'request.role.adv'}) {
         $paramHash = Apache::lonhelper::getParamHash();   if (!$startedTable) {
         $paramHash->{MESSAGE_TEXT} = "<br />";      addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
         Apache::lonhelper::message->new();      $startedTable = 1;
    } else {
       addMessage("<tr><td align='right'>LaTeX mode: </td><td>");
    }
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
  $paramHash->{'variable'} = 'LATEX_TYPE';      $paramHash->{'variable'} = 'LATEX_TYPE';   
  $helper->declareVar('LATEX_TYPE');     $helper->declareVar('LATEX_TYPE');  
  if ($helper->{VARS}->{'construction'} eq '1') {          if ($helper->{VARS}->{'construction'} eq '1') {       
     $paramHash->{CHOICES} = [      $paramHash->{CHOICES} = [
      ['Print in standard LaTeX mode', 'standard'],        ['standard LaTeX mode', 'standard'], 
      ['Print in LaTeX batchmode', 'batchmode'], ];       ['LaTeX batchmode', 'batchmode'], ];
  } else {   } else {
     $paramHash->{CHOICES} = [      $paramHash->{CHOICES} = [
      ['Print in LaTeX batchmode', 'batchmode'],       ['LaTeX batchmode', 'batchmode'],
      ['Print in standard LaTeX mode', 'standard'] ];       ['standard LaTeX mode', 'standard'] ];
  }   }
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
     }    
    addMessage("</td></tr><tr><td align='right'>Print Table of Contents: </td><td>");
     if ($ENV{'request.role.adv'}) {  
         $paramHash = Apache::lonhelper::getParamHash();  
         $paramHash->{MESSAGE_TEXT} = "<br />";  
         Apache::lonhelper::message->new();  
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
  $paramHash->{'variable'} = 'TABLE_CONTENTS';      $paramHash->{'variable'} = 'TABLE_CONTENTS';   
  $helper->declareVar('TABLE_CONTENTS');            $helper->declareVar('TABLE_CONTENTS');         
         $paramHash->{CHOICES} = [          $paramHash->{CHOICES} = [
                                    ['Print without Table of Contents', 'no'],                                     ['No', 'no'],
                                    ['Print with Table of Contents', 'yes'] ];                                     ['Yes', 'yes'] ];
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
    addMessage("</td></tr>");
                   
         $paramHash = Apache::lonhelper::getParamHash();   if (not $helper->{VARS}->{'construction'}) {
         $paramHash->{MESSAGE_TEXT} = "<br />";      addMessage("<tr><td align='right'>Print Index: </td><td>");
         Apache::lonhelper::message->new();      $paramHash = Apache::lonhelper::getParamHash();
         $paramHash = Apache::lonhelper::getParamHash();      $paramHash->{'variable'} = 'TABLE_INDEX';   
  $paramHash->{'variable'} = 'TABLE_INDEX';         $helper->declareVar('TABLE_INDEX');         
  $helper->declareVar('TABLE_INDEX');               $paramHash->{CHOICES} = [
         $paramHash->{CHOICES} = [       ['No', 'no'],
                                    ['Print without Index', 'no'],       ['Yes', 'yes'] ];
                                    ['Print with Index', 'yes'] ];      Apache::lonhelper::dropdown->new();
         Apache::lonhelper::dropdown->new();      addMessage("</td></tr>");
    }
   
    if ($helper->{VARS}->{'construction'}) {
       addMessage("<tr><td align='right'>Print With URL: </td><td>");
       $paramHash = Apache::lonhelper::getParamHash();
       $paramHash->{'variable'} = 'CONSTR_RESOURSE_URL';   
       $helper->declareVar('CONSTR_RESOURSE_URL');         
       $paramHash->{CHOICES} = [
        ['No', 'no'],
        ['Yes', 'yes'] ];
       Apache::lonhelper::dropdown->new();
       addMessage("</td></tr>");
    }
    if ($helper->{'VARS'}->{'construction'}) { 
       my $xmlfrag .= <<'RNDSEED';
       <message><tr><td align='right'>Use random seed: </td><td></message>
       <string variable="curseed" size="15" maxlength="15">
    <defaultvalue>
               return $helper->{VARS}->{'curseed'};
           </defaultvalue>
        </string>
                <message></td></tr></message>
   RNDSEED
               &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
    }
       }
   
       if ($startedTable) {
    addMessage("</table>");
     }      }
   
     Apache::lonprintout::page_format_state->new("FORMAT");      Apache::lonprintout::page_format_state->new("FORMAT");
Line 1345  sub render { Line 1450  sub render {
   
     $result .= <<STATEHTML;      $result .= <<STATEHTML;
   
 <p><big><i><b>What page format do you prefer?</b></i></big></p>  <hr width="33%" />
 <table cellpadding="3">  <table cellpadding="3">
   <tr>    <tr>
     <td align="center"><b>Page layout</b></td>      <td align="center"><b>Page layout</b></td>

Removed from v.1.217  
changed lines
  Added in v.1.231


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