version 1.107, 2006/06/30 01:24:41
|
version 1.111, 2006/10/30 11:40:49
|
Line 29 use lib '/home/httpd/lib/perl';
|
Line 29 use lib '/home/httpd/lib/perl';
|
use LONCAPA::loncgi; |
use LONCAPA::loncgi; |
use File::Path; |
use File::Path; |
use File::Basename; |
use File::Basename; |
|
use File::Copy; |
use IO::File; |
use IO::File; |
use Image::Magick; |
use Image::Magick; |
use Apache::lonhtmlcommon(); |
use Apache::lonhtmlcommon(); |
Line 210 print "<a href=\"$backref\"><b>Return</b
|
Line 211 print "<a href=\"$backref\"><b>Return</b
|
$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; |
$eps_f .= '.eps'; # Just append the eps ext. |
|
if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) { |
if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) { |
$eps_f=~s/\/home\/([^\/]+)\/public_html/$1/; |
$eps_f=~s/\/home\/([^\/]+)\/public_html/$1/; |
$eps_f = '/home/httpd/prtspool/'.$eps_f; |
$eps_f = '/home/httpd/prtspool/'.$eps_f; |
Line 222 print "<a href=\"$backref\"><b>Return</b
|
Line 222 print "<a href=\"$backref\"><b>Return</b
|
$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. |
$eps_f =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX. |
my $path=$eps_f; |
# |
$path =~ s/\/([^\/]+)\.eps$//; |
# If the file is already an .eps or .ps file, |
# print "Final file path: $path "; # Debugging |
# We really just need to copy it from where it was to prtspool |
File::Path::mkpath($path,0,0777); |
# but with the spaces substituted to _'s. |
$not_eps =~ s/^\s+//; |
# |
$not_eps =~ s/\s+$//; |
my ($path, $nsname, $sext) = fileparse($eps_f, qr/\.(ps|eps)/i); |
$not_eps =~ s/ /\\ /g; |
if ($sext =~/ps$/i) { |
if ( exists($done_conversion{$not_eps})) { next; } |
File::Path::mkpath($path,0,0777); |
if ($advanced_role) { |
$not_eps =~ s/^\s+//; |
my $prettyname=$not_eps; |
$not_eps =~ s/\s+$//; |
$prettyname=~s|/home/([^/]+)/public_html|/priv/$1|; |
$not_eps =~ s/ /\__/g; |
$prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|; |
File::Copy("$not_eps", "$eps_f"); |
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, |
} else { |
'Converting to EPS '.$prettyname); |
|
} |
$eps_f .= '.eps'; # Just append the eps ext. |
$done_conversion{$not_eps}=1; |
my $path=$eps_f; |
# print "Converting $not_eps -> $eps_f"; # Debugging |
$path =~ s/\/([^\/]+)\.eps$//; |
system("convert $not_eps $eps_f"); |
# print "Final file path: $path "; # Debugging |
# check is eps exist in prtspool |
File::Path::mkpath($path,0,0777); |
if (not -e $eps_f) { |
$not_eps =~ s/^\s+//; |
# converting an animated gif creates either: |
$not_eps =~ s/\s+$//; |
# anim.gif.eps.0 |
$not_eps =~ s/ /\\ /g; |
# or |
if ( exists($done_conversion{$not_eps})) { next; } |
# anim.gif-0.eps |
if ($advanced_role) { |
for (my $i=0;$i<10000;$i++) { |
my $prettyname=$not_eps; |
if (-e $eps_f.'.'.$i) { |
$prettyname=~s|/home/([^/]+)/public_html|/priv/$1|; |
rename($eps_f.'.'.$i, $eps_f); |
$prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|; |
last; |
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, |
} |
'Converting to EPS '.$prettyname); |
my $anim_eps = $eps_f; |
} |
$anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i; |
$done_conversion{$not_eps}=1; |
if (-e $anim_eps) { |
# print "Converting $not_eps -> $eps_f"; # Debugging |
rename($anim_eps, $eps_f); |
system("convert $not_eps $eps_f"); |
last; |
# check is eps exist in prtspool |
|
if (not -e $eps_f) { |
|
# converting an animated gif creates either: |
|
# anim.gif.eps.0 |
|
# or |
|
# anim.gif-0.eps |
|
for (my $i=0;$i<10000;$i++) { |
|
if (-e $eps_f.'.'.$i) { |
|
rename($eps_f.'.'.$i, $eps_f); |
|
last; |
|
} |
|
my $anim_eps = $eps_f; |
|
$anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i; |
|
if (-e $anim_eps) { |
|
rename($anim_eps, $eps_f); |
|
last; |
|
} |
} |
} |
} |
} |
} |
|
# imagemagick 6.2.0-6.2.7 fails to properly handle |
# imagemagick 6.2.0-6.2.7 fails to properly handle |
# convert anim.gif anim.gif.eps |
# convert anim.gif anim.gif.eps |
# it creates anim.eps instead. |
# it creates anim.eps instead. |
if (not -e $eps_f) { |
if (not -e $eps_f) { |
my $eps_f2 = $eps_f; |
my $eps_f2 = $eps_f; |
$eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i; |
$eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i; |
if(-e $eps_f2) { |
if(-e $eps_f2) { |
rename($eps_f2,$eps_f); |
rename($eps_f2,$eps_f); |
|
} |
} |
} |
} |
} |
|
|
Line 747 sub repaginate {
|
Line 764 sub repaginate {
|
my $line; |
my $line; |
my $total_pages; # Total pages in document. |
my $total_pages; # Total pages in document. |
my $seen_pages = 0; # There are several %%Pages only the first is useful |
my $seen_pages = 0; # There are several %%Pages only the first is useful |
my $student_number = 0; # Index of student we're working on. |
|
my @pages_in_student; # For each student his/her initial page count. |
my @pages_in_student; # For each student his/her initial page count. |
my $max_pages = 0; # Pages in 'longest' student. |
my $max_pages = 0; # Pages in 'longest' student. |
my $page_number = 0; |
my $page_number = 0; |
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, |
"Counting pages for student: ".$student_number+1); |
&mt("Counting pages for student: [_1]",1)); |
|
|
while ($line = <PSFILE>) { |
while ($line = <PSFILE>) { |
|
|
Line 774 sub repaginate {
|
Line 790 sub repaginate {
|
my @pageinfo = split(/ /, $line); |
my @pageinfo = split(/ /, $line); |
if ($page_number < $pageinfo[1]) { |
if ($page_number < $pageinfo[1]) { |
$page_number = $pageinfo[1]; |
$page_number = $pageinfo[1]; |
|
} elsif ($pageinfo[2] ne 1) { |
|
# current page count reset, and it's not because of a |
|
# minipage |
|
# - save the page_number, reset and, if necessary |
|
# update max_pages. |
|
push(@pages_in_student, $page_number); |
|
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, |
|
&mt("Counting pages for student: [_1]", scalar(@pages_in_student))); |
|
if ($page_number > $max_pages) { |
|
$max_pages = $page_number; |
|
} |
|
$page_number = $pageinfo[1]; |
} |
} |
} |
} |
# ENDOFSTUDENTSTAMP - save the page_number, reset and, if necessary |
|
# udpate max_pages. |
|
# |
|
if ($line =~ /ENDOFSTUDENTSTAMP/) { |
|
$pages_in_student[$student_number] = $page_number; |
|
$student_number++; |
|
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, |
|
"Counting pages for student: ".$student_number+1); |
|
|
|
if ($page_number > $max_pages) { |
|
$max_pages = $page_number; |
|
} |
|
$page_number = 0; |
|
|
|
} |
|
|
|
|
|
} |
} |
|
# file ended so one more student |
|
push(@pages_in_student, $page_number); |
|
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, |
|
&mt("Counting pages for student: [_1]",scalar(@pages_in_student))); |
|
if ($page_number > $max_pages) { |
|
$max_pages = $page_number; |
|
} |
|
$page_number = 0; |
|
|
close(PSFILE); |
close(PSFILE); |
|
|
# If 2 columns, max_pages must go to an even number of columns: |
# If 2 columns, max_pages must go to an even number of columns: |
|
|
&Apache::lonnet::logthis("Before 2 col adjust max-pages = $max_pages"); |
|
|
|
if ($num_columns == 2) { |
if ($num_columns == 2) { |
if ($max_pages % 2) { |
if ($max_pages % 2) { |
$max_pages++; |
$max_pages++; |
} |
} |
} |
} |
&Apache::lonnet::logthis("after adjust: $max_pages"); |
|
|
|
# Now rewrite the LaTex file, substituting our \special |
# Now rewrite the LaTex file, substituting our \special |
# with an appropriate number of \newpage directives. |
# with an appropriate number of \newpage directives. |
Line 816 sub repaginate {
|
Line 836 sub repaginate {
|
open(LATEXOUT, ">$outfilename"); |
open(LATEXOUT, ">$outfilename"); |
|
|
|
|
$student_number = 0; # first student... |
my $student_number = 0; # Index of student we're working on. |
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, |
"Repaginating student ".$student_number+1); |
"Repaginating student ".$student_number+1); |
|
|
Line 828 sub repaginate {
|
Line 848 sub repaginate {
|
# End of student replace with 0 or more newpages. |
# End of student replace with 0 or more newpages. |
|
|
my $addlines = $max_pages - $pages_in_student[$student_number]; |
my $addlines = $max_pages - $pages_in_student[$student_number]; |
&Apache::lonnet::logthis("student: $pages_in_student[$student_number] add: $addlines"); |
|
while($addlines) { |
while($addlines) { |
print LATEXOUT '\linebreak \strut \pagebreak'; |
print LATEXOUT '\clearpage \strut \clearpage'; |
|
|
$addlines--; |
$addlines--; |
} |
} |
Line 846 sub repaginate {
|
Line 865 sub repaginate {
|
|
|
close(LATEXIN); |
close(LATEXIN); |
close(LATEXOUT); |
close(LATEXOUT); |
rename($outfilename, $latex_filename); |
rename($outfilename, $latex_filename); |
|
|
} |
} |
|
|