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

Diff for /loncom/interface/lonprintout.pm between versions 1.159 and 1.174

version 1.159, 2003/05/08 18:41:16 version 1.174, 2003/05/15 14:16:47
Line 481  ENDPART Line 481  ENDPART
       $selectionmade = 1;        $selectionmade = 1;
       if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {        if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
         my %moreenv;          my %moreenv;
         $moreenv{'form.grade_target'}='tex';  
         if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {          if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {
   $ENV{'form.url'}=~s/http:\/\/[^\/]+//;    $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
         }          }
         $moreenv{'request.filename'}=$ENV{'form.url'};          $moreenv{'request.filename'}=$ENV{'form.url'};
         $moreenv{'form.textwidth'}=$LaTeXwidth;   my %form;
           $form{'textwidth'}=$LaTeXwidth;
           $form{'grade_target'}='tex';
         &Apache::lonnet::appenv(%moreenv);          &Apache::lonnet::appenv(%moreenv);
         my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});          my $texversion=&Apache::lonnet::ssi($ENV{'form.url'},%form);
         &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');          &Apache::lonnet::delenv('form.counter');
         $result .= $texversion;          $result .= $texversion;
         if ($ENV{'form.url'}=~m/\.page\s*$/) {          if ($ENV{'form.url'}=~m/\.page\s*$/) {
   ($result,$number_of_columns) = &page_cleanup($result);    ($result,$number_of_columns) = &page_cleanup($result);
Line 523  ENDPART Line 524  ENDPART
     } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') {      } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') {
               $selectionmade = 3;                $selectionmade = 3;
     }      }
    my %moreenv;     my %form;
    $moreenv{'form.grade_target'}='tex';     $form{'textwidth'}=$LaTeXwidth;
    $moreenv{'form.textwidth'}=$LaTeXwidth;     $form{'grade_target'}='tex';
    &Apache::lonnet::appenv(%moreenv);     $form{'symb'}=$symb;
    #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb");     #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
    my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));     my $texversion=&Apache::lonnet::ssi($urlp,%form);
    &Apache::lonnet::delenv('form.grade_target','form.textwidth');  
    if ($urlp =~ m/\.page/) {     if ($urlp =~ m/\.page/) {
      ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);       ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
      if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}        if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
Line 563  ENDPART Line 563  ENDPART
      my ($urlp,$symb) = split /&&/, $file_seq[$i];       my ($urlp,$symb) = split /&&/, $file_seq[$i];
      $urlp=~s/\/home\/httpd\/html//;           $urlp=~s/\/home\/httpd\/html//;    
      if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {       if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
  my %moreenv;   my %form;
  $moreenv{'form.grade_target'}='tex';   $form{'grade_target'}='tex';
  $moreenv{'form.textwidth'}=$LaTeXwidth;   $form{'textwidth'}=$LaTeXwidth;
  &Apache::lonnet::appenv(%moreenv);   $form{'symb'}=$symb;
  my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));   my $texversion=&Apache::lonnet::ssi($urlp,%form);
  &Apache::lonnet::delenv('form.grade_target','form.textwidth');      
  if ($flag_latex_header_remove ne 'NO') {   if ($flag_latex_header_remove ne 'NO') {
     $texversion = &latex_header_footer_remove($texversion);      $texversion = &latex_header_footer_remove($texversion);
  } else {   } else {
Line 658  ENDPART Line 657  ENDPART
  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=~/\//) {
  my %moreenv;   my %form;
  $moreenv{'form.grade_target'}='tex';   $form{'grade_target'}='tex';
  $moreenv{'form.textwidth'}=$LaTeXwidth;   $form{'textwidth'}=$LaTeXwidth;
  &Apache::lonnet::appenv(%moreenv);  
  if ($urlp =~ m|/home/([^/]+)/public_html|) {   if ($urlp =~ m|/home/([^/]+)/public_html|) {
     $urlp =~ s|/home/([^/]*)/public_html|/~$1|;      $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
  } else {   } else {
     $urlp =~ s|^/home/httpd/html||;      $urlp =~ s|^/home/httpd/html||;
  }   }
  my $texversion=&Apache::lonnet::ssi($urlp);   my $texversion=&Apache::lonnet::ssi($urlp,%form);
  &Apache::lonnet::delenv('form.grade_target','form.textwidth');  
                 #this chunck is responsible for printing the path to problem                  #this chunck is responsible for printing the path to problem
  my $newurlp = '';   my $newurlp = '';
  my $HowMany = length($urlp)*2;   my $HowMany = length($urlp)*2;
Line 1037  sub character_chart { Line 1034  sub character_chart {
     $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;      $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;
     $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;      $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;
     $result =~ s/&(Omega|\#937);/\$\\Omega \$/g;      $result =~ s/&(Omega|\#937);/\$\\Omega \$/g;
   
     return $result;      return $result;
 }  }
   
Line 1045  sub character_chart { Line 1041  sub character_chart {
     sub page_format {      sub page_format {
  my ($papersize,$layout,$numberofcolumns) = @_;    my ($papersize,$layout,$numberofcolumns) = @_; 
  my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);   my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
   
   
  if ($papersize=~/Letter/) {   if ($papersize=~/Letter/) {
     if ($layout eq 'CAPA') {      if ($layout eq 'CAPA') {
  if ($numberofcolumns == 1) {   if ($numberofcolumns == 1) {
Line 1375  ENDPART Line 1373  ENDPART
  $selectionmade = 1;   $selectionmade = 1;
  if ($currentURL=~/\.(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{'request.filename'}=$currentURL;      $moreenv{'request.filename'}=$currentURL;
     $moreenv{'form.textwidth'}=$LaTeXwidth;      my %form;
       $form{'grade_target'}='tex';
       $form{'textwidth'}=$LaTeXwidth;
       my $rndseed=time;
       $form{'rndseed'}=$rndseed;
     &Apache::lonnet::appenv(%moreenv);      &Apache::lonnet::appenv(%moreenv);
     my $texversion=&Apache::lonnet::ssi($currentURL);      my $texversion=&Apache::lonnet::ssi($currentURL,%form);
     &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');      &Apache::lonnet::delenv('form.counter');
       &Apache::lonnet::delenv('request.filename');
       if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
    my %form;
    $form{'grade_target'}='answer';
    $form{'answer_output_mode'}='tex';
    $form{'rndseed'}=$rndseed;
    my $answer=&Apache::lonnet::ssi($currentURL,%form);
    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
       }
     $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);
Line 1411  ENDPART Line 1421  ENDPART
     } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {      } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
  $selectionmade = 4;   $selectionmade = 4;
     }      }
     my %moreenv;      my %form;   
     $moreenv{'form.grade_target'}='tex';      $form{'grade_target'}='tex';
     $moreenv{'form.textwidth'}=$LaTeXwidth;      $form{'textwidth'}=$LaTeXwidth;
     &Apache::lonnet::appenv(%moreenv);      $form{'symb'}=$master_seq[$i];
     #&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,('symb'=>$master_seq[$i]));      my $texversion=&Apache::lonnet::ssi($urlp,%form);
     &Apache::lonnet::delenv('form.grade_target','form.textwidth');  
     if ($urlp=~/\.page$/) {      if ($urlp=~/\.page$/) {
  ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);   ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
  if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}    if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
Line 1429  ENDPART Line 1438  ENDPART
     } else {      } else {
  $texversion =~ s/\\end{document}//;   $texversion =~ s/\\end{document}//;
     }      }
       if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
    my %form;
    $form{'grade_target'}='answer';
    $form{'answer_output_mode'}='tex';
    my $answer=&Apache::lonnet::ssi($urlp,%form);
    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
       }
     $result .= $texversion;               $result .= $texversion;         
     $flag_latex_header_remove = 'YES';         $flag_latex_header_remove = 'YES';   
  }   }
Line 1463  ENDPART Line 1479  ENDPART
  } else {   } else {
     $rendered =~ s/\\end{document}//;      $rendered =~ s/\\end{document}//;
  }   }
    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
       my %form;
       $form{'answer_output_mode'}='tex';
       my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,
         $ENV{'request.course.id'},%form);
       $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
    }
  $current_output .= $rendered;   $current_output .= $rendered;
     }      }
     $flag_latex_header_remove = 'YES';      $flag_latex_header_remove = 'YES';
Line 1494  ENDPART Line 1517  ENDPART
  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=~/\//) {
  my %moreenv;   my %form;
  $moreenv{'form.grade_target'}='tex';   $form{'grade_target'}='tex';
  $moreenv{'form.textwidth'}=$LaTeXwidth;   $form{'textwidth'}=$LaTeXwidth;
  &Apache::lonnet::appenv(%moreenv);  
  if ($urlp =~ m|/home/([^/]+)/public_html|) {   if ($urlp =~ m|/home/([^/]+)/public_html|) {
     $urlp =~ s|/home/([^/]*)/public_html|/~$1|;      $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
  } else {   } else {
     $urlp =~ s|^/home/httpd/html||;      $urlp =~ s|^/home/httpd/html||;
  }   }
  my $texversion=&Apache::lonnet::ssi($urlp);   my $texversion=&Apache::lonnet::ssi($urlp,%form);
  &Apache::lonnet::delenv('form.grade_target','form.textwidth');   if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
       my $rndseed=time;
       $form{'rndseed'}=$rndseed;
       my %form;
       $form{'grade_target'}='answer';
       $form{'answer_output_mode'}='tex';
       $form{'rndseed'}=$rndseed;
       my $answer=&Apache::lonnet::ssi($urlp,%form);
       $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
    }
                 #this chunck is responsible for printing the path to problem                  #this chunck is responsible for printing the path to problem
  my $newurlp = '';   my $newurlp = '';
  my $HowMany = length($urlp)*2;   my $HowMany = length($urlp)*2;
Line 1582  sub handler { Line 1613  sub handler {
         $helper = $result;          $helper = $result;
   
   
 # my $key;   
 # foreach $key (keys %{$helper->{'VARS'}}) {   my $key; 
 #    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');   foreach $key (keys %{$helper->{'VARS'}}) {
 # }      $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
    }
 # return OK;  # return OK;
   
   
Line 1749  sub printHelper { Line 1781  sub printHelper {
   
     # "Delete everything after the last slash."      # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;      $subdir =~ s|/[^/]+$||;
     if (not defined $helper->{VARS}->{'construction'}) {      if (not $helper->{VARS}->{'construction'}) {
  $subdir =  '/home/httpd/html/res'.$subdir;      $subdir='/home/httpd/html/res/'.$subdir;
     } else {  
  $helper->{VARS}->{'construction'}=~/^([^\/]+)\/\/([^\/]+)(.*)\/[^\/]*$/;  
  $subdir = $3;  
  $subdir=~/\/~([^\/]+)\/(.*)$/;  
  $subdir = '/home/'.$1.'/public_html/'.$2;  
     }      }
 ####    $r->print('Dir:  '.$subdir.'  ');  
 ####    return OK;  
   
   
     # What can be printed is a very dynamic decision based on      # What can be printed is a very dynamic decision based on
Line 1829  HELPERFRAGMENT Line 1854  HELPERFRAGMENT
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);          &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">    <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>      <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1">      <resource variable="RESOURCES" multichoice="1" suppressEmptySequences='1'>
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblemOrMap</filterfunc>        <filterfunc>return $isProblemOrMap</filterfunc>
       <choicefunc>return $isProblem</choicefunc>        <choicefunc>return $isProblem</choicefunc>
Line 1890  CHOOSE_FROM_SUBDIR Line 1915  CHOOSE_FROM_SUBDIR
     $helper->declareVar('PRINT_TYPE');      $helper->declareVar('PRINT_TYPE');
     $paramHash->{CHOICES} = $printChoices;      $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();      Apache::lonhelper::choices->new();
   
       if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
    ($helper->{VARS}->{'construction'} eq '1')) {
           $paramHash = Apache::lonhelper::getParamHash();
           $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:</i></b></big><br />";
           Apache::lonhelper::message->new();
           $paramHash = Apache::lonhelper::getParamHash();
    $paramHash->{'variable'} = 'ANSWER_TYPE';   
    $helper->declareVar('ANSWER_TYPE');         
           $paramHash->{CHOICES} = [
                                      ['Print without answer', 'yes'],
                                      ['Print with answers', 'no'] ];
           Apache::lonhelper::choices->new();
       }
   
     Apache::lonprintout::page_format_state->new("FORMAT");      Apache::lonprintout::page_format_state->new("FORMAT");
   
     # Generate the PAGESIZE state which will offer the user the margin      # Generate the PAGESIZE state which will offer the user the margin
Removed from v.1.159  
changed lines
  Added in v.1.174

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