[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.47

version 1.46, 2002/08/02 18:27:04 version 1.47, 2002/08/05 19:18:43
Line 167  ENDPART Line 167  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 195  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?          # do we have any other sequence inside?
  my $i=0;  # $result.=$#file_seq.'   ';
    my $i=1;
  while ($i<=$#file_seq) {   while ($i<=$#file_seq) {
     $_ = $file_seq[$i];  #    $result.='      '.$file_seq[$i].'    ';
     if (/\.sequence$/) {      $file_seq[$i]=~s/^"//;
       $file_seq[$i]=~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 .= '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++) {
   #    $result .= ' SDSD '.$add_file_seq[$iu].' FDFD   ';
   # }
   #
   
   
  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 
  }   }
  @master_seq = @file_seq;   @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];
Line 307  ENDPART Line 323  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/ (<|>|) / \$$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.47

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