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

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

version 1.72, 2005/02/03 21:37:48 version 1.75, 2005/03/23 22:37:46
Line 65  END Line 65  END
   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'};
   my $advans_role = $ENV{'cgi.'.$identifier.'role'};    my $advanced_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 = &Apache::lonnet::unescape($ENV{'cgi.'.$identifier.'backref'});    my $backref = &Apache::lonnet::unescape($ENV{'cgi.'.$identifier.'backref'});
Line 85  END Line 85  END
   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?
     # print "Figure file: $figfile\n";
   if (-e $figfile) {    if (-e $figfile) {
         # print "$figfile exists\n";
       my %done_conversion;        my %done_conversion;
       my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile 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>;        my @content_of_file = <$temporary_file>;
Line 96  END Line 98  END
       foreach my $not_eps (@content_of_file) {        foreach my $not_eps (@content_of_file) {
   chomp($not_eps);    chomp($not_eps);
   if ($not_eps ne '') {    if ($not_eps ne '') {
         # print "Converting $not_eps"; # Debugging.
               my $status_statement='EPS picture for '.$not_eps;                my $status_statement='EPS picture for '.$not_eps;
         # print "$status_statement\n";
       $not_eps=~s|\/\.\/|\/|g;        $not_eps=~s|\/\.\/|\/|g;
       my $eps_f = $not_eps;        my $eps_f = $not_eps;
       $eps_f =~ s/\.[^.]*$/\.eps/i;        $eps_f =~ s/\.[^.]*$/\.eps/i;
Line 110  END Line 114  END
   $eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/;    $eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/;
   $eps_f = '/home/httpd/prtspool/'.$1.'/'.$2;    $eps_f = '/home/httpd/prtspool/'.$1.'/'.$2;
       }        }
         $eps_f  =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX.
       my $path=$eps_f;        my $path=$eps_f;
       $path=~s/\/([^\/]+)\.eps$//;        $path =~ s/\/([^\/]+)\.eps$//;
         # print "Final file path: $path "; # Debugging
       File::Path::mkpath($path,0,0777);        File::Path::mkpath($path,0,0777);
       $not_eps =~ s/^\s+//;        $not_eps =~ s/^\s+//;
       $not_eps =~ s/\s+$//;        $not_eps =~ s/\s+$//;
         $not_eps =~ s/ /\\ /g;
       if ( exists($done_conversion{$not_eps})) { next; }        if ( exists($done_conversion{$not_eps})) { next; }
       if ($adv) {        if ($adv) {
   my $prettyname=$not_eps;    my $prettyname=$not_eps;
Line 123  END Line 130  END
   &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;
         # print "Converting $not_eps -> $eps_f"; # Debugging
       system("convert $not_eps $eps_f");        system("convert $not_eps $eps_f");
               #check is eps exist in prtspool                #check is eps exist in prtspool
               if(not -e $eps_f) {                if(not -e $eps_f) {
Line 135  END Line 143  END
       }          }  
   }    }
       }        }
       if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }        if ($adv) { 
     &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); 
         }
       unlink($figfile);        unlink($figfile);
   }    }
   #print "$texfile\n"; #name of the tex file for debugging only       #print "$texfile\n"; #name of the tex file for debugging only   
Line 235  foreach $texfile (@texfile) { Line 245  foreach $texfile (@texfile) {
       }          }  
   }    }
   print "</pre>\n";    print "</pre>\n";
           if ($advans_role) {              if ($advanced_role) {  
               print "<b><big>The link to ";                print "<b><big>The link to ";
               $logfilename=~s/\/home\/httpd//;                $logfilename=~s/\/home\/httpd//;
       print "<a href=\"$logfilename\">Your log file </a></big></b>";        print "<a href=\"$logfilename\">Your log file </a></big></b>";
Line 314  foreach $texfile (@texfile) { Line 324  foreach $texfile (@texfile) {
 #  unlink @garb;  #  unlink @garb;
       unlink $duefile;        unlink $duefile;
       print "<a href=\"/prtspool/$pdf_file\">Your PDF document</a>";        print "<a href=\"/prtspool/$pdf_file\">Your PDF document</a>";
       if ($advans_role) {      }
   print "<br /><br />";    if ($advanced_role) {  
   print "<b><big>The link to ";        print "<br /><br />";
   $logfilename=~s/\/home\/httpd//;        print "<b><big>The link to ";
   print "<a href=\"$logfilename\">Your log file </a></big></b>";        $logfilename=~s/\/home\/httpd//;
   print "\n";        print "<a href=\"$logfilename\">Your log file </a></big></b>";
   #link tooriginal LaTeX file (included according Michael Hamlin desire)        print "\n";
   my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";        #link tooriginal LaTeX file (included according Michael Hamlin desire)
   my @tex_content_of_file = <$tex_temporary_file>;        my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
   close $tex_temporary_file;         my @tex_content_of_file = <$tex_temporary_file>;
   my $body_tex_file = join(' ',@tex_content_of_file);        close $tex_temporary_file; 
   $texfile =~ s/\.tex$/aaaaa\.html/;        my $body_tex_file = join(' ',@tex_content_of_file);
   $tex_temporary_file = IO::File->new('>'.$texfile);         $texfile =~ s/\.tex$/aaaaa\.html/;
   print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";        $tex_temporary_file = IO::File->new('>'.$texfile); 
   print "<br /><br />";        print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";
   print "<b><big>The link to ";        print "<br /><br />";
   $texfile=~s/\/home\/httpd//;        print "<b><big>The link to ";
   print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";        $texfile=~s/\/home\/httpd//;
   print "\n";        print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
       }        print "\n";
   }    }
       } else {        } else {
   #LaTeX successfully parsed tex file     #LaTeX successfully parsed tex file 
Removed from v.1.72  
changed lines
  Added in v.1.75

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