--- loncom/interface/printout.pl 2004/02/11 00:19:49 1.46 +++ loncom/interface/printout.pl 2004/02/18 23:33:17 1.51 @@ -1,7 +1,7 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # -# $Id: printout.pl,v 1.46 2004/02/11 00:19:49 albertel Exp $ +# $Id: printout.pl,v 1.51 2004/02/18 23:33:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,7 +32,11 @@ use LONCAPA::loncgi(); use File::Path; use IO::File; use Image::Magick; +use Apache::lonhtmlcommon; +use Apache::loncommon; +use Apache::lonlocal; +$|=1; my %origENV=%ENV; if (! &LONCAPA::loncgi::check_cookie_and_load_env()) { print <\n"; + &Apache::lonlocal::get_language_handle(); + &Apache::loncommon::content_type(undef,'text/html'); + my $bodytag=&Apache::loncommon::bodytag('Creating PDF','',''); + print $bodytag; my $identifier = $ENV{'QUERY_STRING'}; my $texfile = $ENV{'cgi.'.$identifier.'.file'}; @@ -59,10 +64,12 @@ END my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'}; my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'}; my $advans_role = $ENV{'cgi.'.$identifier.'role'}; - my $back_ref = $ENV{'cgi.'.$identifier.'backref'}; my $number_of_files = $ENV{'cgi.'.$identifier.'numberoffiles'}+1; my $student_names = $ENV{'cgi.'.$identifier.'studentnames'}; + my $backref = $ENV{'cgi.'.$identifier.'backref'}; + my $adv = $ENV{'request.role.adv'}; + my @names_pack=(); if ($student_names=~/_END_/) { @names_pack=split(/_ENDPERSON_/,$student_names); @@ -81,11 +88,12 @@ END my @content_of_file = <$temporary_file>; close $temporary_file; my $noteps; - &Create_StatWin ('Starting eps pictures creation', 'Pictires Status window'); + my %prog_state; + if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file); } foreach $not_eps (@content_of_file) { + chomp($not_eps); if ($not_eps ne '') { my $status_statement='EPS picture for '.$not_eps; - &Update_StaWin ($status_statement); $not_eps=~s|\/\.\/|\/|g; my $eps_f = $not_eps; $eps_f =~ s/\.[^.]*$/\.eps/i; @@ -105,6 +113,11 @@ END if ( exists($done_conversion{$not_eps})) { next; } + if ($adv) { + my $prettyname=$not_eps; + $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|; + $prettyname=~s|/home/httpd/html/|/|; + &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname); } $done_conversion{$not_eps}=1; $status = $image->Read($not_eps); if ($status) {print " $status ";} @@ -122,35 +135,48 @@ END } } } - &Close_StatWin(); + if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } } #print "$texfile\n"; #name of the tex file for debugging only my @texfile=($texfile); if ($number_of_files>1) { - for (my $i=1;$i<=$number_of_files-1;$i++) { + @texfile=(); + for (my $i=1;$i<=$number_of_files;$i++) { my $new_texfile=$texfile; - $new_texfile=~s/\.tex/_add$i\.tex/; + $new_texfile=~s/\.tex/_$i\.tex/; push @texfile,$new_texfile; } } + my $ind=-1; -&Create_StatWin ('Starting PDF production for students', 'PDF Status window'); +my %prog_state; +if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files); } +my $final_statement="Return to last resource.

Generated PDF File for:
"; foreach $texfile (@texfile) { - my $final_statement="Link to your PDF document: "; - my $status_statement='PDF document for '; - if ($number_of_files>1) { - $ind++; - my @stud_info=split(/_END_/,$names_pack[$ind]); - my @tempo_array=split(/:/,$stud_info[0]); - $final_statement='Link to PDF document for '.$tempo_array[3].' '; - $status_statement.=$tempo_array[3]; - if ($#stud_info>0) { - @tempo_array=split(/:/,$stud_info[-1]); - $final_statement.='- '.$tempo_array[3].': '; - $status_statement.=' - '.$tempo_array[3]; - } + my $status_statement=''; + my $link_text='download PDF'; + $ind++; + my @stud_info=split(/_END_/,$names_pack[$ind]); + my @tempo_array=split(/:/,$stud_info[0]); + my $name; + if ($tempo_array[3]) { + $name=$tempo_array[3]; + } else { + $name=$tempo_array[0].'@'.$tempo_array[1]; } -&Update_StaWin ($status_statement); + $link_text=''.$name.' '; + $status_statement.=$name; + if ($#stud_info>0) { + @tempo_array=split(/:/,$stud_info[-1]); + if ($tempo_array[3]) { + $name=$tempo_array[3]; + } else { + $name=$tempo_array[0].'@'.$tempo_array[1]; + } + $link_text.='- '.$name.': '; + $status_statement.=' - '.$name; + } + if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); } if (-e $texfile) { $texfile =~ m/^(.*)\/([^\/]+)$/; my $name_file = $2; @@ -292,6 +318,7 @@ foreach $texfile (@texfile) { system("$comma $name_file 1>/dev/null 2>/dev/null"); if (-e $new_name_file) { print "
$final_statement "; + $final_statement=''; $new_name_file =~ m/^(.*)\./; my $tempo_file = $1.'temporar.ps'; my $name_file = $1.'.pdf'; @@ -317,7 +344,7 @@ foreach $texfile (@texfile) { my @garb = ($texlog,$texaux,$texdvi,$texps); # unlink @garb; unlink $duefile; - print "Your PDF document"; + print "$link_text"; print "\n"; } } @@ -334,38 +361,13 @@ if ($number_of_files>1) { $file=~s/\.tex/.\pdf/; $statement.=' '.$file; } - system("$statement"); + print("
Zip Output:\n");
+    system($statement);
+    print("
"); $zipfile=~s/\/home\/httpd//; - print "
Your ZIP file is here"; -} -&Close_StatWin(); - - -sub Create_StatWin { - my ($title, $heading)=@_; - print('"); -} - -sub Update_StaWin { - my ($info)=@_; - print(''); -} - -sub Close_StatWin { - print(''."\n"); - + print "
A ZIP file of all the PDFs."; } +if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }