version 1.162, 2016/05/21 21:15:36
|
version 1.165, 2017/11/12 15:41:45
|
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 strict; |
use strict; |
|
|
Line 201 my $tableofindex = $env{'cgi.'.$identifi
|
Line 202 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 446 foreach $texfile (@texfile) {
|
Line 447 foreach $texfile (@texfile) {
|
# i.e., a papertype of a4, when the user selected letter [8 1/2 x 11 in] |
# 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. |
# in the Layout options, so I follow that convention if $papera is letter. |
my $papera=$paper; |
my $papera=$paper; |
if ($papera eq 'letter') {$papera=' a4';} |
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 979 sub convert_figure {
|
Line 980 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) { |