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

Diff for /loncom/interface/lonprintout.pm between versions 1.156 and 1.167

version 1.156, 2003/05/07 19:00:56 version 1.167, 2003/05/14 13:20:06
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;
           $from{'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 1363  ENDPART Line 1359  ENDPART
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {      if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...        #-- single document - problem, page, html, xml, ...
  my $currentURL;   my $currentURL;
  if (not defined $helper->{'VARS'}->{'construction'}) {   if ($helper->{'VARS'}->{'construction'} ne '1') {
               #prins published resource
     $currentURL=$helper->{'VARS'}->{'postdata'};      $currentURL=$helper->{'VARS'}->{'postdata'};
  } else {   } else {
     $currentURL=$helper->{'VARS'}->{'construction'};              #prins resource from the construction space
       $currentURL=$helper->{'VARS'}->{'filename'};
       $currentURL=~s/\/home\//\/~/;
       $currentURL=~s/public_html\///;
  }   }
  $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;
  if (&Apache::lonnet::allowed('bre',$currentURL)) {      my %form;
     $currentURL=~s/http:\/\/[^\/]+//;      $form{'grade_target'}='tex';
  }      $form{'textwidth'}=$LaTeXwidth;
         $moreenv{'request.filename'}=$currentURL;      &Apache::lonnet::appenv(%moreenv);
         $moreenv{'form.textwidth'}=$LaTeXwidth;      my $texversion=&Apache::lonnet::ssi($currentURL,$form);
         &Apache::lonnet::appenv(%moreenv);      &Apache::lonnet::delenv('form.counter');
         my $texversion=&Apache::lonnet::ssi($currentURL);      &Apache::lonnet::delenv('request.filename');
         &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');      if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
         $result .= $texversion;   my %form;
         if ($currentURL=~m/\.page\s*$/) {   $form{'grade_target'}='answer';
   ($result,$number_of_columns) = &page_cleanup($result);   $form{'answer_output_mode'}='tex';
         }   my $answer=&Apache::lonnet::ssi($currentURL,%form);
       } else {  # $r->print('<pre>'.$answer.'</pre>'); return OK;
    $texversion=~s/(\\end{document})/$answer$1/;
       }
       $result .= $texversion;
       if ($currentURL=~m/\.page\s*$/) {
    ($result,$number_of_columns) = &page_cleanup($result);
       }
    } 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 ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {  #  if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
 #      $result.=$1;  #      $result.=$1;
Line 1392  ENDPART Line 1399  ENDPART
 #      $result.=$ENV{'form.url'};  #      $result.=$ENV{'form.url'};
 #  }  #  }
 #  $result.=' \end{document}'  #  $result.=' \end{document}'
       }   }
   
   
     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) {                ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { 
Line 1412  ENDPART Line 1417  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 1495  ENDPART Line 1499  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 1583  sub handler { Line 1585  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 1710  sub printHelper { Line 1713  sub printHelper {
         if ($ENV{'form.url'}) {          if ($ENV{'form.url'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});              $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
         }          }
       }
   
     if ($ENV{'form.symb'}) {      if ($ENV{'form.symb'}) {
         $helper->{VARS}->{'symb'} = $ENV{'form.symb'};          $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
Line 1749  sub printHelper { Line 1753  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 1782  sub printHelper { Line 1779  sub printHelper {
     $r->print($helper->{VARS}->{'postdata'});      $r->print($helper->{VARS}->{'postdata'});
   
     # If we're in a sequence...      # If we're in a sequence...
     if (!defined($helper->{'VARS'}->{'construction'})) {      if ($helper->{'VARS'}->{'construction'} ne '1') {
         # Allow problems from sequence          # Allow problems from sequence
         push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];          push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence          # Allow all resources from sequence
Line 1890  CHOOSE_FROM_SUBDIR Line 1887  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'}) {
           $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.156  
changed lines
  Added in v.1.167

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