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

Diff for /loncom/interface/lonprintout.pm between versions 1.267 and 1.270.2.2

version 1.267, 2004/01/12 21:53:27 version 1.270.2.2, 2004/03/15 20:27:57
Line 515  sub page_cleanup { Line 515  sub page_cleanup {
   
 sub details_for_menu {  sub details_for_menu {
   
     my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};      my $name_of_resourse = &Apache::lonnet::gettitle($ENV{'form.postdata'});
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});      my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
     my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);      my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
     $map=&Apache::lonnet::clutter($map);      $map=&Apache::lonnet::clutter($map);
     my $name_of_sequence;      my $name_of_sequence = &Apache::lonnet::gettitle($map);
     $name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}};  
     if ($name_of_sequence =~ /^\s*$/) {      if ($name_of_sequence =~ /^\s*$/) {
  $map =~ m|([^/]+)$|;   $map =~ m|([^/]+)$|;
  $name_of_sequence = $1;   $name_of_sequence = $1;
     }      }
     my $name_of_map = $hash{'title_'.$hash{'ids_'.&Apache::lonnet::clutter($ENV{'request.course.uri'})}};      my $name_of_map = &Apache::lonnet::gettitle($ENV{'request.course.uri'});
     if ($name_of_map =~ /^\s*$/) {      if ($name_of_map =~ /^\s*$/) {
  $ENV{'request.course.uri'} =~ m|([^/]+)$|;   $ENV{'request.course.uri'} =~ m|([^/]+)$|;
  $name_of_map = $1;   $name_of_map = $1;
Line 648  sub path_to_problem { Line 647  sub path_to_problem {
     return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}';      return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}';
 }  }
   
   sub recalcto_mm {
       my $textwidth=shift;
       my $LaTeXwidth;
       if ($textwidth=~/(\d+\.?\d*)\s*cm/) {
    $LaTeXwidth = $1*10;
       } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) {
    $LaTeXwidth = $1;
       } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) {
    $LaTeXwidth = $1*25.4;
       }
       $LaTeXwidth.=' mm';
       return $LaTeXwidth;
   }
   
 sub output_data {  sub output_data {
     my ($r,$helper,$rparmhash) = @_;      my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;      my %parmhash = %$rparmhash;
Line 697  ENDPART Line 710  ENDPART
     }      }
     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);      my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
     my $assignment =  $ENV{'form.assignment'};      my $assignment =  $ENV{'form.assignment'};
     my $LaTeXwidth;       my $LaTeXwidth=&recalcto_mm($textwidth);
     if ($textwidth=~/(\d+\.?\d*)\s*cm/) {  
  $LaTeXwidth = $1*10;  
     } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) {  
  $LaTeXwidth = $1;  
     } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) {  
  $LaTeXwidth = $1*25.4;  
     }  
     $LaTeXwidth.=' mm';  
       
     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;
Line 733  ENDPART Line 737  ENDPART
  }   }
  my %form;   my %form;
  $form{'grade_target'}='tex';   $form{'grade_target'}='tex';
  $form{'textwidth'}=$LaTeXwidth;   if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
                       $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
       $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
    } else {
       $form{'textwidth'}=$LaTeXwidth;
    }
  $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'};
  if ($helper->{'VARS'}->{'curseed'}) {   if ($helper->{'VARS'}->{'curseed'}) {
Line 743  ENDPART Line 752  ENDPART
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
  &Apache::lonnet::delenv('form.counter');   &Apache::lonnet::delenv('form.counter');
  &Apache::lonxml::init_counter();   &Apache::lonxml::init_counter();
  $texversion=&Apache::lonnet::ssi($currentURL,%form);   $texversion.=&Apache::lonnet::ssi($currentURL,%form);
  &Apache::lonnet::delenv('form.counter');   &Apache::lonnet::delenv('form.counter');
  &Apache::lonnet::delenv('request.filename');   &Apache::lonnet::delenv('request.filename');
     }      }
Line 798  ENDPART Line 807  ENDPART
     if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {      if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
  my %form;   my %form;
  $form{'grade_target'}='tex';   $form{'grade_target'}='tex';
  $form{'textwidth'}=$LaTeXwidth;   if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
       $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
       $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
    } else {
       $form{'textwidth'}=$LaTeXwidth;
    }
  $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'};
  $form{'rndseed'}=$rndseed;   $form{'rndseed'}=$rndseed;
Line 844  ENDPART Line 858  ENDPART
  } elsif ($currentURL=~/\/smppg$/) {    } elsif ($currentURL=~/\/smppg$/) { 
  my %form;   my %form;
  $form{'grade_target'}='tex';   $form{'grade_target'}='tex';
  $form{'textwidth'}=$LaTeXwidth;   if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
                       $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
       $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
    } else {
       $form{'textwidth'}=$LaTeXwidth;
    }
  $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};   $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  my $texversion=&Apache::lonnet::ssi($currentURL,%form);   my $texversion=&Apache::lonnet::ssi($currentURL,%form);
  $result .= $texversion;   $result .= $texversion;
Line 866  ENDPART Line 885  ENDPART
         #-- produce an output string          #-- produce an output string
  my %form=();      my %form=();   
  $form{'grade_target'}='tex';   $form{'grade_target'}='tex';
  $form{'textwidth'}=$LaTeXwidth;   if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
       $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
       $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
    } else {
       $form{'textwidth'}=$LaTeXwidth;
    }
  $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 $flag_latex_header_remove = 'NO';   my $flag_latex_header_remove = 'NO';
  my $flag_page_in_sequence = 'NO';   my $flag_page_in_sequence = 'NO';
  my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};   my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
  my $prevassignment='';   my $prevassignment='';
    &Apache::lonnet::delenv('form.counter');
  &Apache::lonxml::init_counter();   &Apache::lonxml::init_counter();
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#master_seq;$i++) {
     my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);      my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
Line 958  ENDPART Line 983  ENDPART
  #loop over students   #loop over students
  my $flag_latex_header_remove = 'NO';    my $flag_latex_header_remove = 'NO'; 
  my %moreenv;   my %moreenv;
  $moreenv{'form.textwidth'}=$LaTeXwidth;   if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
        $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
        $moreenv{'form.textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
    } else {
        $moreenv{'form.textwidth'}=$LaTeXwidth;
    }
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
  my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);   my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
  foreach my $person (@students) {   foreach my $person (@students) {
Line 1044  ENDPART Line 1074  ENDPART
     if ($urlp=~/\//) {      if ($urlp=~/\//) {
  my %form;   my %form;
  $form{'grade_target'}='tex';   $form{'grade_target'}='tex';
  $form{'textwidth'}=$LaTeXwidth;   if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
                       $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
       $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
    } else {
       $form{'textwidth'}=$LaTeXwidth;
    }
  $form{'rndseed'}=$rndseed;   $form{'rndseed'}=$rndseed;
  if ($urlp =~ m|/home/([^/]+)/public_html|) {   if ($urlp =~ m|/home/([^/]+)/public_html|) {
     $urlp =~ s|/home/([^/]*)/public_html|/~$1|;      $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
Removed from v.1.267  
changed lines
  Added in v.1.270.2.2

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