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.361 and 1.368

version 1.361, 2005/02/17 08:29:43	version 1.368, 2005/03/15 00:43:06
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 1310 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 1427 sub print_resources {	Line 1458 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 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 1609 sub printHelper {	Line 1646 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 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 1783 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 1837 CHOOSE_STUDENTS	Line 1894 CHOOSE_STUDENTS
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
<state name="CHOOSE_ANON1" title="Select Students and Resources">	<state name="CHOOSE_ANON1" title="Select Students and Resources">
<nextstate>PAGESIZE</nextstate>	<nextstate>PAGESIZE</nextstate>
<message><hr width='33%' /><b>Number of anonymous assignments to print?</b></message>	<message><hr width='33%' /></message>
<string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>	<message><table><tr><td><b>Number of anonymous assignments to print?</b></td><td></message>
<message><br /><b>Names to store the CODEs under for later:</b></message>	<string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
	<validator>
	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
	!\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
	return "You need to specify the number of assignments to print";
	}
	return undef;
	</validator>
	</string>
	<message></td></tr><tr><td></message>
	<message><b>Names to store the CODEs under for later:</b></message>
	<message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />	<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
	<message></td></tr></table></message>
<message><hr width='33%' /></message>	<message><hr width='33%' /></message>
<message><b>Reprint a set of saved CODEs:</b></message>	<message><b>Reprint a set of saved CODEs:</b></message>
<dropdown variable="REUSE_OLD_CODES">	<dropdown variable="REUSE_OLD_CODES">
Line 1893 CHOOSE_STUDENTS1	Line 1962 CHOOSE_STUDENTS1
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);
<state name="CHOOSE_ANON2" title="Select Students and Resources">	<state name="CHOOSE_ANON2" title="Select Students and Resources">
<nextstate>PAGESIZE</nextstate>	<nextstate>PAGESIZE</nextstate>
<message><hr width='33%' /><b>Number of anonymous assignments to print?</b></message>	<message><table><tr><td><b>Number of anonymous assignments to print?</b></td><td></message>
<string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>	<string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
<message><br /><b>Names to store the CODEs under for later:</b></message>	<validator>
	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
	!\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
	return "You need to specify the number of assignments to print";
	}
	return undef;
	</validator>
	</string>
	<message></td></tr><tr><td></message>
	<message><b>Names to store the CODEs under for later:</b></message>
	<message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />	<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
	<message></td></tr></table></message>
<message><hr width='33%' /></message>	<message><hr width='33%' /></message>
<message><b>Reprint a set of saved CODEs:</b></message>	<message><b>Reprint a set of saved CODEs:</b></message>
<dropdown variable="REUSE_OLD_CODES">	<dropdown variable="REUSE_OLD_CODES">
Line 1973 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();

Line 1989 CHOOSE_FROM_ANY_SEQUENCE	Line 2068 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.361
changed lines
	Added in v.1.368