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

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

version 1.47, 2002/08/05 19:18:43 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 200  ENDPART Line 203  ENDPART
  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);
    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;
           while ($i<=$#file_seq) {
       unless ($file_seq[$i]=~m/\.(problem|page)/) {
    if ($file_seq[$i]=~m/\.sequence/) {
       my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);
       my @newfile_seq = &content_map($filecontents);
       $result .=' START '.$i.'   LOOK  '.$filecontents.' FINISH  ';
   #    splice @file_seq,$1,1,@newfile_seq;
   #    $i=-1;
    } else {
       splice @file_seq,$1,1;
    }
       }
   
   
   
   
       $i++;
    }
    for (my $iu=0;$iu<=$#file_seq;$iu++) {
       $result .= ' SSS '.$file_seq[$iu].' FFF   ';
    }
   
   
         # do we have any other sequence inside?          # do we have any other sequence inside?
 # $result.=$#file_seq.'   ';  # $result.=$#file_seq.'   ';
  my $i=1;  ## my $i=1;
  while ($i<=$#file_seq) {  ## while ($i<=$#file_seq) {
 #    $result.='      '.$file_seq[$i].'    ';  #    $result.='      '.$file_seq[$i].'    ';
     $file_seq[$i]=~s/^"//;  ##    $file_seq[$i]=~s/^"//;
     $file_seq[$i]=~s/"$//;  ##    $file_seq[$i]=~s/"$//;
     if ($file_seq[$i]=~m/\.sequence\s*$/) {  ##    if ($file_seq[$i]=~m/\.sequence\s*$/) {
  $file = &Apache::lonnet::filelocation("",$file_seq[$i]);  ## $file = &Apache::lonnet::filelocation("",$file_seq[$i]);
 # $result.='  location    '.$file.'   ';  # $result.='  location    '.$file.'   ';
 # $result .= 'FFFFFFFFF'.$file.'  ';  # $result .= 'FFFFFFFFF'.$file.'  ';
  $filecontents=&Apache::lonnet::getfile($file);  ## $filecontents=&Apache::lonnet::getfile($file);
  @add_file_seq = &content_map($filecontents);  ## @add_file_seq = &content_map($filecontents);
   
 #  #
 # for (my $iu=0;$iu<=$#add_file_seq;$iu++) {  # for (my $iu=0;$iu<=$#add_file_seq;$iu++) {
Line 221  ENDPART Line 254  ENDPART
 #  #
   
   
  splice(@file_seq,$i,1,@add_file_seq);  ## splice(@file_seq,$i,1,@add_file_seq);
  @add_file_seq = ();  ## @add_file_seq = ();
  $i = -1;  ## $i = -1;
     }  ##    }
     $i++;  ##    $i++;
     last; #do not forget to remove   ##    last; #do not forget to remove 
  }  ## }
  @master_seq = @file_seq;  ## @master_seq = @file_seq;
   
 #  #
 # for (my $iu=0;$iu<=$#file_seq;$iu++) {  # for (my $iu=0;$iu<=$#file_seq;$iu++) {
Line 237  ENDPART Line 270  ENDPART
 #  #
   
 #-- 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 279  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 326  ENDPART Line 361  ENDPART
     $result =~ s/\s%/\\%/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.47  
changed lines
  Added in v.1.48

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