[BACK]Return to printout.pl CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/printout.pl between versions 1.61.2.1 and 1.62

version 1.61.2.1, 2004/09/09 20:41:04 version 1.62, 2004/08/04 18:19:11
Line 60  END Line 60  END
   my $texfile = $ENV{'cgi.'.$identifier.'.file'};    my $texfile = $ENV{'cgi.'.$identifier.'.file'};
   my $laystyle = $ENV{'cgi.'.$identifier.'.layout'};    my $laystyle = $ENV{'cgi.'.$identifier.'.layout'};
   my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'};    my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'};
     my $paper = $ENV{'cgi.'.$identifier.'.paper'};
   my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'};    my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'};
   my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'};    my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'};
   my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'};    my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'};
Line 68  END Line 69  END
   my $student_names = $ENV{'cgi.'.$identifier.'studentnames'};    my $student_names = $ENV{'cgi.'.$identifier.'studentnames'};
   my $backref = $ENV{'cgi.'.$identifier.'backref'};    my $backref = $ENV{'cgi.'.$identifier.'backref'};
   
   
   my $adv = $ENV{'request.role.adv'};    my $adv = $ENV{'request.role.adv'};
       
   my @names_pack=();    my @names_pack=();
Line 266  foreach $texfile (@texfile) { Line 268  foreach $texfile (@texfile) {
   $name_file =~ s/\.tex/\.dvi/;    $name_file =~ s/\.tex/\.dvi/;
   my $new_name_file = $name_file;    my $new_name_file = $name_file;
   $new_name_file =~ s/\.dvi/\.ps/;    $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",    &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
      "for $status_statement now Converting to PS",       "for $status_statement now Converting to PS",
      \%prog_state,$new_name_file);       \%prog_state,$new_name_file);
Line 281  foreach $texfile (@texfile) { Line 287  foreach $texfile (@texfile) {
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);        \%prog_state,$tempo_file); 
       } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {        } 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','');
   &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",                    my $papera=$papers[$paper];
      "for $status_statement now Modifying PS layout",    if ($papera ne '') {$papera='-p'.$papera;}
      \%prog_state,$tempo_file);     $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 {        } else {
   $ps_file=$new_name_file;    $ps_file=$new_name_file;
       }            }    
Line 330  foreach $texfile (@texfile) { Line 338  foreach $texfile (@texfile) {
   $name_file =~ s/\.tex/\.dvi/;    $name_file =~ s/\.tex/\.dvi/;
   my $new_name_file = $name_file;    my $new_name_file = $name_file;
   $new_name_file =~ s/\.dvi/\.ps/;    $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",    &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
      "for $status_statement now Converting to PS",       "for $status_statement now Converting to PS",
      \%prog_state,$new_name_file);       \%prog_state,$new_name_file);
Line 345  foreach $texfile (@texfile) { Line 357  foreach $texfile (@texfile) {
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);       \%prog_state,$tempo_file);
       } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {        } 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",    &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);        \%prog_state,$tempo_file); 
       } else {        } else {
   $ps_file=$new_name_file;    $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 = <FFH>;
     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 "<br>$i<br>";
     }
     close(FFH);    
         }
       &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null",        &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null",
  "for $status_statement now Converting PS to PDF",   "for $status_statement now Converting PS to PDF",
  \%prog_state,$pdf_file);   \%prog_state,$pdf_file);
Line 367  foreach $texfile (@texfile) { Line 394  foreach $texfile (@texfile) {
       my @garb = ($texlog,$texaux,$texdvi,$texps);        my @garb = ($texlog,$texaux,$texdvi,$texps);
 #  unlink @garb;  #  unlink @garb;
       unlink $duefile;        unlink $duefile;
       print "<a href=\"/prtspool/$pdf_file\">$link_text - click here to download pdf</a>";        print "<a href=\"/prtspool/$pdf_file\">$link_text</a>";
       print "\n";        print "\n";
   }    }
       }        }
Removed from v.1.61.2.1  
changed lines
  Added in v.1.62

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>