version 1.363, 2005/02/22 11:43:05
|
version 1.367, 2005/03/08 23:29:11
|
Line 794 sub unsupported {
|
Line 794 sub unsupported {
|
sub get_page_breaks { |
sub get_page_breaks { |
my ($helper) = @_; |
my ($helper) = @_; |
my %page_breaks; |
my %page_breaks; |
|
|
|
|
|
|
foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) { |
foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) { |
$page_breaks{$break} = 1; |
$page_breaks{$break} = 1; |
} |
} |
|
|
return \%page_breaks; |
return %page_breaks; |
} |
} |
|
|
sub output_data { |
sub output_data { |
Line 847 ENDPART
|
Line 845 ENDPART
|
# The page breaks will be pulled into the hash %page_breaks which is |
# The page breaks will be pulled into the hash %page_breaks which is |
# indexed by symb and contains 1's for each break. |
# indexed by symb and contains 1's for each break. |
|
|
$ENV{'form.pagebreaks'} = $helper->{'VARS'}->{'FINISHPAGE'}; |
$ENV{'form.pagebreaks'} = $helper->{'VARS'}->{'FINISHPAGE'}; |
|
$ENV{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'}; |
&Apache::loncommon::store_course_settings('print', |
&Apache::loncommon::store_course_settings('print', |
{'pagebreaks' => 'scalar'}); |
{'pagebreaks' => 'scalar', |
|
'lastprinttype' => 'scalar'}); |
my $page_hashref = &get_page_breaks($helper); |
|
my %page_breaks = %$page_hashref; |
|
|
|
|
|
|
my %page_breaks = &get_page_breaks($helper); |
|
|
my $format_from_helper = $helper->{'VARS'}->{'FORMAT'}; |
my $format_from_helper = $helper->{'VARS'}->{'FORMAT'}; |
my ($result,$selectionmade) = ('',''); |
my ($result,$selectionmade) = ('',''); |
Line 1343 ENDPART
|
Line 1340 ENDPART
|
$result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /; |
$result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /; |
$result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /; |
$result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /; |
} |
} |
|
|
#-- writing .tex file in prtspool |
#-- writing .tex file in prtspool |
my $temp_file; |
my $temp_file; |
my $identifier = &Apache::loncommon::get_cgi_id(); |
my $identifier = &Apache::loncommon::get_cgi_id(); |
Line 1466 sub print_resources {
|
Line 1464 sub print_resources {
|
&Apache::lonnet::delenv('form.counter'); |
&Apache::lonnet::delenv('form.counter'); |
&Apache::lonxml::init_counter(); |
&Apache::lonxml::init_counter(); |
|
|
my $page_hashref = &get_page_breaks($helper); |
my %page_breaks = &get_page_breaks($helper); |
my %page_breaks = %$page_hashref; |
|
|
|
foreach my $curresline (@{$master_seq}) { |
foreach my $curresline (@{$master_seq}) { |
if (defined $page_breaks{$curresline}) { |
if (defined $page_breaks{$curresline}) { |
Line 1588 sub handler {
|
Line 1585 sub handler {
|
# |
# |
|
|
|
|
|
# If a figure conversion queue file exists for this user.domain |
|
# we delete it since it can only be bad (if it were good, printout.pl |
|
# would have deleted it the last time around. |
|
|
|
my $conversion_queuefile = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; |
|
if(-e $conversion_queuefile) { |
|
unlink $conversion_queuefile; |
|
} |
&output_data($r,$helper,\%parmhash); |
&output_data($r,$helper,\%parmhash); |
return OK; |
return OK; |
} |
} |
Line 1643 sub printHelper {
|
Line 1647 sub printHelper {
|
$helper->declareVar('style_file'); |
$helper->declareVar('style_file'); |
$helper->declareVar('student_sort'); |
$helper->declareVar('student_sort'); |
$helper->declareVar('FINISHPAGE'); |
$helper->declareVar('FINISHPAGE'); |
|
$helper->declareVar('PRINT_TYPE'); |
|
|
# The page breaks can get loaded initially from the course environment: |
# The page breaks can get loaded initially from the course environment: |
|
|
|
if((!defined($ENV{"form.CURRENT_STATE"})) || |
|
($ENV{'form.CURRENT_STATE'} == "START")) { |
|
$helper->{VARS}->{FINISHPAGE} = ""; # In case they did a back e.g. |
|
} |
|
|
|
|
|
|
&Apache::loncommon::restore_course_settings('print', |
&Apache::loncommon::restore_course_settings('print', |
{'pagebreaks' => 'scalar'}); |
{'pagebreaks' => 'scalar', |
|
'lastprinttype' => 'scalar'}); |
|
|
$helper->{VARS}->{FINISHPAGE} = $ENV{'form.pagebreaks'}; |
|
|
if("$helper->{VARS}->{PRINT_TYPE}" eq "$ENV{'form.lastprinttype'}") { |
|
$helper->{VARS}->{FINISHPAGE} = $ENV{'form.pagebreaks'}; |
|
} |
|
|
|
|
# This will persistently load in the data we want from the |
# This will persistently load in the data we want from the |
# very first screen. |
# very first screen. |
Line 1757 sub printHelper {
|
Line 1774 sub printHelper {
|
$helper->declareVar('SEQUENCE'); |
$helper->declareVar('SEQUENCE'); |
|
|
# Useful for debugging: Dump the help vars |
# Useful for debugging: Dump the help vars |
#$r->print(Dumper($helper->{VARS})); |
# $r->print(Dumper($helper->{VARS})); |
#$r->print($map); |
# $r->print($map); |
|
|
# If we're in a sequence... |
# If we're in a sequence... |
if (($helper->{'VARS'}->{'construction'} ne '1') && |
if (($helper->{'VARS'}->{'construction'} ne '1') && |
Line 1824 HELPERFRAGMENT
|
Line 1841 HELPERFRAGMENT
|
suppressEmptySequences='0' addstatus='1' closeallpages='1'> |
suppressEmptySequences='0' addstatus='1' closeallpages='1'> |
<nextstate>PAGESIZE</nextstate> |
<nextstate>PAGESIZE</nextstate> |
<filterfunc>return $isNotMap; </filterfunc> |
<filterfunc>return $isNotMap; </filterfunc> |
<mapurl> $map</mapursl> |
|
<valuefunc>return $symbFilter;</valuefunc> |
<valuefunc>return $symbFilter;</valuefunc> |
<option text='NewPage' variable='FINISHPAGE' /> |
<option text='NewPage' variable='FINISHPAGE' /> |
</resource> |
</resource> |
Line 2037 CHOOSE_FROM_ANY_SEQUENCE
|
Line 2053 CHOOSE_FROM_ANY_SEQUENCE
|
Apache::lonhelper::message->new(); |
Apache::lonhelper::message->new(); |
$paramHash = Apache::lonhelper::getParamHash(); |
$paramHash = Apache::lonhelper::getParamHash(); |
$paramHash->{'variable'} = 'PRINT_TYPE'; |
$paramHash->{'variable'} = 'PRINT_TYPE'; |
$helper->declareVar('PRINT_TYPE'); |
|
$paramHash->{CHOICES} = $printChoices; |
$paramHash->{CHOICES} = $printChoices; |
Apache::lonhelper::choices->new(); |
Apache::lonhelper::choices->new(); |
|
|