loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.362 and 1.369

version 1.362, 2005/02/17 23:19:44	version 1.369, 2005/03/22 10:53:43
Line 781 sub unsupported {	Line 781 sub unsupported {
}	}


	#
	# Retrieve the hash of page breaks.
	#
	# Inputs:
	# helper - reference to helper object.
	# Outputs
	# A reference to a page break hash.
	#
	#

	sub get_page_breaks {
	my ($helper) = @_;
	my %page_breaks;

	foreach my $break (split /\\|\\|\\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
	$page_breaks{$break} = 1;
	}

	return %page_breaks;
	}

sub output_data {	sub output_data {
my ($r,$helper,$rparmhash) = @_;	my ($r,$helper,$rparmhash) = @_;
my %parmhash = %$rparmhash;	my %parmhash = %$rparmhash;
Line 819 $bodytag	Line 840 $bodytag
Please stand by while processing your print request, this may take some time ...	Please stand by while processing your print request, this may take some time ...
ENDPART	ENDPART


	# fetch the pagebreaks and store them in the course environment
	# The page breaks will be pulled into the hash %page_breaks which is
	# indexed by symb and contains 1's for each break.

	$ENV{'form.pagebreaks'} = $helper->{'VARS'}->{'FINISHPAGE'};
	$ENV{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'};
	&Apache::loncommon::store_course_settings('print',
	{'pagebreaks' => 'scalar',
	'lastprinttype' => 'scalar'});

	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) = ('','');
my $number_of_columns = 1; #used only for pages to determine the width of the cell	my $number_of_columns = 1; #used only for pages to determine the width of the cell
Line 1012 ENDPART	Line 1046 ENDPART
my $flag_latex_header_remove = 'NO';	my $flag_latex_header_remove = 'NO';
my $flag_page_in_sequence = 'NO';	my $flag_page_in_sequence = 'NO';
my @master_seq=split /\\|\\|\\|/, $helper->{'VARS'}->{'RESOURCES'};	my @master_seq=split /\\|\\|\\|/, $helper->{'VARS'}->{'RESOURCES'};
my %page_breaks;
foreach my $break (split /\\|\\|\\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
$page_breaks{$break} = 1;
}
my $prevassignment='';	my $prevassignment='';
&Apache::lonnet::delenv('form.counter');	&Apache::lonnet::delenv('form.counter');
&Apache::lonxml::init_counter();	&Apache::lonxml::init_counter();
Line 1152 ENDPART	Line 1182 ENDPART
$moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);	$moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
$moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};	$moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
$moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};	$moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};
	$moreenv{'suppress_tries'} = $parmhash{'suppress_tries'};
if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}	if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
my $student_counter=-1;	my $student_counter=-1;
Line 1310 ENDPART	Line 1341 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 1427 sub print_resources {	Line 1459 sub print_resources {
$namepostfix="\\\\Name: ";	$namepostfix="\\\\Name: ";
$fullname = "CODE - ".$moreenv->{'CODE'};	$fullname = "CODE - ".$moreenv->{'CODE'};
}	}
my %page_breaks;
foreach my $break (split /\\|\\|\\|/,$helper->{'VARS'}->{'FINISHPAGE'}) {
$page_breaks{$break} = 1;
}
my $i = 0;	my $i = 0;
#goes through all resources, checks if they are available for	#goes through all resources, checks if they are available for
#current student, and produces output	#current student, and produces output
&Apache::lonnet::delenv('form.counter');	&Apache::lonnet::delenv('form.counter');
&Apache::lonxml::init_counter();	&Apache::lonxml::init_counter();

	my %page_breaks = &get_page_breaks($helper);

foreach my $curresline (@{$master_seq}) {	foreach my $curresline (@{$master_seq}) {
if (defined $page_breaks{$curresline}) {	if (defined $page_breaks{$curresline}) {
if($i != 0) {	if($i != 0) {
Line 1555 sub handler {	Line 1586 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 1609 sub printHelper {	Line 1647 sub printHelper {
$helper->declareVar('assignment');	$helper->declareVar('assignment');
$helper->declareVar('style_file');	$helper->declareVar('style_file');
$helper->declareVar('student_sort');	$helper->declareVar('student_sort');
	$helper->declareVar('FINISHPAGE');
	$helper->declareVar('PRINT_TYPE');

	# 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',
	{'pagebreaks' => 'scalar',
	'lastprinttype' => 'scalar'});


	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 1716 sub printHelper {	Line 1775 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 1783 HELPERFRAGMENT	Line 1842 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 1996 CHOOSE_FROM_ANY_SEQUENCE	Line 2054 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();

Line 2012 CHOOSE_FROM_ANY_SEQUENCE	Line 2069 CHOOSE_FROM_ANY_SEQUENCE
$paramHash->{CHOICES} = [	$paramHash->{CHOICES} = [
['Without Answers', 'yes'],	['Without Answers', 'yes'],
['With Answers', 'no'],	['With Answers', 'no'],
['Only Answers', 'only'],	['Only Answers', 'only']
['As Exam Problem', 'exam']
];	];
Apache::lonhelper::dropdown->new();	Apache::lonhelper::dropdown->new();
addMessage("</td></tr>");	addMessage("</td></tr>");

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

Removed from v.1.362
changed lines
	Added in v.1.369