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

Diff for /loncom/interface/lonprintout.pm between versions 1.46 and 1.48

version 1.46, 2002/08/02 18:27:04 version 1.48, 2002/08/09 18:06:46
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 200  ENDPART Line 198  ENDPART
     }  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 = ();   my @master_seq = ();
  my @add_file_seq = ();   my @add_file_seq = ();
 #-- where is the main sequence of the course?          # 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/"$//;
       $file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);
   #remove    $result .= ' SSS '.$file_seq[$iu].' FFF   ';
    }
  my $i=0;   my $i=0;
  while ($i<=$#file_seq) {          while ($i<=$#file_seq) {
     $_ = $file_seq[$i];      unless ($file_seq[$i]=~m/\.(problem|page)/) {
     if (/\.sequence$/) {   if ($file_seq[$i]=~m/\.sequence/) {
  $file = &Apache::lonnet::filelocation("",$file_seq[$i]);      my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);
  $filecontents=&Apache::lonnet::getfile($file);      my @newfile_seq = &content_map($filecontents);
  @add_file_seq = &content_map($filecontents);      $result .=' START '.$i.'   LOOK  '.$filecontents.' FINISH  ';
  splice(@file_seq,$i,1,@add_file_seq);  #    splice @file_seq,$1,1,@newfile_seq;
  @add_file_seq = ();  #    $i=-1;
  $i = -1;   } else {
       splice @file_seq,$1,1;
    }
     }      }
   
   
   
   
     $i++;      $i++;
  }   }
  @master_seq = @file_seq;   for (my $iu=0;$iu<=$#file_seq;$iu++) {
       $result .= ' SSS '.$file_seq[$iu].' FFF   ';
    }
   
   
           # do we have any other sequence inside?
   # $result.=$#file_seq.'   ';
   ## my $i=1;
   ## while ($i<=$#file_seq) {
   #    $result.='      '.$file_seq[$i].'    ';
   ##    $file_seq[$i]=~s/^"//;
   ##    $file_seq[$i]=~s/"$//;
   ##    if ($file_seq[$i]=~m/\.sequence\s*$/) {
   ## $file = &Apache::lonnet::filelocation("",$file_seq[$i]);
   # $result.='  location    '.$file.'   ';
   # $result .= 'FFFFFFFFF'.$file.'  ';
   ## $filecontents=&Apache::lonnet::getfile($file);
   ## @add_file_seq = &content_map($filecontents);
   
   #
   # for (my $iu=0;$iu<=$#add_file_seq;$iu++) {
   #    $result .= ' SDSD '.$add_file_seq[$iu].' FDFD   ';
   # }
   #
   
   
   ## splice(@file_seq,$i,1,@add_file_seq);
   ## @add_file_seq = ();
   ## $i = -1;
   ##    }
   ##    $i++;
   ##    last; #do not forget to remove 
   ## }
   ## @master_seq = @file_seq;
   
   #
   # for (my $iu=0;$iu<=$#file_seq;$iu++) {
   #    $result .= ' SSS '.$file_seq[$iu].' FFF   ';
   # }
   #
   
 #-- 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];
     m/\"(.*)\"/;  ###    m/\"(.*)\"/;
             $_ = $1;  ###         $_ = $1;
             my $urlp = $1;  ###            my $urlp = $1;
             if (/\.(problem|exam|quiz|assess|survey|form|library)/) {  ###            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);
  my $texversion=&Apache::lonnet::ssi($urlp);  ### my $texversion=&Apache::lonnet::ssi($urlp);
  &Apache::lonnet::delenv('form.grade_target');  ### &Apache::lonnet::delenv('form.grade_target');
  $result .= $texversion;          ### $result .= $texversion;        
     }  ###    }
  }      ### }    
  $result = &additional_cleanup($result);  ### $result = &additional_cleanup($result);
     } elsif ($choice eq 'Subdirectory print') {            } elsif ($choice eq 'Subdirectory print') {      
  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 = ();
  if ($ENV{'request.role'}=~m/^au\./) {   if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
     $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;      $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
  } else {   } else {
     $subdirtoprint =~ s/.*(\/res\/)/$1/;      $subdirtoprint =~ s/.*(\/res\/)/$1/;
  }   }
  my @content_directory = ();   my @content_directory = ();
  if ($ENV{'request.role'}=~m/^au\./) {   if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
     @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');      @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
  } else {   } else {
     @content_directory = &Apache::lonnet::dirlist($subdirtoprint);      @content_directory = &Apache::lonnet::dirlist($subdirtoprint);
Line 263  ENDPART Line 312  ENDPART
     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\./) { $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; }      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 307  ENDPART Line 358  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;
Removed from v.1.46  
changed lines
  Added in v.1.48

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