--- loncom/interface/printout.pl 2005/07/25 10:43:29 1.87 +++ loncom/interface/printout.pl 2005/08/03 10:34:03 1.88 @@ -28,6 +28,7 @@ use lib '/home/httpd/lib/perl'; use LONCAPA::loncgi; use File::Path; +use File::Basename; use IO::File; use Image::Magick; use Apache::lonhtmlcommon; @@ -273,6 +274,7 @@ my %prog_state; print "Return to last resource.

"; if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); } print "
"; +my $num_files = @texfile; foreach $texfile (@texfile) { my $status_statement=''; my $link_text='download PDF'; @@ -280,30 +282,57 @@ foreach $texfile (@texfile) { my @stud_info=split(/_END_/,$names_pack[$ind]); my @tempo_array=split(/:/,$stud_info[0]); my $name; + my $name_range=''; if ($tempo_array[3]) { $name=$tempo_array[3]; + my @full_names = split(/,/,$name); # split last name from others... + $name_range = $full_names[0]; } else { $name=$tempo_array[0].'@'.$tempo_array[1]; + $name_range = $tempo_array[0]; + } + if (($name ne "") && ($name ne '@') ) { # Could be printing codes... + $link_text=''.$name.''; + $status_statement.=$name; } - $link_text=''.$name.''; - $status_statement.=$name; if ($#stud_info>0) { @tempo_array=split(/:/,$stud_info[-1]); if ($tempo_array[3]) { $name=$tempo_array[3]; + my @full_names = split(/,/, $name); + $name_range .= "-".$full_names[0]; } else { $name=$tempo_array[0].'@'.$tempo_array[1]; + $name_range .= '-'.$tempo_array[0]; + } + if (($name ne "") && ($name ne '@')) { + $link_text.=' - '.$name.''; + $status_statement.=' - '.$name; + } - $link_text.=' - '.$name.''; - $status_statement.=' - '.$name; - } + } + if(($num_files > 1) && ($link_text eq 'download PDF')) { # Printing codes + $link_text = ''.basename($texfile,'.tex').'.pdf'; + $status_statement .= basename($texfile); + } + $name_range =~ s/'//g; # O'Neil -> ONeil e.g. + print "
"; 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 (($name_range ne '') && ($num_files > 1)) { + my $newtexfile = $texfile; + $newtexfile =~ s/\.tex/$name_range\.tex/; + rename($texfile, $newtexfile); + $texfile = $newtexfile; + } $texfile =~ m/^(.*)\/([^\/]+)$/; my $name_file = $2; my $path_file = $1.'/'; 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", "for $status_statement now LaTeXing file", \%prog_state,$dvi_file);