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

Diff for /loncom/interface/lonprintout.pm between versions 1.73 and 1.74

version 1.73, 2002/09/20 20:32:42 version 1.74, 2002/09/23 21:09:58
Line 342  ENDPART Line 342  ENDPART
   
     my $choice = $ENV{'form.choice'};      my $choice = $ENV{'form.choice'};
     my $layout = $ENV{'form.layout'};      my $layout = $ENV{'form.layout'};
     my $numberofcolumns = $ENV{'form.numberofcolumns'};                     my $numberofcolumns = $ENV{'form.numberofcolumns'};  
       my $papersize = $ENV{'form.papersize'};          
     my $laystyle = 'book';      my $laystyle = 'book';
     my $result = '';      my $result = '';
     my $number_of_columns = 1; #used only for pages to determine the width of the cell      my $number_of_columns = 1; #used only for pages to determine the width of the cell
Line 369  ENDPART Line 370  ENDPART
       #-- minimal sequence to which the current document belongs        #-- minimal sequence to which the current document belongs
         #-- where is the primary sequence containing file?          #-- where is the primary sequence containing file?
  my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});   my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
  $symbolic =~ m/([^_]+)_/;   my @sequence = split('___',$symbolic);
  my $primary_sequence = '/res/'.$1;      my $primary_sequence = '/res/'.$sequence[0];   
   $symbolic =~ m/^([^_]+__)/;   my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
  my @master_seq = &coming_from_hash($primary_sequence,$1);  
         #-- produce an output string          #-- produce an output string
  my $flag_latex_header_remove = 'NO';   my $flag_latex_header_remove = 'NO';
  my $flag_page_in_sequence = 'NO';   my $flag_page_in_sequence = 'NO';
Line 385  ENDPART Line 385  ENDPART
     my %moreenv;      my %moreenv;
     $moreenv{'form.grade_target'}='tex';      $moreenv{'form.grade_target'}='tex';
     &Apache::lonnet::appenv(%moreenv);      &Apache::lonnet::appenv(%moreenv);
       &Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
     my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));      my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
     &Apache::lonnet::delenv('form.grade_target');      &Apache::lonnet::delenv('form.grade_target');
     if ($flag_latex_header_remove ne 'NO') {      if ($flag_latex_header_remove ne 'NO') {
Line 424  ENDPART Line 425  ENDPART
         # where is the main sequence of the course?          # where is the main sequence of the course?
  $selectionmade = 4;   $selectionmade = 4;
  my $main_seq = '/res/'.$ENV{'request.course.uri'};   my $main_seq = '/res/'.$ENV{'request.course.uri'};
  my @file_seq = &coming_from_hash($main_seq);    my @file_seq = &coming_from_hash_whole($main_seq);
  my $flag_latex_header_remove = 'NO';   my $flag_latex_header_remove = 'NO';
         #-- produce an output string          #-- produce an output string
  for (my $i=0;$i<=$#file_seq;$i++) {   for (my $i=0;$i<=$#file_seq;$i++) {
Line 434  ENDPART Line 435  ENDPART
  my %moreenv;   my %moreenv;
  $moreenv{'form.grade_target'}='tex';   $moreenv{'form.grade_target'}='tex';
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
  my $texversion=&Apache::lonnet::ssi($urlp);   my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
  &Apache::lonnet::delenv('form.grade_target');       &Apache::lonnet::delenv('form.grade_target');    
  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 {
     $texversion =~ s/\\end{document}//;      $texversion =~ s/\\end{document}//;
  }   }
  $result .= $texversion;           $result .= $texversion;  
    $flag_latex_header_remove = 'YES';
     }      }
     $flag_latex_header_remove = 'YES';    
  }       }    
  $result .= '\end{document}';   $result .= '\end{document}';
     } elsif ($choice eq 'All class print') {       } elsif ($choice eq 'All class print') { 
Line 457  ENDPART Line 458  ENDPART
  }   }
  #where is the primary sequence containing current resource (the same for all students)?   #where is the primary sequence containing current resource (the same for all students)?
  my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});   my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
  $symbolic =~ m/([^_]+)_/;   my @sequence = split('___',$symbolic);
  my $primary_sequence = '/res/'.$1;   my $primary_sequence = '/res/'.$sequence[0];
  $symbolic =~ m/^([^_]+__)/;   my @master_seq = &coming_from_hash($primary_sequence,$sequence[0); 
  my @master_seq = &coming_from_hash($primary_sequence,$1);   
         #loop over students          #loop over students
  my $flag_latex_header_remove = 'NO';     my $flag_latex_header_remove = 'NO';  
  foreach my $person (@students) {   foreach my $person (@students) {
Line 526  ENDPART Line 526  ENDPART
  }   }
  $result .= '\end{document}';         $result .= '\end{document}';      
     }      }
 #-- corrections for the different page formats  #-------------------------------------------------------- corrections for the different page formats
   #    my ($textwidth,$textheight,$offset) = (0,0,0);
   #    if ($papersize=~/Letter/) {
   # $textwidth = ;
   #        $textheight = ;
   #        $offset = ;
   #    } elsif($papersize=~/Legal/) {
   # $textwidth = ;
   #        $textheight = ;
   #        $offset = ;
   #    } elsif($papersize=~/Ledger/) {
   # $textwidth = ;
   #        $textheight = ;
   #        $offset = ;
   #    } elsif($papersize=~/Executive/) {
   # $textwidth = ;
   #        $textheight = ;
   #        $offset = ;
   #    } elsif($papersize=~/A4/) {
   # $textwidth = ;
   #        $textheight = ;
   #        $offset = ;
   #    } elsif($papersize=~/A3/) {
   # $textwidth = ;
   #        $textheight = ;
   #        $offset = ;
   #    } elsif($papersize=~/A2/) {
   # $textwidth = ;
   #        $textheight = ;
   #        $offset = ;
   #    } elsif($papersize=~/A5/) {
   # $textwidth = ;
   #        $textheight = ;
   #        $offset = ;
   #    } elsif($papersize=~/A6/) {
   # $textwidth = ;
   #        $textheight = ;
   #        $offset = ;
   #                                           <option selected> Letter [8 1/2x11 in] </option>
   #                                            <option> Legal [8 1/2x14 in] </option>
   #                                            <option> Ledger/Tabloid [11x17 in] </option>
   #                                            <option> Executive [7 1/2x10 in] </option>
   #                                            <option> A2 [420x594 mm] </option>
   #                                            <option> A3 [297x420 mm] </option>
   #                                            <option> A4 [210x297 mm] </option>
   #                                            <option> A5 [148x210 mm] </option>
   #                                            <option> A6 [105x148 mm] </option>
   #
   #    }
   
     if ($layout eq 'CBI' and $numberofcolumns eq '1') {      if ($layout eq 'CBI' and $numberofcolumns eq '1') {
  $result =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{-40pt}\\setlength{\\evensidemargin}{-60pt}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{4\.4in}\\setlength{\\textheight}{6\.8in}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt} \\begin{document}/;   $result =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{-40pt}\\setlength{\\evensidemargin}{-60pt}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{4\.4in}\\setlength{\\textheight}{6\.8in}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt} \\begin{document}/;
  $result =~ s/\$number_of_columns/$number_of_columns/g;   $result =~ s/\$number_of_columns/$number_of_columns/g;
Line 609  sub coming_from_hash_whole { Line 658  sub coming_from_hash_whole {
     my $current_resource = $mapstart;      my $current_resource = $mapstart;
     while ($current_resource ne $mapfinish) {      while ($current_resource ne $mapfinish) {
  if ($hash{'src_'.$current_resource}=~/\.sequence$/) {   if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
       push @resourcelist,&coming_from_hash_whole($hash{'src_'.$current_resource});
  } else {   } else {
               $mainsequence =~ /\/res\/(.*)$/;
       my $presymb = $1;
       my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
               if ($rid=~/,/) {
    my @rid = split /,/, $rid;
    foreach my $rid_element (@rid) {
       if ($rid_element =~ m/^$mapid\.(\d*)/) {
    $rid = $1; 
    last;
       }
    }
       } else {
    $rid =~ m/^$mapid\.(\d*)/;
                   $rid = $1;  
       }
       $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
       my $symb = $presymb.'___'.$rid.'___'.$1;    
       push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
  }   }
    $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
     }      }
   
   
     push @resourcelist,$mapid,$mapstart,$mapfinish;  
     return @resourcelist;      return @resourcelist;
 }  }
   
Removed from v.1.73  
changed lines
  Added in v.1.74

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