Diff for /loncom/interface/printout.pl between versions 1.38 and 1.42

version 1.38, 2003/10/16 15:30:43 version 1.42, 2004/02/03 00:02:15
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   use lib '/home/httpd/lib/perl';
   use LONCAPA::loncgi();
 use File::Path;  use File::Path;
 use IO::File;  use IO::File;
 use Image::Magick;  use Image::Magick;
   
   if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
       print <<END;
   Content-type: text/html
   
   <html>
   <head><title>Bad Cookie</title></head>
   <body>
   Your cookie information is incorrect.
   </body>
   </html>
   END
       return;
   }
   
  print "Content-type: text/html\n\n";   print "Content-type: text/html\n\n";
  print "<body bgcolor=\"#FFFFFF\">\n";   print "<body bgcolor=\"#FFFFFF\">\n";
   my ($texfile,$laystyle,$numberofcolumns,$selectionmade) = split(/&/,$ENV{'QUERY_STRING'});  
   my $advans_role=0;    my $identifier = $ENV{'QUERY_STRING'};
   if ($selectionmade>=10000) {$selectionmade=$selectionmade/10000; $advans_role=1;}    my $texfile = $ENV{'cgi.'.$identifier.'.file'};
     my $laystyle = $ENV{'cgi.'.$identifier.'.layout'};
     my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'};
     my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'};
     my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'};
     my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'};
     my $advans_role = $ENV{'cgi.'.$identifier.'role'};
   
   my $figfile = $texfile;    my $figfile = $texfile;
   $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/;    $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/;
   my $duefile = $texfile;    my $duefile = $texfile;
   $duefile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.due/;    $duefile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.due/;
   #do we have figures?    #do we have figures?
   if (-e $figfile) {    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 file for reading: $!\n";
       my @content_of_file = <$temporary_file>;        my @content_of_file = <$temporary_file>;
       close $temporary_file;          close $temporary_file;  
       my $noteps;        my $noteps;
       foreach $not_eps (@content_of_file) {        foreach $not_eps (@content_of_file) {
   if ($not_eps ne '') {    if ($not_eps ne '') {
         $not_eps=~s|\/\.\/|\/|g;
       my $eps_f = $not_eps;        my $eps_f = $not_eps;
       $eps_f =~ s/\.[^.]*$/\.eps/i;        $eps_f =~ s/\.[^.]*$/\.eps/i;
       $_ = $eps_f;        if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
       m/\/home\/httpd\/html\/res\/(.+)/;                    $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
       $eps_f = '/home/httpd/prtspool/'.$1;    $eps_f = '/home/httpd/prtspool/'.$eps_f;
         } else {
     $eps_f=~m/\/home\/httpd\/html\/res\/(.+)/;
     $eps_f = '/home/httpd/prtspool/'.$1;
         }
       my $path=$eps_f;        my $path=$eps_f;
       $path=~s/\/([^\/]+)\.eps$//;         $path=~s/\/([^\/]+)\.eps$//;
       File::Path::mkpath($path,0,0777);        File::Path::mkpath($path,0,0777);
       my $image = Image::Magick->new;        my $image = Image::Magick->new;
       $not_eps =~ s/^\s+//;        $not_eps =~ s/^\s+//;
       $not_eps =~ s/\s+$//;        $not_eps =~ s/\s+$//;
         if ( exists($done_conversion{$not_eps})) {
     next;
         }
         $done_conversion{$not_eps}=1;
       $status = $image->Read($not_eps);        $status = $image->Read($not_eps);
       if ($status) {print "  $status  ";}        if ($status) {print "  $status  ";}
       $image->Set(page => '+100+200');         $image->Set(page => '+100+200'); 
Line 81  use Image::Magick; Line 115  use Image::Magick;
       my $path_file = $1.'/';        my $path_file = $1.'/';
       chdir $path_file;        chdir $path_file;
       system("latex $name_file 1>/dev/null 2>/dev/null");        system("latex $name_file 1>/dev/null 2>/dev/null");
       if ($selectionmade>=10) {system("latex $name_file 1>/dev/null 2>/dev/null");} #to create table of contents        if ($tableofcontents eq 'yes') {
     system("latex $name_file 1>/dev/null 2>/dev/null");
         } #to create table of contents
       my $idxname=$name_file;        my $idxname=$name_file;
       $idxname=~s/\.tex$/\.idx/;        $idxname=~s/\.tex$/\.idx/;
       if ($selectionmade>=100) {        if ($tableofindex eq 'yes') {
   system("makeindex $idxname");    system("makeindex $idxname");
   system("latex $name_file 1>/dev/null 2>/dev/null");    system("latex $name_file 1>/dev/null 2>/dev/null");
       } #to create index        } #to create index

Removed from v.1.38  
changed lines
  Added in v.1.42


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