--- loncom/interface/printout.pl 2004/08/04 18:19:11 1.62 +++ loncom/interface/printout.pl 2005/02/03 21:37:48 1.72 @@ -1,7 +1,7 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # -# $Id: printout.pl,v 1.62 2004/08/04 18:19:11 sakharuk Exp $ +# $Id: printout.pl,v 1.72 2005/02/03 21:37:48 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,6 +32,7 @@ use File::Path; use IO::File; use Image::Magick; use Apache::lonhtmlcommon; +use Apache::lonnet(); use Apache::loncommon; use Apache::lonlocal; @@ -67,7 +68,7 @@ END my $advans_role = $ENV{'cgi.'.$identifier.'role'}; my $number_of_files = $ENV{'cgi.'.$identifier.'numberoffiles'}+1; my $student_names = $ENV{'cgi.'.$identifier.'studentnames'}; - my $backref = $ENV{'cgi.'.$identifier.'backref'}; + my $backref = &Apache::lonnet::unescape($ENV{'cgi.'.$identifier.'backref'}); my $adv = $ENV{'request.role.adv'}; @@ -86,7 +87,7 @@ END #do we have figures? if (-e $figfile) { my %done_conversion; - my $temporary_file=IO::File->new($figfile) || die "Couldn't open file for reading: $!\n"; + my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n"; my @content_of_file = <$temporary_file>; close $temporary_file; my $noteps; @@ -112,23 +113,17 @@ END my $path=$eps_f; $path=~s/\/([^\/]+)\.eps$//; File::Path::mkpath($path,0,0777); - my $image = Image::Magick->new; $not_eps =~ s/^\s+//; $not_eps =~ s/\s+$//; - if ( exists($done_conversion{$not_eps})) { - next; - } + if ( exists($done_conversion{$not_eps})) { next; } if ($adv) { my $prettyname=$not_eps; $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|; $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|; - &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname); } + &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname); + } $done_conversion{$not_eps}=1; - my $status = $image->Read($not_eps); - if ($status) {print " $status ";} - $image->Set(page => '+100+200'); - $status = $image->Write($eps_f); - if ($status) {print " $status ";} + system("convert $not_eps $eps_f"); #check is eps exist in prtspool if(not -e $eps_f) { for (my $i=0;$i<10000;$i++) { @@ -194,18 +189,23 @@ foreach $texfile (@texfile) { "for $status_statement now LaTeXing file", \%prog_state,$dvi_file); if ($tableofcontents eq 'yes') { - system("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 table of contents", + \%prog_state,$dvi_file); } #to create table of contents my $idxname=$name_file; $idxname=~s/\.tex$/\.idx/; if ($tableofindex eq 'yes') { - system("makeindex $idxname"); - system("latex $name_file 1>/dev/null 2>/dev/null"); + &busy_wait_command("makeindex $idxname", + "making index file", + \%prog_state,$idxname); + &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null", + "for $status_statement now LaTeXing file for index section", + \%prog_state,$dvi_file); } #to create index #Do we have a latex error in the log file? - my $logfilename = $texfile; - $logfilename =~ s/\.tex$/\.log/; - my $temporary_file=IO::File->new($logfilename) || die "Couldn't open file for reading: $!\n"; + my $logfilename = $texfile; $logfilename =~ s/\.tex$/\.log/; + my $temporary_file=IO::File->new($logfilename) || die "Couldn't open log file $logfilename for reading: $!\n"; my @content_of_file = <$temporary_file>; close $temporary_file; my $body_log_file = join(' ',@content_of_file); @@ -221,7 +221,7 @@ foreach $texfile (@texfile) { if ($whereitbegins!=-1 and $whereitends!=-1) { print "With very high probability this error occured in ".substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26)."

"; } - print "Here are the error messages in the LaTeX log file

"; + print "Here are the error messages in the LaTeX log file

";
 	  my $sygnal = 0;
 	  for (my $i=0;$i<=$#content_of_file;$i++) {
 	      if ($content_of_file[$i]=~m/^Runaway argument?/ or $content_of_file[$i]=~m/^!/) {
@@ -231,16 +231,17 @@ foreach $texfile (@texfile) {
 		  $sygnal = 0;
 	      } 
 	      if ($sygnal) {
-		  print "$content_of_file[$i]
";
+		  print "$content_of_file[$i]";
 	      }  
 	  }
+	  print "
\n"; if ($advans_role) { print "The link to "; $logfilename=~s/\/home\/httpd//; print "Your log file "; print "\n"; #link tooriginal LaTeX file (included according Michael Hamlin desire) - my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open file for reading: $!\n"; + my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n"; my @tex_content_of_file = <$tex_temporary_file>; close $tex_temporary_file; my $body_tex_file = join(' ',@tex_content_of_file); @@ -268,8 +269,7 @@ foreach $texfile (@texfile) { $name_file =~ s/\.tex/\.dvi/; my $new_name_file = $name_file; $new_name_file =~ s/\.dvi/\.ps/; - my @papers=('letter','legal','tabloid','executive','','a3','a4','a5',''); - my $papera=$papers[$paper]; + my $papera=$paper; if ($papera eq 'letter') {$papera='';} if ($papera ne '') {$papera='-t'.$papera;} my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file"; @@ -287,12 +287,14 @@ foreach $texfile (@texfile) { "for $status_statement now Modifying PS layout", \%prog_state,$tempo_file); } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') { - my @papers=('letter','legal','tabloid','executive','','a3','a4','a5',''); - my $papera=$papers[$paper]; + my $papera=$paper; + if ($papera eq 'letter') {$papera='';} if ($papera ne '') {$papera='-p'.$papera;} $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"'; - system("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null"); - system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null"); + &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null", + "for $status_statement now Modifying PS layout", + \%prog_state,$tempo_file); + } else { $ps_file=$new_name_file; } @@ -319,7 +321,7 @@ foreach $texfile (@texfile) { print "Your log file "; print "\n"; #link tooriginal LaTeX file (included according Michael Hamlin desire) - my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open file for reading: $!\n"; + my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n"; my @tex_content_of_file = <$tex_temporary_file>; close $tex_temporary_file; my $body_tex_file = join(' ',@tex_content_of_file); @@ -338,8 +340,7 @@ foreach $texfile (@texfile) { $name_file =~ s/\.tex/\.dvi/; my $new_name_file = $name_file; $new_name_file =~ s/\.dvi/\.ps/; - my @papers=('letter','legal','tabloid','executive','','a3','a4','a5',''); - my $papera=$papers[$paper]; + my $papera=$paper; if ($papera eq 'letter') {$papera='';} if ($papera ne '') {$papera='-t'.$papera;} my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file"; @@ -357,27 +358,34 @@ foreach $texfile (@texfile) { "for $status_statement now Modifying PS layout", \%prog_state,$tempo_file); } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') { - my @papers=('letter','legal','tabloid','executive','','a3','a4','a5',''); - my $papera=$papers[$paper]; - if ($papera ne '') {$papera='-p'.$papera;} - $comma = 'pstops -pa4 "2:0+1(0.48w,0)"'; + $papera=~s/t/p/; + $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"'; &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null", "for $status_statement now Modifying PS layout", \%prog_state,$tempo_file); } else { $ps_file=$new_name_file; } - if ($paper eq '6') { - open(FFH,'<',$ps_file) || die "Couldn't open file for reading: $!\n"; - my @content_of_file = ; - close(FFH); - open(FFH,'>',$ps_file) || die "Couldn't open file for writing: $!\n"; - print FFH '<< /PageSize [595.2 842] >> setpagedevice'."\n"; - for (my $i=0;$i<=$#content_of_file;$i++) { - print FFH $content_of_file[$i]; - print "
$i
"; + my $addtoPSfile={'legal'=>'<< /PageSize [612 1008] >> setpagedevice', + 'tabloid'=>'<< /PageSize [792 1224] >> setpagedevice', + 'executive'=>,'<< /PageSize [540 720] >> setpagedevice', + 'a2'=>'<< /PageSize [1195.02 1690.09] >> setpagedevice', + 'a3'=>'<< /PageSize [842 1195.02] >> setpagedevice', + 'a4'=>'<< /PageSize [595.2 842] >> setpagedevice', + 'a5'=>'<< /PageSize [421.1 595.2] >> setpagedevice', + 'a6'=>'<< /PageSize [298.75 421.1] >> setpagedevice', + }; + if ($paper ne 'letter') { + open(FFH,'<',$ps_file) || die "Couldn't open ps file $ps_file for reading: $!\n"; + my $new_ps_file='new'.$ps_file; + open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n"; + print FFHS $addtoPSfile->{$paper}."\n"; + while () { + print FFHS $_; } - close(FFH); + close(FFH); + close(FFHS); + $ps_file=$new_ps_file; } &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null", "for $status_statement now Converting PS to PDF", @@ -394,10 +402,10 @@ foreach $texfile (@texfile) { my @garb = ($texlog,$texaux,$texdvi,$texps); # unlink @garb; unlink $duefile; - print "$link_text"; + print "$link_text - click here to download pdf"; print "\n"; } - } + } } else { print "LaTeX file $texfile was not created successfully"; }