--- loncom/interface/printout.pl 2004/07/28 22:00:14 1.59
+++ loncom/interface/printout.pl 2004/09/09 15:30:49 1.69
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.59 2004/07/28 22:00:14 albertel Exp $
+# $Id: printout.pl,v 1.69 2004/09/09 15:30:49 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -60,6 +60,7 @@ END
my $texfile = $ENV{'cgi.'.$identifier.'.file'};
my $laystyle = $ENV{'cgi.'.$identifier.'.layout'};
my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'};
+ my $paper = $ENV{'cgi.'.$identifier.'.paper'};
my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'};
my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'};
my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'};
@@ -68,6 +69,7 @@ END
my $student_names = $ENV{'cgi.'.$identifier.'studentnames'};
my $backref = $ENV{'cgi.'.$identifier.'backref'};
+
my $adv = $ENV{'request.role.adv'};
my @names_pack=();
@@ -84,7 +86,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;
@@ -154,8 +156,9 @@ END
my $ind=-1;
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'); }
-my $final_statement="Return to last resource.
Generated PDF File for:
";
+print "
";
foreach $texfile (@texfile) {
my $status_statement='';
my $link_text='download PDF';
@@ -168,7 +171,7 @@ foreach $texfile (@texfile) {
} else {
$name=$tempo_array[0].'@'.$tempo_array[1];
}
- $link_text=''.$name.' ';
+ $link_text=''.$name.'';
$status_statement.=$name;
if ($#stud_info>0) {
@tempo_array=split(/:/,$stud_info[-1]);
@@ -177,7 +180,7 @@ foreach $texfile (@texfile) {
} else {
$name=$tempo_array[0].'@'.$tempo_array[1];
}
- $link_text.='- '.$name.': ';
+ $link_text.=' - '.$name.'';
$status_statement.=' - '.$name;
}
if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
@@ -191,18 +194,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);
@@ -237,7 +245,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);
@@ -265,7 +273,10 @@ foreach $texfile (@texfile) {
$name_file =~ s/\.tex/\.dvi/;
my $new_name_file = $name_file;
$new_name_file =~ s/\.dvi/\.ps/;
- my $comma = "dvips -Ppdf -G0 -o $new_name_file";
+ my $papera=$paper;
+ if ($papera eq 'letter') {$papera='';}
+ if ($papera ne '') {$papera='-t'.$papera;}
+ my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
&busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
@@ -280,10 +291,14 @@ foreach $texfile (@texfile) {
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
} elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
- $comma = 'pstops -pletter "2:0+1(0.48w,0)"';
+ my $papera=$paper;
+ if ($papera eq 'letter') {$papera='';}
+ if ($papera ne '') {$papera='-p'.$papera;}
+ $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;
}
@@ -310,7 +325,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);
@@ -329,13 +344,15 @@ foreach $texfile (@texfile) {
$name_file =~ s/\.tex/\.dvi/;
my $new_name_file = $name_file;
$new_name_file =~ s/\.dvi/\.ps/;
- my $comma = "dvips -Ppdf -G0 -o $new_name_file";
+ my $papera=$paper;
+ if ($papera eq 'letter') {$papera='';}
+ if ($papera ne '') {$papera='-t'.$papera;}
+ my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
&busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
if (-e $new_name_file) {
- print "
$final_statement ";
- $final_statement='';
+ print "
";
$new_name_file =~ m/^(.*)\./;
my $ps_file = my $tempo_file = $1.'temporar.ps';
my $pdf_file = $1.'.pdf';
@@ -345,13 +362,35 @@ foreach $texfile (@texfile) {
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
} elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
- $comma = 'pstops -pletter "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;
}
+ 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(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",
\%prog_state,$pdf_file);
@@ -367,10 +406,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";
}
@@ -403,7 +442,9 @@ sub busy_wait_command {
$SIG{CHLD} = \&REAPER;
$done=0;
my $pid=open(CMD,"$command |");
- &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message);
+ if ($adv) {
+ &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message);
+ }
while(!$done) {
sleep 1;
my $extra_msg;
@@ -411,8 +452,10 @@ sub busy_wait_command {
my $size=(stat($output_file))[7];
$extra_msg=", $size bytes generated";
}
- &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
- $message.$extra_msg);
+ if ($adv) {
+ &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
+ $message.$extra_msg);
+ }
}
$SIG{CHLD}='IGNORE';
close(CMD);