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

Diff for /loncom/interface/lonprintout.pm between versions 1.44 and 1.50

version 1.44, 2002/08/01 19:48:18 version 1.50, 2002/08/12 18:06:55
Line 72  sub menu_for_output { Line 72  sub menu_for_output {
 <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document  <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document
 (you will print what you see on the screen)<br />  (you will print what you see on the screen)<br />
 ENDMENUOUT1  ENDMENUOUT1
     if (not $ENV{'request.role'}=~m/^au\./) {      if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
     $r->print(<<ENDMENUOUT2);      $r->print(<<ENDMENUOUT2);
 <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />  <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />
 <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />  <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />
Line 140  ENDPART Line 140  ENDPART
     my $laystyle = 'book';      my $laystyle = 'book';
     my $result = '';      my $result = '';
     my $number_of_columns = 1;      my $number_of_columns = 1;
   #    my $number_of_columns = $ENV{'form.numberofcolumns'};    
     
     if ($choice eq 'Standard LaTeX output for current document') {      if ($choice eq 'Standard LaTeX output for current document') {
       #-- single document - problem, page, html, xml          #-- single document - problem, page, html, xml  
       my %moreenv;        my %moreenv;
       $moreenv{'form.grade_target'}='tex';        $moreenv{'form.grade_target'}='tex';
       if ($ENV{'request.role'}=~m/^au\./) {$ENV{'form.url'}=~s/http:\/\/[^\/]+//;}        if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
     $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
         }
       $moreenv{'request.filename'}=$ENV{'form.url'};        $moreenv{'request.filename'}=$ENV{'form.url'};
       &Apache::lonnet::appenv(%moreenv);        &Apache::lonnet::appenv(%moreenv);
       my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});        my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
Line 167  ENDPART Line 170  ENDPART
  my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);   my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
  my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);   my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);
  my @master_seq = &content_map($sequencefilecontents);   my @master_seq = &content_map($sequencefilecontents);
 #  
 # for (my $iu=0;$iu<=$#master_seq;$iu++) {  
 #    $result .= ' '.$master_seq[$iu].'    ';  
 # }  
 #  
         #-- produce an output string          #-- produce an output string
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#master_seq;$i++) {
     $_ = $master_seq[$i];      $_ = $master_seq[$i];
Line 198  ENDPART Line 196  ENDPART
  }   }
  $result = &additional_cleanup($result);   $result = &additional_cleanup($result);
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {      }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
  my @master_seq = ();          # where is the main sequence of the course?
  my @add_file_seq = ();  
 #-- where is the main sequence of the course?  
  my $main_seq = '/res/'.$ENV{'request.course.uri'};   my $main_seq = '/res/'.$ENV{'request.course.uri'};
  my $file=&Apache::lonnet::filelocation("",$main_seq);   my $file=&Apache::lonnet::filelocation("",$main_seq);
  my $filecontents=&Apache::lonnet::getfile($file);   my $filecontents=&Apache::lonnet::getfile($file);
  my @file_seq = &content_map($filecontents);   my @file_seq = &content_map($filecontents);
 #-- do we have any other sequence inside?   for (my $iu=0;$iu<=$#file_seq;$iu++) {
       $file_seq[$iu]=~s/^"//;
       $file_seq[$iu]=~s/"$//;
       if ($file_seq[$iu]=~m/\S+/) {
    $file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);
       } else {
    $file_seq[$iu]= 'REMOVE IT PLEASE';
       }
    }
  my $i=0;   my $i=0;
  while ($i<=$#file_seq) {          my $limit = $#file_seq;    
     $_ = $file_seq[$i];          while ($i<=$limit) {
     if (/\.sequence$/) {      unless ($file_seq[$i]=~m/\.(problem|page)/) {
  $file = &Apache::lonnet::filelocation("",$file_seq[$i]);   if ($file_seq[$i]=~m/\.sequence/) {
  $filecontents=&Apache::lonnet::getfile($file);      my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);
  @add_file_seq = &content_map($filecontents);      my @newfile_seq = &content_map($filecontents);
  splice(@file_seq,$i,1,@add_file_seq);      for (my $iu=0;$iu<=$#newfile_seq;$iu++) {
  @add_file_seq = ();   $newfile_seq[$iu]=~s/^"//;
  $i = -1;                  $newfile_seq[$iu]=~s/"$//;
    if ($newfile_seq[$iu]=~m/\S+/) {
       $newfile_seq[$iu]=&Apache::lonnet::filelocation("",$newfile_seq[$iu]);
    } else {
       $newfile_seq[$iu]= 'REMOVE IT PLEASE';
    }
       }
       splice @file_seq,$i,1,@newfile_seq;
       $i=0;
       $limit = $#file_seq;
    } else {
       splice @file_seq,$i,1,'REMOVE IT PLEASE';
    }
     }      }
     $i++;      $i++;
  }   }
  @master_seq = @file_seq;   for (my $iu=0;$iu<=$#file_seq;$iu++) {
       if ($file_seq[$iu]=~m/REMOVE IT PLEASE/) {
    splice @file_seq,$iu,1;
       }
    }
    if ($file_seq[-1]=~m/REMOVE IT PLEASE/) {
       pop @file_seq;
    }
 #-- produce an output string  #-- produce an output string
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#file_seq;$i++) {
     $_ = $master_seq[$i];              my $urlp = $file_seq[$i];
     m/\"(.*)\"/;      $urlp=~s/\/home\/httpd\/html//;    
             $_ = $1;              if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
             my $urlp = $1;  
             if (/\.(problem|exam|quiz|assess|survey|form|library)/) {  
  my %moreenv;   my %moreenv;
  $moreenv{'form.grade_target'}='tex';   $moreenv{'form.grade_target'}='tex';
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
Line 240  ENDPART Line 261  ENDPART
  my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});   my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
  $subdirtoprint =~ s/\/[^\/]+$//;   $subdirtoprint =~ s/\/[^\/]+$//;
  my @list_of_files = ();   my @list_of_files = ();
  my $localdirectory = $subdirtoprint;   if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
  $localdirectory =~ s/.*(\/res\/)/$1/;      $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
  my @content_directory = &Apache::lonnet::dirlist($localdirectory);   } else {
       $subdirtoprint =~ s/.*(\/res\/)/$1/;
    }
    my @content_directory = ();
    if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
       @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
    } else {
       @content_directory = &Apache::lonnet::dirlist($subdirtoprint);
    }
  for (my $iy=0;$iy<=$#content_directory;$iy++) {   for (my $iy=0;$iy<=$#content_directory;$iy++) {
     my @tempo_array = split(/&/,$content_directory[$iy]);      my @tempo_array = split(/&/,$content_directory[$iy]);
     $content_directory[$iy] = $tempo_array[0];      if ($tempo_array[0] =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/) {
     if ($content_directory[$iy] =~ m/^[^\.]+\.problem$/) {   push(@list_of_files,$tempo_array[0]);
  push @list_of_files,$content_directory[$iy];  
     }      }
  }   }
  $localdirectory =~ s/\/$//;   $subdirtoprint =~ s/\/$//;
  for (my $i=0;$i<=$#list_of_files;$i++) {   for (my $i=0;$i<=$#list_of_files;$i++) {
     my $urlp = $localdirectory.'/'.$list_of_files[$i];           my $urlp = $subdirtoprint.'/'.$list_of_files[$i];
     my %moreenv;      my %moreenv;
     $moreenv{'form.grade_target'}='tex';      $moreenv{'form.grade_target'}='tex';
     &Apache::lonnet::appenv(%moreenv);      &Apache::lonnet::appenv(%moreenv);
       if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) { 
    $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; 
       }
     my $texversion=&Apache::lonnet::ssi($urlp);      my $texversion=&Apache::lonnet::ssi($urlp);
     &Apache::lonnet::delenv('form.grade_target');      &Apache::lonnet::delenv('form.grade_target');
     $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;      $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
Line 285  ENDPART Line 316  ENDPART
  $result =~ s/\\includegraphics{/\\includegraphics\[width=9\.0 cm\]{/g;   $result =~ s/\\includegraphics{/\\includegraphics\[width=9\.0 cm\]{/g;
 # $result =~ s/\\includegraphics{/\\includegraphics\[width=\\textwidth\]{/g;  # $result =~ s/\\includegraphics{/\\includegraphics\[width=\\textwidth\]{/g;
 # $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;  # $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;
  $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;   $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny \\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright Michigan State University Board of Trustees $1/;
 #        $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[9\.0cm\]\[b\]{\\hrulefill})/$2$1/g;  #        $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[9\.0cm\]\[b\]{\\hrulefill})/$2$1/g;
         $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;          $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
         $result =~ s/(\\end{longtable}\s*)\\newline/$1/g;          $result =~ s/(\\end{longtable}\s*)\\newline/$1/g;
Line 299  ENDPART Line 330  ENDPART
  $first_comment = index($result,'<!--',$first_comment);   $first_comment = index($result,'<!--',$first_comment);
     }      }
     $result =~ s/^\s+$//gm; #remove empty lines      $result =~ s/^\s+$//gm; #remove empty lines
     $result =~ s/([^\\])%/\$1\%/g;   #corrects %      $result =~ s/\s%/\\%/g;   #corrects %
     $result =~ s/(\s)+/$1/g; #removes more than one empty space      $result =~ s/(\s)+/$1/g; #removes more than one empty space
     $result =~ s/\\\\\s*\\vskip/\\vskip/gm;      $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
     $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >  
     $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;      $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
     $result =~ s/{\\par }\s*\\\\/\\\\/gm;      $result =~ s/{\\par }\s*\\\\/\\\\/gm;
  $result =~ s/\\\\\s+\[/ \[/g;   $result =~ s/\\\\\s+\[/ \[/g;
Line 705  sub content_map { Line 735  sub content_map {
  $startlink = index($map_string,'from="'.$1.'"',0);   $startlink = index($map_string,'from="'.$1.'"',0);
  $startlink = rindex($map_string,'<link ',$startlink);   $startlink = rindex($map_string,'<link ',$startlink);
     }      }
     my $stalink = index($map_string,' to="'.$number_seq[0].'"',$startlink);      my $stalink = index($map_string,' to="'.$number_seq[0].'"',0);
     while ($stalink != -1) {      while ($stalink != -1) {
  $startlink = rindex($map_string,'<link ',$stalink);   $startlink = rindex($map_string,'<link ',$stalink);
  $endlink = index($map_string,'</link>',$startlink);   $endlink = index($map_string,'</link>',$startlink);
Removed from v.1.44  
changed lines
  Added in v.1.50

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