Diff for /loncom/interface/printout.pl between versions 1.87 and 1.88

version 1.87, 2005/07/25 10:43:29 version 1.88, 2005/08/03 10:34:03
Line 28 Line 28
 use lib '/home/httpd/lib/perl';  use lib '/home/httpd/lib/perl';
 use LONCAPA::loncgi;  use LONCAPA::loncgi;
 use File::Path;  use File::Path;
   use File::Basename;
 use IO::File;  use IO::File;
 use Image::Magick;  use Image::Magick;
 use Apache::lonhtmlcommon;  use Apache::lonhtmlcommon;
Line 273  my %prog_state; Line 274  my %prog_state;
 print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";  print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
 if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }  if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
 print "<br />";  print "<br />";
   my $num_files = @texfile;
 foreach $texfile (@texfile) {  foreach $texfile (@texfile) {
   my $status_statement='';    my $status_statement='';
   my $link_text='download PDF';    my $link_text='download PDF';
Line 280  foreach $texfile (@texfile) { Line 282  foreach $texfile (@texfile) {
   my @stud_info=split(/_END_/,$names_pack[$ind]);    my @stud_info=split(/_END_/,$names_pack[$ind]);
   my @tempo_array=split(/:/,$stud_info[0]);    my @tempo_array=split(/:/,$stud_info[0]);
   my $name;    my $name;
     my $name_range='';
   if ($tempo_array[3]) {    if ($tempo_array[3]) {
       $name=$tempo_array[3];        $name=$tempo_array[3];
         my @full_names = split(/,/,$name); # split last name from others...
         $name_range = $full_names[0];
   } else {    } else {
       $name=$tempo_array[0].'@'.$tempo_array[1];        $name=$tempo_array[0].'@'.$tempo_array[1];
         $name_range = $tempo_array[0];
     }
     if (($name ne "") && ($name ne '@') ) { # Could be printing codes...
         $link_text='<b>'.$name.'</b>';
         $status_statement.=$name;
   }    }
   $link_text='<b>'.$name.'</b>';  
   $status_statement.=$name;  
   if ($#stud_info>0) {    if ($#stud_info>0) {
       @tempo_array=split(/:/,$stud_info[-1]);        @tempo_array=split(/:/,$stud_info[-1]);
       if ($tempo_array[3]) {        if ($tempo_array[3]) {
   $name=$tempo_array[3];    $name=$tempo_array[3];
     my @full_names = split(/,/, $name);
     $name_range .= "-".$full_names[0];
       } else {        } else {
   $name=$tempo_array[0].'@'.$tempo_array[1];    $name=$tempo_array[0].'@'.$tempo_array[1];
     $name_range .= '-'.$tempo_array[0];
         }
         if (($name ne "") && ($name ne '@')) {
     $link_text.=' - <b>'.$name.'</b>';
     $status_statement.=' -  '.$name;
     
       }        }
       $link_text.=' - <b>'.$name.'</b>';    }
       $status_statement.=' -  '.$name;    if(($num_files > 1) && ($link_text eq 'download PDF')) { # Printing codes
   }         $link_text = '<b>'.basename($texfile,'.tex').'.pdf</b>';
         $status_statement .= basename($texfile);
     }
     $name_range =~ s/'//g; # O'Neil -> ONeil e.g.
     print "<br/>";
   if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }    if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
     #  This little piece of dirt puts username ranges into the original tex
     #  Tex filename from which they'll propagate into the other filenames as well.
     #
   if (-e $texfile) {    if (-e $texfile) {
         if (($name_range ne '') && ($num_files > 1)) {
     my $newtexfile = $texfile;
     $newtexfile    =~ s/\.tex/$name_range\.tex/;
     rename($texfile, $newtexfile);
     $texfile       = $newtexfile;
         }
       $texfile =~ m/^(.*)\/([^\/]+)$/;         $texfile =~ m/^(.*)\/([^\/]+)$/; 
       my $name_file = $2;        my $name_file = $2;
       my $path_file = $1.'/';        my $path_file = $1.'/';
       chdir $path_file;        chdir $path_file;
       my $dvi_file= $name_file; $dvi_file =~ s/\.tex/\.dvi/;        my $dvi_file= $name_file; $dvi_file =~ s/\.tex/$name_range\.dvi/;
       &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",        &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
  "for $status_statement now LaTeXing file",   "for $status_statement now LaTeXing file",
  \%prog_state,$dvi_file);   \%prog_state,$dvi_file);

Removed from v.1.87  
changed lines
  Added in v.1.88


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