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

Diff for /loncom/interface/printout.pl between versions 1.70 and 1.72

version 1.70, 2004/11/13 08:25:41 version 1.72, 2005/02/03 21:37:48
Line 32  use File::Path; Line 32  use File::Path;
 use IO::File;  use IO::File;
 use Image::Magick;  use Image::Magick;
 use Apache::lonhtmlcommon;  use Apache::lonhtmlcommon;
   use Apache::lonnet();
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
   
Line 67  END Line 68  END
   my $advans_role = $ENV{'cgi.'.$identifier.'role'};    my $advans_role = $ENV{'cgi.'.$identifier.'role'};
   my $number_of_files = $ENV{'cgi.'.$identifier.'numberoffiles'}+1;    my $number_of_files = $ENV{'cgi.'.$identifier.'numberoffiles'}+1;
   my $student_names = $ENV{'cgi.'.$identifier.'studentnames'};    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'};    my $adv = $ENV{'request.role.adv'};
Line 112  END Line 113  END
       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;  
       $not_eps =~ s/^\s+//;        $not_eps =~ s/^\s+//;
       $not_eps =~ s/\s+$//;        $not_eps =~ s/\s+$//;
       if ( exists($done_conversion{$not_eps})) {        if ( exists($done_conversion{$not_eps})) { next; }
   next;  
       }  
       if ($adv) {        if ($adv) {
   my $prettyname=$not_eps;    my $prettyname=$not_eps;
   $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;    $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
   $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;    $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;        $done_conversion{$not_eps}=1;
       my $status = $image->Read($not_eps);        system("convert $not_eps $eps_f");
       if ($status) {print "  $status  ";}  
       $image->Set(page => '+100+200');   
       $status = $image->Write($eps_f);      
       if ($status) {print "  $status  ";}  
               #check is eps exist in prtspool                #check is eps exist in prtspool
               if(not -e $eps_f) {                if(not -e $eps_f) {
   for (my $i=0;$i<10000;$i++) {    for (my $i=0;$i<10000;$i++) {
Removed from v.1.70  
changed lines
  Added in v.1.72

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