--- loncom/interface/lonprintout.pm 2011/09/15 16:02:18 1.598
+++ loncom/interface/lonprintout.pm 2011/11/07 18:24:42 1.608
@@ -2,7 +2,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.598 2011/09/15 16:02:18 raeburn Exp $
+# $Id: lonprintout.pm,v 1.608 2011/11/07 18:24:42 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -355,7 +355,7 @@ sub generate_code_selector {
<message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
<message></td></tr><tr><td></message>
- <message><b>Bubble sheet type:</b></message>
+ <message><b>Bubblesheet type:</b></message>
<message></td><td></message>
<dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
$bubble_types
@@ -471,7 +471,7 @@ sub incomplete {
# $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
+# (really an array of resource names (array of symb's).
# $who - Student/domain for whome the sequence will be generated.
#
# Implicit inputs:
@@ -486,6 +486,7 @@ sub master_seq_to_person_seq {
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.
#
@@ -515,7 +516,8 @@ sub master_seq_to_person_seq {
my $curres;
while ($curres = $iterator->next()) {
#
- # Only process resources..that re not removed by randomout...
+ # 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();
@@ -632,9 +634,10 @@ sub include_pdf {
# (unlikely). If it did exist, add the pdf to the set of files/images that
# 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");
close (FILE);
@@ -1806,6 +1809,7 @@ sub map_laystyle {
sub print_page_in_course {
my ($helper, $rparmhash, $currentURL, $resources) = @_;
+
my %parmhash = %$rparmhash;
my @page_resources = @$resources;
my $mode = $helper->{'VARS'}->{'LATEX_TYPE'};
@@ -1862,8 +1866,10 @@ sub print_page_in_course {
}
# 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 %form;
my %moreenv;
@@ -1925,10 +1931,9 @@ sub print_page_in_course {
$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$texversion.=&path_to_problem($urlp,$LaTeXwidth);
} else {
- $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
- my $URLpath=$urlp;
- $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
- $texversion.=&path_to_problem($URLpath,$LaTeXwidth);
+ $texversion.='\vskip 0 mm \noindent\textbf{'.
+ &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+ $texversion.=&path_to_problem($urlp,$LaTeXwidth);
}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';
}
@@ -2047,7 +2052,7 @@ sub recently_generated {
# A reference to a page break hash.
#
#
-# use Data::Dumper;
+use Data::Dumper;
# sub dump_helper_vars {
# my ($helper) = @_;
# my $helpervars = Dumper($helper->{'VARS'});
@@ -2196,18 +2201,19 @@ sub set_form_extraspace {
sub print_construction_sequence {
my ($currentURL, $helper, %form, $LaTeXwidth) = @_;
-
my $result;
my $rndseed=time;
if ($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.
#
my @order = @LONCAPA::map::order;
my @resources = @LONCAPA::map::resources;
+
for (my $member=0;$member<=$#order;$member++) {
$resources[$order[$member]]=~/^([^:]*):([^:]*):/;
my $urlp=$2;
@@ -2267,14 +2273,7 @@ sub print_construction_sequence {
# IF sequence, recurse:
if ($urlp =~ /\.sequence$/) {
- my $sequence_url = $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,
+ $result .= &print_construction_sequence($urlp,
$helper, %form,
$LaTeXwidth);
}
@@ -2446,11 +2445,11 @@ ENDPART
} else {
#prints resource from the construction space
- $currentURL='/'.$helper->{'VARS'}->{'filename'};
- if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
+ $currentURL=$helper->{'VARS'}->{'filename'};
$cleanURL=$currentURL;
}
$selectionmade = 1;
+
if ($cleanURL!~m|^/adm/|
&& $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
my $rndseed=time;
@@ -2490,6 +2489,7 @@ ENDPART
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'grade_target'}='answer';
$form{'answer_output_mode'}='tex';
@@ -2511,10 +2511,10 @@ ENDPART
$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
} else {
- $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
- my $URLpath=$cleanURL;
- $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
- $texversion.=&path_to_problem($URLpath,$LaTeXwidth);
+ $texversion.='\vskip 0 mm \noindent\textbf{'.
+ &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+
+ $texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';
}
@@ -2546,10 +2546,6 @@ ENDPART
}
} elsif ($cleanURL!~m|^/adm/|
&& $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,
$LaTeXwidth);
$result .= '\end{document}';
@@ -3039,11 +3035,7 @@ ENDPART
if ($urlp=~/\//) {
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'rndseed'}=$rndseed;
- if ($urlp =~ m|/home/([^/]+)/public_html|) {
- $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
- } else {
- $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
- }
+ $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
$resources_printed .= $urlp.':';
my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
@@ -3064,19 +3056,16 @@ ENDPART
$texversion.='\vskip 0 mm \noindent ';
$texversion.=&path_to_problem ($urlp,$LaTeXwidth);
} else {
- $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
- my $URLpath=$urlp;
- $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
- $texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+ $texversion.='\vskip 0 mm \noindent\textbf{'.
+ &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+ $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';
}
}
#this chunk is responsible for printing the path to problem
- my $newurlp=$urlp;
- if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
- $newurlp=&path_to_problem($newurlp,$LaTeXwidth);
+ my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);
@@ -3125,12 +3114,7 @@ ENDPART
my $URLback=''; #link to original document
if ($helper->{'VARS'}->{'construction'} eq '1') {
- #prints resource from the construction space
- $URLback='/'.$helper->{'VARS'}->{'filename'};
- if ($URLback=~/([^?]+)/) {
- $URLback=$1;
- $URLback=~s|^/~|/priv/|;
- }
+ $URLback=$helper->{'VARS'}->{'filename'};
}
#
# Final adjustment of the font size:
@@ -3265,6 +3249,7 @@ sub print_resources {
my ($username,$userdomain,$usersection) = split /:/,$person;
my $fullname = &get_name($username,$userdomain);
my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.
+
#
# Figure out if we need to filter the output by
# the incomplete problems for that person
@@ -3469,8 +3454,6 @@ sub handler {
&init_perm();
-
-
my $helper = printHelper($r);
if (!ref($helper)) {
return $helper;
@@ -3634,8 +3617,8 @@ sub printHelper {
}
# Detect whether we're coming from construction space
- if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
- $helper->{VARS}->{'filename'} = "~$1/$2";
+ if ($env{'form.postdata'}=~m{^/priv}) {
+ $helper->{VARS}->{'filename'} = $env{'form.postdata'};
$helper->{VARS}->{'construction'} = 1;
} else {
if ($env{'form.postdata'}) {
@@ -4175,7 +4158,7 @@ CHOOSE_STUDENTS1
<message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
<message></td></tr><tr><td></message>
- <message><b>Bubble sheet type:</b></message>
+ <message><b>Bubblesheet type:</b></message>
<message></td><td></message>
<dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
$codechoice