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

version 1.48, 2002/08/09 18:06:46 version 1.49, 2002/08/09 20:38:42
Line 196  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 = ();  
  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);
Line 206  ENDPART Line 204  ENDPART
  for (my $iu=0;$iu<=$#file_seq;$iu++) {   for (my $iu=0;$iu<=$#file_seq;$iu++) {
     $file_seq[$iu]=~s/^"//;      $file_seq[$iu]=~s/^"//;
     $file_seq[$iu]=~s/"$//;      $file_seq[$iu]=~s/"$//;
     $file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);      if ($file_seq[$iu]=~m/\S+/) {
 #remove    $result .= ' SSS '.$file_seq[$iu].' FFF   ';   $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;    
           while ($i<=$limit) {
     unless ($file_seq[$i]=~m/\.(problem|page)/) {      unless ($file_seq[$i]=~m/\.(problem|page)/) {
  if ($file_seq[$i]=~m/\.sequence/) {   if ($file_seq[$i]=~m/\.sequence/) {
     my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);      my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);
     my @newfile_seq = &content_map($filecontents);      my @newfile_seq = &content_map($filecontents);
     $result .=' START '.$i.'   LOOK  '.$filecontents.' FINISH  ';      for (my $iu=0;$iu<=$#newfile_seq;$iu++) {
 #    splice @file_seq,$1,1,@newfile_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 {   } else {
     splice @file_seq,$1,1;      splice @file_seq,$i,1,'REMOVE IT PLEASE';
  }   }
     }      }
   
   
   
   
     $i++;      $i++;
  }   }
  for (my $iu=0;$iu<=$#file_seq;$iu++) {   for (my $iu=0;$iu<=$#file_seq;$iu++) {
     $result .= ' SSS '.$file_seq[$iu].' FFF   ';      if ($file_seq[$iu]=~m/REMOVE IT PLEASE/) {
    splice @file_seq,$iu,1;
       }
    }
    if ($file_seq[-1]=~m/REMOVE IT PLEASE/) {
       pop @file_seq;
  }   }
   
   
         # 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<=$#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;   my %moreenv;
 ###            if (/\.(problem|exam|quiz|assess|survey|form|library)/) {   $moreenv{'form.grade_target'}='tex';
 ### my %moreenv;   &Apache::lonnet::appenv(%moreenv);
 ### $moreenv{'form.grade_target'}='tex';   my $texversion=&Apache::lonnet::ssi($urlp);
 ### &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::delenv('form.grade_target');
 ### my $texversion=&Apache::lonnet::ssi($urlp);   $result .= $texversion;        
 ### &Apache::lonnet::delenv('form.grade_target');      }
 ### $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/\/[^\/]+$//;

Removed from v.1.48  
changed lines
  Added in v.1.49


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