version 1.157, 2014/02/06 21:28:09
|
version 1.170, 2024/07/11 12:15:16
|
Line 40 use Apache::lonlocal;
|
Line 40 use Apache::lonlocal;
|
use Apache::lonmsg(); |
use Apache::lonmsg(); |
use LONCAPA::Enrollment; |
use LONCAPA::Enrollment; |
use LONCAPA::Configuration; |
use LONCAPA::Configuration; |
|
use LONCAPA; |
|
use Archive::Zip qw( :ERROR_CODES ); |
|
|
use strict; |
use strict; |
|
|
Line 201 my $tableofindex = $env{'cgi.'.$identifi
|
Line 203 my $tableofindex = $env{'cgi.'.$identifi
|
my $advanced_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 = &unescape($env{'cgi.'.$identifier.'.backref'}); |
|
|
|
|
my @names_pack=(); |
my @names_pack=(); |
Line 209 if ($student_names=~/_END_/) {
|
Line 211 if ($student_names=~/_END_/) {
|
@names_pack=split(/_ENDPERSON_/,$student_names); |
@names_pack=split(/_ENDPERSON_/,$student_names); |
} |
} |
if ($backref) { |
if ($backref) { |
print('<p>'.&mt("[_1]Return[_2] to editing resource.", |
if ($backref =~ m{^(/uploaded/$LONCAPA::match_domain/$LONCAPA::match_courseid/default_\d+.page)}) { |
|
$backref = $1; |
|
} |
|
print('<p>'.&mt("[_1]Return[_2] to resource.", |
"<a href=\"$backref\"><b>","</b></a>").'</p>'); |
"<a href=\"$backref\"><b>","</b></a>").'</p>'); |
|
print('<p><a href="javascript:gopost(\'/adm/printout\',\''.$backref.'\');">'. |
|
&mt("Change Printing Options").'</a></p>'."\n"); |
} |
} |
my $figfile = $texfile; |
my $figfile = $texfile; |
$figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/; |
$figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/; |
Line 309 foreach $texfile (@texfile) {
|
Line 316 foreach $texfile (@texfile) {
|
my $name_range=''; |
my $name_range=''; |
|
|
# $name -> Either user's full name or username:domain |
# $name -> Either user's full name or username:domain |
# $name_range -> Either user's last name or usrname. |
# $name_range -> Either user's last name or username. |
|
|
if ($tempo_array[3]) { |
if ($tempo_array[3]) { |
$name=$tempo_array[3]; |
$name=$tempo_array[3]; |
Line 438 foreach $texfile (@texfile) {
|
Line 445 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/; |
|
# Explicitly include a switch for papertype, otherwise dvips will default |
|
# to whatever is listed first in config.ps (which in most cases is a4). |
|
# Historically (since 2004) LON-CAPA printing expected to use the default, |
|
# i.e., a papertype of a4, when the user selected letter [8 1/2 x 11 in] |
|
# in the Layout options, so I follow that convention if $papera is letter. |
my $papera=$paper; |
my $papera=$paper; |
if ($papera eq 'letter') {$papera='';} |
if ($papera eq 'letter') {$papera='a4';} |
if ($papera ne '') {$papera='-t'.$papera;} |
if ($papera ne '') {$papera='-t'.$papera;} |
my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps'; |
my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps'; |
my $comma = "dvips $papera -h $extra_ps_header -Ppdf -G0 -o $new_name_file"; |
my $comma = "dvips $papera -h $extra_ps_header -Ppdf -G0 -o $new_name_file"; |
Line 510 foreach $texfile (@texfile) {
|
Line 522 foreach $texfile (@texfile) {
|
|
|
# Use gs to fix the postscript -> level 1.5 |
# Use gs to fix the postscript -> level 1.5 |
# .. if pdfs were included |
# .. if pdfs were included |
|
# |
|
# pswrite device was removed from ghostscript 9.09 and later, |
|
# (ps2write device is used instead). |
|
# check which device is available, and use as the value |
|
# passed via -sDEVICE= arg in gs call to fix the postscript. |
|
# |
|
|
if ($pdfs_converted > 0) { |
if ($pdfs_converted > 0) { |
$comma = "gs -sDEVICE=pswrite -dLanguageLevel=1.5 "; |
my @possdevices = qw(ps2write pswrite); |
&busy_wait_command("$comma -o $tempo_file $new_name_file 2>/dev/null 1>/dev/null", |
my $device; |
"for $status_statement now validating PS", |
foreach my $poss (@possdevices) { |
\%prog_state, $tempo_file); |
if (open(PIPE,"gs -h |grep ' $poss ' 2>&1 |")) { |
|
my $output = <PIPE>; |
|
close(PIPE); |
|
chomp($output); |
|
if ($output =~ /\Q $poss \E/) { |
|
$device = $poss; |
|
} |
|
} |
|
last if ($device ne ''); |
|
} |
|
if ($device ne '') { |
|
$comma = "gs -sDEVICE=$device -dLanguageLevel=1.5 -permit-file-read=* "; |
|
&busy_wait_command("$comma -o $tempo_file $new_name_file 2>/dev/null 1>/dev/null", |
|
"for $status_statement now validating PS", |
|
\%prog_state, $tempo_file); |
|
|
#--- |
#--- |
&busy_wait_command("mv $tempo_file $new_name_file", |
if (-e $tempo_file) { |
'File move', \%prog_state, $new_name_file); |
&busy_wait_command("mv $tempo_file $new_name_file", |
|
'File move', \%prog_state, $new_name_file); |
|
} |
|
} |
} |
} |
if ($laystyle eq 'album' and $numberofcolumns eq '2') { |
if ($laystyle eq 'album' and $numberofcolumns eq '2') { |
$comma = "psnup $papera -2 -s1.0 $new_name_file"; |
$comma = "psnup $papera -2 -s1.0 $new_name_file"; |
Line 589 foreach $texfile (@texfile) {
|
Line 624 foreach $texfile (@texfile) {
|
.'</p>'; |
.'</p>'; |
} |
} |
} |
} |
|
if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } |
print "<br />"; |
print "<br />"; |
if ($number_of_files>1) { |
if ($number_of_files>1) { |
|
print('<p>'.&mt('Zip Output:')."\n"); |
|
my %zip_prog_state; |
|
if ($advanced_role) { %zip_prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$number_of_files); } |
my $zipfile=$texfile[0]; |
my $zipfile=$texfile[0]; |
$zipfile=~s/\.tex/\.zip/; |
$zipfile=~s/\.tex/\.zip/; |
my $statement="zip $zipfile"; |
my $zip = Archive::Zip->new(); |
|
my $counter = 0; |
foreach my $file (@texfile) { |
foreach my $file (@texfile) { |
$file=~s/\.tex/.\pdf/; |
$file=~s/\.tex/.\pdf/; |
$statement.=' '.$file; |
my $dest=$file; |
|
$dest=~s{^\Q$perlvar{'lonPrtDir'}\E}{prtspool}; |
|
$zip->addFile($file,$dest); |
|
$dest=~s/^prtspool//; |
|
$counter ++; |
|
if ($advanced_role) { |
|
&Apache::lonhtmlcommon::Update_PrgWin('',\%zip_prog_state, |
|
&mt('[_1] added to zip archive ([_2] of [_3]', |
|
$dest,$counter,$number_of_files)); |
|
} |
|
} |
|
if ($advanced_role) { |
|
&Apache::lonhtmlcommon::Update_PrgWin('',\%zip_prog_state,&mt('Writing zip file')); |
} |
} |
print('<p>'.&mt('Zip Output:')."\n<pre>\n"); |
if ($zip->writeToFileNamed($zipfile) == AZ_OK) { |
system($statement); |
$zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool}; |
print("</pre></p>\n"); |
print |
$zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool}; |
'<p>' |
print |
.&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.', |
'<p>' |
'<a href="'.$zipfile.'">','</a>') |
.&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.', |
.'</p>'; |
'<a href="'.$zipfile.'">','</a>') |
} else { |
.'</p>'; |
print '<p class="LC_error">'. |
|
&mt('An error occurred creating a ZIP file of all the PDF files'). |
|
'</p>'; |
|
} |
|
if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%zip_prog_state); } |
} |
} |
if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } |
|
print(&Apache::loncommon::end_page()); |
print(&Apache::loncommon::end_page()); |
my $done; |
my $done; |
|
|
Line 933 sub convert_figure {
|
Line 988 sub convert_figure {
|
|
|
# Spaces are problematic for system commands and LaTeX, replace with _ |
# Spaces are problematic for system commands and LaTeX, replace with _ |
|
|
$eps_f =~ s/ /\_/g; |
$eps_f =~ s/ /\_/g; |
|
|
# |
# |
# If the file is already an .eps or .ps file (eps_f still has the original |
# If the file is already an .eps or .ps file (eps_f still has the original |
Line 952 sub convert_figure {
|
Line 1007 sub convert_figure {
|
&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; |
|
my $prettyname=$not_eps; |
my $prettyname=$not_eps; |
if ($advanced_role) { |
if ($advanced_role) { |
$prettyname=~s|$perlvar{'lonDocRoot'}/|/|; |
$prettyname=~s|$perlvar{'lonDocRoot'}/|/|; |
Line 972 sub convert_figure {
|
Line 1026 sub convert_figure {
|
$eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f; |
$eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f; |
|
|
&debug("Converting pdf $not_eps to postscript: $eps_f"); |
&debug("Converting pdf $not_eps to postscript: $eps_f"); |
system("pdftops $not_eps $eps_f"); |
my @args = ('pdftops',$not_eps,$eps_f); |
$pdfs_converted++; # Need to fix ps in last pass. |
system({$args[0]} @args); # Indirect object forces list processing mode. |
|
# See perlfunc documentation for exec(). |
|
if ($? and $advanced_role) { |
|
print '<p class="LC_warning">' |
|
.&mt('An error occurred during the conversion of [_1] to postscript.', |
|
'<span class="LC_filename">'.$prettyname.'</span>') |
|
.'</p>'; |
|
} else { |
|
$pdfs_converted++; # Need to fix ps in last pass. |
|
} |
} else { |
} else { |
system("convert $not_eps $eps_f"); |
my @args = ('convert',$not_eps,$eps_f); |
if($? and $advanced_role){ |
system({$args[0]} @args); # Indirect object forces list processing mode. |
print '<p class="LC_warning">' |
# See perlfunc documentation for exec(). |
.&mt('An error occurred during the conversion of [_1].', |
if ($? and $advanced_role) { |
|
print '<p class="LC_warning">' |
|
.&mt('An error occurred during the conversion of [_1].', |
'<span class="LC_filename">'.$prettyname.'</span>') |
'<span class="LC_filename">'.$prettyname.'</span>') |
.'<br />' |
.'<br />' |
.&mt('If possible try to save this image using different settings and republish it.') |
.&mt('If possible try to save this image using different settings and republish it.') |
.'</p>'; |
.'</p>'; |
} |
} |
} |
} |
|
|
if (not -e $eps_f) { |
if (not -e $eps_f) { |
Line 1160 sub analyze_logfile {
|
Line 1225 sub analyze_logfile {
|
my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins; |
my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins; |
print "<br />" |
print "<br />" |
.&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\n"; |
.&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\n"; |
print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement neccessary corrections by yourself.')."\n"; |
print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement necessary corrections by yourself.')."\n"; |
$whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10; |
$whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10; |
} |
} |
|
|