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.590 and 1.610

version 1.590, 2011/06/06 10:53:09	version 1.610, 2011/11/29 11:57:33
Line 123 sub create_incomplete_folder_selstud_hel	Line 123 sub create_incomplete_folder_selstud_hel

my $format_chooser = &generate_format_selector($helper,	my $format_chooser = &generate_format_selector($helper,
'Format of the print job',	'Format of the print job',
'','CHOOSE_STUDENTS_INCOMPLETE_FORMAT'); # end state.	'CHOOSE_STUDENTS_INCOMPLETE_FORMAT'); # end state.

return $resource_chooser . $student_chooser . $format_chooser;	return $resource_chooser . $student_chooser . $format_chooser;
}	}
Line 172 sub create_incomplete_course_helper {	Line 172 sub create_incomplete_course_helper {

my $format = &generate_format_selector($helper,	my $format = &generate_format_selector($helper,
'Format of the print job',	'Format of the print job',
'',
'INCOMPLETE_PROBLEMS_COURSE_FORMAT'); # end state.	'INCOMPLETE_PROBLEMS_COURSE_FORMAT'); # end state.

return $resource_chooser . $people_chooser . $format;	return $resource_chooser . $people_chooser . $format;
Line 303 CHOOSE_RESOURCES	Line 302 CHOOSE_RESOURCES
</resource>	</resource>
</state>	</state>
CHOOSE_RESOURCES	CHOOSE_RESOURCES

return $result;	return $result;
}	}
#	#
Line 356 sub generate_code_selector {	Line 354 sub generate_code_selector {
<message></td><td></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><tr><td></message>	<message></td></tr><tr><td></message>
<message><b>Bubble sheet type:</b></message>	<message><b>Bubblesheet type:</b></message>
<message></td><td></message>	<message></td><td></message>
<dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">	<dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
$bubble_types	$bubble_types
Line 395 CHOOSE_ANON1	Line 393 CHOOSE_ANON1
return $result;	return $result;
}	}

	# Returns the XML for choosing how assignments are to be formatted
	# that text must still be parsed by the helper xml parser.
	# Parameters: 3 (required)

	# helper - The helper; $helper->{'VARS'}->{'PRINT_TYPE'} used
	# to check if splitting PDFs by section can be offered.
	# title - Title for the current state.
	# this_state - State name of the chooser.

sub generate_format_selector {	sub generate_format_selector {
my ($helper,$title,$nextstate, $thisstate) = @_;	my ($helper,$title,$this_state) = @_;
my $secpdfoption;	my $secpdfoption;
my $state = 'PRINT_FORMATTING';
if ($thisstate) {
$state = $thisstate;
}
unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon') \|\|	unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon') \|\|
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') \|\|	($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') \|\|
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon') ) {	($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon') ) {
$secpdfoption = '<choice computer="sections">Each PDF contains exactly one section</choice>';	$secpdfoption = '<choice computer="sections">Each PDF contains exactly one section</choice>';
}	}
return <<RESOURCE_SELECTOR;	return <<RESOURCE_SELECTOR;
<state name="$state" title="$title">	<state name="$this_state" title="$title">
$nextstate
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>	<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
<choices variable="EMPTY_PAGES">	<choices variable="EMPTY_PAGES">
<choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>	<choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
Line 432 RESOURCE_SELECTOR	Line 434 RESOURCE_SELECTOR

#-----------------------------------------------------------------------	#-----------------------------------------------------------------------

	# Determine if a resource is incomplete given the map:
	# Parameters:
	# $username - Name of user for whom we are checking.
	# $domain - Domain of user we are checking.
	# $map - map name.
	# Returns:
	# 0 - map is not incomplete.
	# 1 - map is incomplete.
	#
	sub incomplete {
	my ($username, $domain, $map) = @_;


	my $navmap = Apache::lonnavmaps::navmap->new($username, $domain);


	if (defined($navmap)) {
	my $res = $navmap->getResourceByUrl($map);
	my $result = $res->is_incomplete();
	return $result;
	} else {
	return 1;
	}
	}
	#
	# When printing for students, the resoures and order of the
	# resources may need to be altered if there are folders with
	# random selectiopn or random ordering (or both) enabled.
	# This sub computes the set of resources to print for a student
	# modified both by random ordering and selection and filtered
	# to only those that are in the original set selcted to be printed.
	#
	# Parameters:
	# $helper - The helper we need $helper->{'VARS'}->{'symb'}
	# to construct the navmap and the iteration.
	# $seq - The original set of resources to print
	# (really an array of resource names (array of symb's).
	# $who - Student/domain for whome the sequence will be generated.
	#
	# Implicit inputs:
	# $
	# Returns:
	# reference to an array of resources that can be passed to
	# print_resources.
	#
	sub master_seq_to_person_seq {
	my ($helper, $seq, $who) = @_;


	my ($username, $userdomain, $usersection) = split(/:/, $who);


	# Toss the sequence up into a hash so that we have O(1) lookup time.
	# on the items that come out of the user's list of resources.
	#

	my %seq_hash = map {$_ => 1} @$seq;
	my @output_seq;

	my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
	my $navmap = Apache::lonnavmaps::navmap->new($username, $userdomain);
	my $iterator = $navmap->getIterator($navmap->firstResource(),
	$navmap->finishResource(),
	{}, 1);
	my %nonResourceItems = (
	$iterator->BEGIN_MAP => 1,
	$iterator->BEGIN_BRANCH => 1,
	$iterator->END_BRANCH => 1,
	$iterator->END_MAP => 1,
	$iterator->FORWARD => 1,
	$iterator->BACKWARD => 1

	); # These items are not resources but appear in the midst of iteration.

	# Iterate on the resource..select the items that are randomly selected
	# and that are in the seq_has. Presumably the iterator will take care
	# of the random ordering part of the deal.
	#
	my $curres;
	while ($curres = $iterator->next()) {
	#
	# Only process resources..that are not removed by randomout...
	# and are selected for printint as well.
	#

	if (! exists $nonResourceItems{$curres} && ! $curres->randomout()) {
	my $symb = $curres->symb();
	if (exists $seq_hash{$symb}) {
	push(@output_seq, $symb);
	}
	}
	}


	return \@output_seq; # for now.

	}


# Fetch the contents of a resource, uninterpreted.	# Fetch the contents of a resource, uninterpreted.
# This is used here to fetch a latex file to be included	# This is used here to fetch a latex file to be included
Line 534 sub include_pdf {	Line 634 sub include_pdf {
# (unlikely). If it did exist, add the pdf to the set of files/images that	# (unlikely). If it did exist, add the pdf to the set of files/images that
# need tob e converted for this print job:	# need tob e converted for this print job:

$file =~ s\|(.*)/res/\|/home/httpd/html/res/\|;	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
	$file =~ s{(.*)/res/}{$londocroot/res/};

open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");	open(FILE,">>$Apache::lonnet::perlvar{'lonPrtDir'}/$env{'user.name'}_$env{'user.domain'}_printout.dat");
print FILE ("$file\n");	print FILE ("$file\n");
close (FILE);	close (FILE);

Line 606 sub ssi_with_retries {	Line 707 sub ssi_with_retries {
$ssi_last_error_resource = $resource;	$ssi_last_error_resource = $resource;
$ssi_last_error = $response->code . " " . $response->message;	$ssi_last_error = $response->code . " " . $response->message;
$content='\section*{!!! An error occurred !!!}';	$content='\section*{!!! An error occurred !!!}';
&Apache::lonnet::logthis("Error in SSI resource: $resource Error: $ssi_last_error");
}	}

return $content;	return $content;
Line 622 sub get_student_view_with_retries {	Line 722 sub get_student_view_with_retries {
$ssi_last_error_resource = $curresline.' for user '.$username.':'.$userdomain;	$ssi_last_error_resource = $curresline.' for user '.$username.':'.$userdomain;
$ssi_last_error = $response->code . " " . $response->message;	$ssi_last_error = $response->code . " " . $response->message;
$content='\section*{!!! An error occurred !!!}';	$content='\section*{!!! An error occurred !!!}';
&Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error User: $username:$userdomain");
}	}
return $content;	return $content;

Line 1710 sub map_laystyle {	Line 1809 sub map_laystyle {

sub print_page_in_course {	sub print_page_in_course {
my ($helper, $rparmhash, $currentURL, $resources) = @_;	my ($helper, $rparmhash, $currentURL, $resources) = @_;

my %parmhash = %$rparmhash;	my %parmhash = %$rparmhash;
my @page_resources = @$resources;	my @page_resources = @$resources;
my $mode = $helper->{'VARS'}->{'LATEX_TYPE'};	my $mode = $helper->{'VARS'}->{'LATEX_TYPE'};
Line 1766 sub print_page_in_course {	Line 1866 sub print_page_in_course {
}	}
# these resources go through the XML transformer:	# these resources go through the XML transformer:

elsif ($resource_src =~ /\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|xml\|html\|htm\|xhtml\|xhtm)$/) {	elsif ($resource_src =~ /\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|xml\|html\|htm\|xhtml\|xhtm)$/) {

my $urlp = &Apache::lonnet::clutter($resource_src);	my $urlp = &Apache::lonnet::clutter($resource_src);

my %form;	my %form;
my %moreenv;	my %moreenv;

Line 1829 sub print_page_in_course {	Line 1931 sub print_page_in_course {
$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';	$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$texversion.=&path_to_problem($urlp,$LaTeXwidth);	$texversion.=&path_to_problem($urlp,$LaTeXwidth);
} else {	} else {
$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';	$texversion.='\vskip 0 mm \noindent\textbf{'.
my $URLpath=$urlp;	&mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;	$texversion.=&path_to_problem($urlp,$LaTeXwidth);
$texversion.=&path_to_problem($URLpath,$LaTeXwidth);
}	}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';	$texversion.='\vskip 1 mm '.$answer.'\end{document}';
}	}
Line 2100 sub set_form_extraspace {	Line 2201 sub set_form_extraspace {
sub print_construction_sequence {	sub print_construction_sequence {
my ($currentURL, $helper, %form, $LaTeXwidth) = @_;	my ($currentURL, $helper, %form, $LaTeXwidth) = @_;


my $result;	my $result;
my $rndseed=time;	my $rndseed=time;
if ($helper->{'VARS'}->{'curseed'}) {	if ($helper->{'VARS'}->{'curseed'}) {
$rndseed=$helper->{'VARS'}->{'curseed'};	$rndseed=$helper->{'VARS'}->{'curseed'};
}	}
my $errtext=&LONCAPA::map::mapread($currentURL);	my $errtext=&LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$currentURL));

#	#
# These make this all support recursing for subsequences.	# These make this all support recursing for subsequences.
#	#
my @order = @LONCAPA::map::order;	my @order = @LONCAPA::map::order;
my @resources = @LONCAPA::map::resources;	my @resources = @LONCAPA::map::resources;

for (my $member=0;$member<=$#order;$member++) {	for (my $member=0;$member<=$#order;$member++) {
$resources[$order[$member]]=~/^([^:]):([^:]):/;	$resources[$order[$member]]=~/^([^:]):([^:]):/;
my $urlp=$2;	my $urlp=$2;
Line 2127 sub print_construction_sequence {	Line 2229 sub print_construction_sequence {
}	}
if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') \|\|	if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') \|\|
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&	($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
($urlp=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page)$/)) {	($urlp=~/$LONCAPA::assess_page_re/)) {
# Don't permanently modify %$form...	# Don't permanently modify %$form...
my %answerform = %form;	my %answerform = %form;
$answerform{'grade_target'}='answer';	$answerform{'grade_target'}='answer';
Line 2171 sub print_construction_sequence {	Line 2273 sub print_construction_sequence {
# IF sequence, recurse:	# IF sequence, recurse:

if ($urlp =~ /\.sequence$/) {	if ($urlp =~ /\.sequence$/) {
my $sequence_url = $urlp;	$result .= &print_construction_sequence($urlp,
my $domain = $env{'user.domain'}; # Constr. space only on local
my $user = $env{'user.name'};

$sequence_url =~ s/^\/res\/$domain/\/home/;
$sequence_url =~ s/^(\/home\/$user)/$1\/public_html/;
# $sequence_url =~ s\|\/~([^\/]+)\/\|\/home\/$1\/public_html\/\|;
$result .= &print_construction_sequence($sequence_url,
$helper, %form,	$helper, %form,
$LaTeXwidth);	$LaTeXwidth);
}	}
Line 2222 sub print_construction_sequence {	Line 2317 sub print_construction_sequence {
#BZ 5209	#BZ 5209
# 2 map_incomplete_problems_seq Print incomplete problems from the current	# 2 map_incomplete_problems_seq Print incomplete problems from the current
# folder in student context.	# folder in student context.
# 101 map_incomplete_problems_people_seq Print incomplete problems from the	# 5 map_incomplete_problems_people_seq Print incomplete problems from the
# current folder in privileged context.	# current folder in privileged context.
# 102 incomplete_problems_selpeople_course Print incomplete problems for	# 5 incomplete_problems_selpeople_course Print incomplete problems for
# selected people from the entire course.	# selected people from the entire course.
#	#
# Item 101 has much the same processing as 8,	# Item 101 has much the same processing as 8,
# Item 102 has much the same processing as 8.
#	#
# Differences: Item 101, 102 require per-student filtering of the resource	# Differences: Item 101, 102 require per-student filtering of the resource
# set so that only the incomplete resources are printed.	# set so that only the incomplete resources are printed.
Line 2351 ENDPART	Line 2445 ENDPART
} else {	} else {

#prints resource from the construction space	#prints resource from the construction space
$currentURL='/'.$helper->{'VARS'}->{'filename'};	$currentURL=$helper->{'VARS'}->{'filename'};
if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
$cleanURL=$currentURL;	$cleanURL=$currentURL;
}	}
$selectionmade = 1;	$selectionmade = 1;

if ($cleanURL!~m\|^/adm/\|	if ($cleanURL!~m\|^/adm/\|
&& $cleanURL=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|xml\|html\|htm\|xhtml\|xhtm)$/) {	&& $cleanURL=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|xml\|html\|htm\|xhtml\|xhtm)$/) {
my $rndseed=time;	my $rndseed=time;
Line 2395 ENDPART	Line 2489 ENDPART

if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') \|\|	if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') \|\|
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {	($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {

$form{'problem_split'}=$parmhash{'problem_stream_switch'};	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'grade_target'}='answer';	$form{'grade_target'}='answer';
$form{'answer_output_mode'}='tex';	$form{'answer_output_mode'}='tex';
Line 2416 ENDPART	Line 2511 ENDPART
$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';	$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);	$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
} else {	} else {
$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';	$texversion.='\vskip 0 mm \noindent\textbf{'.
my $URLpath=$cleanURL;	&mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
$texversion.=&path_to_problem($URLpath,$LaTeXwidth);	$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
}	}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';	$texversion.='\vskip 1 mm '.$answer.'\end{document}';
}	}
Line 2451 ENDPART	Line 2546 ENDPART
}	}
} elsif ($cleanURL!~m\|^/adm/\|	} elsif ($cleanURL!~m\|^/adm/\|
&& $currentURL=~/\.(sequence\|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {	&& $currentURL=~/\.(sequence\|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {
#printing content of sequence from the construction space


$currentURL=~s\|\/~([^\/]+)\/\|\/home\/$1\/public_html\/\|;
$result .= &print_construction_sequence($currentURL, $helper, %form,	$result .= &print_construction_sequence($currentURL, $helper, %form,
$LaTeXwidth);	$LaTeXwidth);
$result .= '\end{document}';	$result .= '\end{document}';
Line 2616 ENDPART	Line 2707 ENDPART
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;	$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
}	}
} else {	} else {
if ($urlp=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page)$/) {	if ($urlp=~/$LONCAPA::assess_page_re/) {
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});	$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
# $texversion =~ s/\\begin{document}//; # FIXME	# $texversion =~ s/\\begin{document}//; # FIXME
my $title = &Apache::lonnet::gettitle($master_seq[$i]);	my $title = &Apache::lonnet::gettitle($master_seq[$i]);
Line 2724 ENDPART	Line 2815 ENDPART
} elsif (($print_type eq 'problems_for_students') \|\|	} elsif (($print_type eq 'problems_for_students') \|\|
($print_type eq 'problems_for_students_from_page') \|\|	($print_type eq 'problems_for_students_from_page') \|\|
($print_type eq 'all_problems_students') \|\|	($print_type eq 'all_problems_students') \|\|
($print_type eq 'resources_for_students')){	($print_type eq 'resources_for_students') \|\|
	($print_type eq 'incomplete_problems_selpeople_course') \|\|
	($print_type eq 'map_incomplete_problems_people_seq')){


#-- prints assignments for whole class or for selected students	#-- prints assignments for whole class or for selected students
my $type;	my $type;
if (($print_type eq 'problems_for_students') \|\|	if (($print_type eq 'problems_for_students') \|\|
($print_type eq 'problems_for_students_from_page') \|\|	($print_type eq 'problems_for_students_from_page') \|\|
($print_type eq 'all_problems_students') ) {	($print_type eq 'all_problems_students') \|\|
	($print_type eq 'incomplete_problems_selpeople_course') \|\|
	($print_type eq 'map_incomplete_problems_people_seq')) {
$selectionmade=5;	$selectionmade=5;
$type='problems';	$type='problems';
} elsif ($print_type eq 'resources_for_students') {	} elsif ($print_type eq 'resources_for_students') {
Line 2788 ENDPART	Line 2883 ENDPART
my $i = 0;	my $i = 0;
my $last_section = (split(/:/,$students[0]))[2];	my $last_section = (split(/:/,$students[0]))[2];
foreach my $person (@students) {	foreach my $person (@students) {

my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";	my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
if (-e $duefile) {	if (-e $duefile) {
my $temp_file = Apache::File->new('>>'.$duefile);	my $temp_file = Apache::File->new('>>'.$duefile);
Line 2804 ENDPART	Line 2898 ENDPART
} else {	} else {
$i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});	$i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
}	}
	my $actual_seq = master_seq_to_person_seq($helper, \@master_seq, $person);
my ($output,$fullname, $printed)=&print_resources($r,$helper,	my ($output,$fullname, $printed)=&print_resources($r,$helper,
$person,$type,	$person,$type,
\%moreenv,\@master_seq,	\%moreenv, $actual_seq,
$flag_latex_header_remove,	$flag_latex_header_remove,
$LaTeXwidth);	$LaTeXwidth);
$resources_printed .= ":";	$resources_printed .= ":";
Line 2832 ENDPART	Line 2927 ENDPART

my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};	my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
my @lines = &Apache::grades::get_scantronformat_file();	my @lines = &Apache::grades::get_scantronformat_file();
my ($code_type,$code_length)=('letter',6);	my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
foreach my $line (@lines) {	foreach my $line (@lines) {
my ($name,$type,$length) = (split(/:/,$line))[0,2,4];	chomp($line);
	my ($name,$type,$length,$bubbles_per_item) =
	(split(/:/,$line))[0,2,4,17];
if ($name eq $code_option) {	if ($name eq $code_option) {
$code_length=$length;	$code_length=$length;
if ($type eq 'number') { $code_type = 'number'; }	if ($type eq 'number') { $code_type = 'number'; }
	chomp($bubbles_per_item);
	if (($bubbles_per_item ne '') && ($bubbles_per_item > 0)) {
	$bubbles_per_row = $bubbles_per_item;
	}
}	}
}	}
my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));	my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
$moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};	$moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};
$moreenv{'instructor_comments'}='hide';	$moreenv{'instructor_comments'}='hide';
	$moreenv{'bubbles_per_row'} = $bubbles_per_row;
my $seed=time+($$<<16)+($$);	my $seed=time+($$<<16)+($$);
my @allcodes;	my @allcodes;
if ($old_name) {	if ($old_name) {
Line 2933 ENDPART	Line 3035 ENDPART
if ($urlp=~/\//) {	if ($urlp=~/\//) {
$form{'problem_split'}=$parmhash{'problem_stream_switch'};	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'rndseed'}=$rndseed;	$form{'rndseed'}=$rndseed;
if ($urlp =~ m\|/home/([^/]+)/public_html\|) {	$urlp =~ s\|^$Apache::lonnet::perlvar{'lonDocRoot'}\|\|;
$urlp =~ s\|/home/([^/]*)/public_html\|/~$1\|;
} else {
$urlp =~ s\|^$Apache::lonnet::perlvar{'lonDocRoot'}\|\|;
}
$resources_printed .= $urlp.':';	$resources_printed .= $urlp.':';
my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);	my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') \|\|	if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') \|\|
Line 2958 ENDPART	Line 3056 ENDPART
$texversion.='\vskip 0 mm \noindent ';	$texversion.='\vskip 0 mm \noindent ';
$texversion.=&path_to_problem ($urlp,$LaTeXwidth);	$texversion.=&path_to_problem ($urlp,$LaTeXwidth);
} else {	} else {
$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';	$texversion.='\vskip 0 mm \noindent\textbf{'.
my $URLpath=$urlp;	&mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;	$texversion.=&path_to_problem ($urlp,$LaTeXwidth);
$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
}	}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';	$texversion.='\vskip 1 mm '.$answer.'\end{document}';
}	}
}	}
#this chunk is responsible for printing the path to problem	#this chunk is responsible for printing the path to problem

my $newurlp=$urlp;	my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
if ($newurlp=~/~/) {$newurlp=~s\|\/~([^\/]+)\/\|\/home\/$1\/public_html\/\|;}
$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;	$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
if ($flag_latex_header_remove ne 'NO') {	if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);	$texversion = &latex_header_footer_remove($texversion);
Line 3019 ENDPART	Line 3114 ENDPART

my $URLback=''; #link to original document	my $URLback=''; #link to original document
if ($helper->{'VARS'}->{'construction'} eq '1') {	if ($helper->{'VARS'}->{'construction'} eq '1') {
#prints resource from the construction space	$URLback=$helper->{'VARS'}->{'filename'};
$URLback='/'.$helper->{'VARS'}->{'filename'};
if ($URLback=~/([^?]+)/) {
$URLback=$1;
$URLback=~s\|^/~\|/priv/\|;
}
}	}
#	#
# Final adjustment of the font size:	# Final adjustment of the font size:
Line 3159 sub print_resources {	Line 3249 sub print_resources {
my ($username,$userdomain,$usersection) = split /:/,$person;	my ($username,$userdomain,$usersection) = split /:/,$person;
my $fullname = &get_name($username,$userdomain);	my $fullname = &get_name($username,$userdomain);
my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.	my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.
if ($person =~ 'anon') {
	#
	# Figure out if we need to filter the output by
	# the incomplete problems for that person
	#
	my $print_type = $helper->{'VARS'}->{'PRINT_TYPE'};
	my $print_incomplete = 0;
	if (($print_type eq 'map_incomplete_problems_people_seq') \|\|
	($print_type eq 'incomplete_problems_selpeople_course')) {
	$print_incomplete = 1;
	}
	if ($person eq 'anonymous') {
$namepostfix .="Name: ";	$namepostfix .="Name: ";
$fullname = "CODE - ".$moreenv->{'CODE'};	$fullname = "CODE - ".$moreenv->{'CODE'};
}	}
Line 3168 sub print_resources {	Line 3269 sub print_resources {
#	#

my $i = 0;	my $i = 0;
	my $actually_printed = 0; # Count of resources printed.
#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

Line 3184 sub print_resources {	Line 3286 sub print_resources {
# so we will just rely on prntout.pl to strip ENDOFSTUDENTSTAMP from the	# so we will just rely on prntout.pl to strip ENDOFSTUDENTSTAMP from the
# postscript. Each ENDOFSTUDENTSTAMP will go on a line by itself.	# postscript. Each ENDOFSTUDENTSTAMP will go on a line by itself.
#	#

my $syllabus_first = 0;	my $syllabus_first = 0;
foreach my $curresline (@{$master_seq}) {	foreach my $curresline (@{$master_seq}) {
if (defined $page_breaks{$curresline}) {	if (defined $page_breaks{$curresline}) {
Line 3194 sub print_resources {	Line 3297 sub print_resources {
$current_output .= &get_extra_vspaces($helper, $curresline);	$current_output .= &get_extra_vspaces($helper, $curresline);
$i++;	$i++;
if ( !($type eq 'problems' &&	if ( !($type eq 'problems' &&
($curresline!~ m/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page)$/)) ) {	($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);	my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
	if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
	next;
	}
	$actually_printed++; # we're going to print one.
if (&Apache::lonnet::allowed('bre',$res_url)) {	if (&Apache::lonnet::allowed('bre',$res_url)) {
if ($res_url!~m\|^ext/\|	if ($res_url!~m\|^ext/\|
&& $res_url=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page\|xml\|html\|htm\|xhtml\|xhtm)$/) {	&& $res_url=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page\|xml\|html\|htm\|xhtml\|xhtm)$/) {
Line 3209 sub print_resources {	Line 3316 sub print_resources {
$rendered = &print_latex_header().$rendered;	$rendered = &print_latex_header().$rendered;
}	}
}	}
	;
if ($remove_latex_header eq 'YES') {	if ($remove_latex_header eq 'YES') {
$rendered = &latex_header_footer_remove($rendered);	$rendered = &latex_header_footer_remove($rendered);
} else {	} else {
Line 3220 sub print_resources {	Line 3328 sub print_resources {
# Use a copy of the hash so we don't pervert it on future loop passes.	# Use a copy of the hash so we don't pervert it on future loop passes.
my %answerenv = %{$moreenv};	my %answerenv = %{$moreenv};
$answerenv{'answer_output_mode'}='tex';	$answerenv{'answer_output_mode'}='tex';


$answerenv{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};	$answerenv{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};

&Apache::lonxml::restore_problem_counter();	&Apache::lonxml::restore_problem_counter();
Line 3294 sub print_resources {	Line 3404 sub print_resources {
}	}
if (&Apache::loncommon::connection_aborted($r)) { last; }	if (&Apache::loncommon::connection_aborted($r)) { last; }
}	}
	# If we are printing incomplete it's possible we don't have
	# anything to print. The print subsystem is not so good at handling
	# that so we're going to generate a stub that says there are no
	# incomplete resources for the person.
	#

	if ($actually_printed == 0) {
	$current_output = &encapsulate_minipage("\\vskip -10mm \nNo incomplete resources\n \\vskip 100 mm { }\n");
	if ($remove_latex_header eq "NO") {
	$current_output = &print_latex_header() . $current_output;
	} else {
	$current_output = &latex_header_footer_remove($current_output);
	}
	}

if ($syllabus_first) {	if ($syllabus_first) {
$current_output =~ s/\\\\ Last updated:/Last updated:/	$current_output =~ s/\\\\ Last updated:/Last updated:/
Line 3330 sub handler {	Line 3454 sub handler {

&init_perm();	&init_perm();



my $helper = printHelper($r);	my $helper = printHelper($r);
if (!ref($helper)) {	if (!ref($helper)) {
return $helper;	return $helper;
Line 3400 sub get_randomly_ordered_warning {	Line 3522 sub get_randomly_ordered_warning {
my $func =	my $func =
sub { return ($_[0]->is_map() && $_[0]->randomorder); };	sub { return ($_[0]->is_map() && $_[0]->randomorder); };
my @matches = $navmap->retrieveResources($res, $func,1,1,1);	my @matches = $navmap->retrieveResources($res, $func,1,1,1);
if (@matches) {
$message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
}
}
if ($message) {
return '<message type="warning">'.$message.'</message>';
}	}
} else {	} else {
$message = "Retrieval of information about ordering of resources failed.";	$message = "Retrieval of information about ordering of resources failed.";
Line 3495 sub printHelper {	Line 3612 sub printHelper {
}	}

# Detect whether we're coming from construction space	# Detect whether we're coming from construction space
if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/\|\/\|)\~([^\/]+)\/(.*)$/) {	if ($env{'form.postdata'}=~m{^/priv}) {
$helper->{VARS}->{'filename'} = "~$1/$2";	$helper->{VARS}->{'filename'} = $env{'form.postdata'};
$helper->{VARS}->{'construction'} = 1;	$helper->{VARS}->{'construction'} = 1;
} else {	} else {
if ($env{'form.postdata'}) {	if ($env{'form.postdata'}) {
Line 3718 sub printHelper {	Line 3835 sub printHelper {
}	}

push(@{$printChoices},	push(@{$printChoices},
[&mt('Selected Incomplete [_1]Problems[_2] from folder [_3]' . $textSuffix,	[&mt('Selected [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
'<b>', '</b>',	'<b>', '</b>',
'<b><i>'. $sequenceTitle . '</b></i>'),	'<b><i>'. $sequenceTitle . '</b></i>'),
$printSelector,	$printSelector,
Line 3765 sub printHelper {	Line 3882 sub printHelper {
# BZ 5209 - incomplete problems from entire course:	# BZ 5209 - incomplete problems from entire course:

push(@{$printChoices},	push(@{$printChoices},
[&mtn('Selected incomplete <b>Problems</b> from <b>entire course</b> for selected people'),	[&mtn('Selected <b>Incomplete Problems</b> from <b>entire course</b> for selected people'),
'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);	'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.	my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.

Line 3838 ALL_PROBLEMS	Line 3955 ALL_PROBLEMS
}	}

my $randomly_ordered_warning =	my $randomly_ordered_warning =
&get_randomly_ordered_warning($helper,$map);	&get_randomly_ordered_warning($helper, $map);

# resource_selector will hold a few states that:	# resource_selector will hold a few states that:
# - Allow resources to be selected for printing.	# - Allow resources to be selected for printing.
Line 3857 ALL_PROBLEMS	Line 3974 ALL_PROBLEMS
$map,	$map,
$isProblem, '', $symbFilter,	$isProblem, '', $symbFilter,
$start_new_option);	$start_new_option);
my $secpdfoption;
unless (($helper->{'VARS'} eq 'problems_for_anon') \|\|
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') \|\|
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon') ) {
$secpdfoption = '<choice computer="sections">Each PDF contains exactly one section</choice>';
}
$resource_selector .= &generate_format_selector($helper,	$resource_selector .= &generate_format_selector($helper,
'How should results be printed?').	'How should results be printed?',
	'PRINT_FORMATTING').
&generate_resource_chooser('CHOOSE_STUDENTS_PAGE',	&generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
'Select Problem(s) to print',	'Select Problem(s) to print',
"multichoice='1' addstatus='1' closeallpages ='1'",	"multichoice='1' addstatus='1' closeallpages ='1'",
Line 3998 ALL_PROBLEMS	Line 4110 ALL_PROBLEMS
</state>	</state>
RESOURCE_SELECTOR	RESOURCE_SELECTOR

my $nextstate = '<nextstate>NUMBER_PER_PDF</nextstate>';
$resource_selector .= &generate_format_selector($helper,	$resource_selector .= &generate_format_selector($helper,
'Format of the print job',	'Format of the print job',
$nextstate);	'PRINT_FORMATTING');
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
<state name="CHOOSE_STUDENTS1" title="Select Students and Resources">	<state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
<choices variable='student_sort'>	<choices variable='student_sort'>
Line 4042 CHOOSE_STUDENTS1	Line 4153 CHOOSE_STUDENTS1
<message></td><td></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><tr><td></message>	<message></td></tr><tr><td></message>
<message><b>Bubble sheet type:</b></message>	<message><b>Bubblesheet type:</b></message>
<message></td><td></message>	<message></td><td></message>
<dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">	<dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
$codechoice	$codechoice

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

Removed from v.1.590
changed lines
	Added in v.1.610