--- loncom/interface/printout.pl 2004/07/28 22:00:14 1.59
+++ loncom/interface/printout.pl 2004/08/04 18:19:11 1.62
@@ -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.62 2004/08/04 18:19:11 sakharuk 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=();
@@ -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); }
@@ -265,7 +268,11 @@ 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 @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
+ my $papera=$papers[$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 +287,12 @@ 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)"';
- &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);
+ my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
+ my $papera=$papers[$paper];
+ 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");
} else {
$ps_file=$new_name_file;
}
@@ -329,13 +338,16 @@ 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 @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
+ my $papera=$papers[$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 +357,28 @@ 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 @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)"';
&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
";
+ }
+ close(FFH);
+ }
&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);
@@ -403,7 +430,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 +440,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);