--- loncom/interface/lonprintout.pm 2003/08/13 17:38:55 1.210
+++ loncom/interface/lonprintout.pm 2003/09/16 20:03:12 1.235
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.210 2003/08/13 17:38:55 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.235 2003/09/16 20:03:12 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -49,6 +49,7 @@ use Apache::grades;
use Apache::edit;
use Apache::File();
use Apache::lonnavmaps;
+use Apache::lonratedt;
use POSIX qw(strftime);
use GDBM_File;
@@ -465,41 +466,49 @@ sub page_format {
sub get_name {
my ($uname,$udom)=@_;
if (!defined($uname)) { $uname=$ENV{'user.name'}; }
- if (!defined($udom)) { $uname=$ENV{'user.domain'}; }
+ if (!defined($udom)) { $udom=$ENV{'user.domain'}; }
my $plainname=&Apache::loncommon::plainname($uname,$udom);
- if ($plainname=~/^\s*$/) { $plainname=$uname; }
- return &Apache::lonxml::latex_special_symbols($plainname,undef,undef,
- 'header');
+ if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; }
+ $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
+ return $plainname;
}
+sub get_course {
+ my $courseidinfo;
+ if (defined($ENV{'request.course.id'})) {
+ $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'header');
+ }
+ return $courseidinfo;
+}
sub page_format_transformation {
- my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents) = @_;
+ my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist) = @_;
my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
- $assignment=~s/_/ /g;
- if ($numberofcolumns != 1) {
- ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
- } else {
- ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
- }
- my $name = &get_name();
- if ($name =~ /^\s*$/) {
- $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
- undef,'header');
+ $assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
+ if ($numberofcolumns != 1) {
+ ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
+ } else {
+ ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
}
- my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
+ my $name = &get_name();
+ my $courseidinfo = &get_course();
+ if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
if ($layout eq 'album') {
my $topmargintoinsert = '';
if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
- $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}} \\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;
+ $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}} \\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;
} elsif ($layout eq 'book') {
if ($choice ne 'All class print') {
- $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
+ $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
} else {
$text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1} \\vskip 5 mm /;
}
}
- if ($tableofcontents eq 'yes') {$text=~s/(\\begin{document})/$1 \\tableofcontents \\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/1\]\[b\]{\\hrulefill}/;}
+ if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}
+ if ($indexlist eq 'yes') {
+ $text=~s/(\\begin{document})/\\makeindex $1/;
+ $text=~s/(\\end{document})/\\strut\\\\\\strut\\printindex $1/;
+ }
return $text;
}
@@ -522,7 +531,7 @@ sub details_for_menu {
my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
- my ($map,$id,$resource)=split(/___/,$symbolic);
+ my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
$map=&Apache::lonnet::clutter($map);
my $name_of_sequence;
$name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}};
@@ -574,6 +583,35 @@ sub latex_corrections {
}
+sub index_table {
+ my $currentURL = shift;
+ my $insex_string='';
+ $currentURL=~s/\.([^\/+])$/\.$1\.meta/;
+ $insex_string=&Apache::lonnet::metadata($currentURL,'keywords');
+ return $insex_string;
+}
+
+
+sub IndexCreation {
+ my ($texversion,$currentURL)=@_;
+ my @key_words=split(/,/,&index_table($currentURL));
+ my $chunk='';
+ my $st=index $texversion,'\addcontentsline{toc}{subsection}{';
+ if ($st>0) {
+ for (my $i=0;$i<3;$i++) {$st=(index $texversion,'}',$st+1);}
+ $chunk=substr($texversion,0,$st+1);
+ substr($texversion,0,$st+1)=' ';
+ }
+ foreach my $key_word (@key_words) {
+ if ($key_word=~/\S+/) {
+ $texversion=~s/\b($key_word)\b/$1 \\index{$key_word} /i;
+ }
+ }
+ if ($st>0) {substr($texversion,0,1)=$chunk;}
+ return $texversion;
+}
+
+
sub output_data {
my ($r,$helper,$rparmhash) = @_;
my %parmhash = %$rparmhash;
@@ -632,6 +670,9 @@ ENDPART
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
my $rndseed=time;
+ if ($helper->{'VARS'}->{'curseed'}) {
+ $rndseed=$helper->{'VARS'}->{'curseed'};
+ }
$form{'rndseed'}=$rndseed;
&Apache::lonnet::appenv(%moreenv);
&Apache::lonnet::delenv('form.counter');
@@ -647,12 +688,68 @@ ENDPART
my $answer=&Apache::lonnet::ssi($currentURL,%form);
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
}
+ if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ $texversion=&IndexCreation($texversion,$currentURL);
+ }
+ if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
+
+ }
$result .= $texversion;
if ($currentURL=~m/\.page\s*$/) {
($result,$number_of_columns) = &page_cleanup($result);
}
+ } elsif ($currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
+ #printing content of sequence from the construction space
+ my $flag_latex_header_remove = 'NO';
+ my $rndseed=time;
+ if ($helper->{'VARS'}->{'curseed'}) {
+ $rndseed=$helper->{'VARS'}->{'curseed'};
+ }
+ $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
+ my $errtext=&Apache::lonratedt::mapread($currentURL);
+ for (my $member=0;$member<=$#Apache::lonratedt::order;$member++) {
+ $Apache::lonratedt::resources[$Apache::lonratedt::order[$member]]=~/^([^:]*):([^:]*):/;
+ my $urlp=$2;
+ if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
+ my %form;
+ $form{'grade_target'}='tex';
+ $form{'textwidth'}=$LaTeXwidth;
+ $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ $form{'rndseed'}=$rndseed;
+ my $texversion=&Apache::lonnet::ssi($urlp,%form);
+ if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ my %form;
+ $form{'grade_target'}='answer';
+ $form{'answer_output_mode'}='tex';
+ $form{'rndseed'}=$rndseed;
+ if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}
+ ####my $answer=' SSSSSS '.$ENV{'request.state'}.' FFFFFFF ';
+ my $answer=&Apache::lonnet::ssi($urlp,%form);
+ $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ }
+ if ($flag_latex_header_remove ne 'NO') {
+ $texversion = &latex_header_footer_remove($texversion);
+ } else {
+ $texversion =~ s/\\end{document}//;
+ }
+ if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ $texversion=&IndexCreation($texversion,$urlp);
+ }
+ if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URpL'} eq 'yes') {
+ $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+ }
+ $result.=$texversion;
+ $flag_latex_header_remove = 'YES';
+ } elsif ($urlp=~/\.(sequence|page)$/) {
+ $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
+ }
+ }
+ if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
+ $result .= '\end{document}';
} else {
- $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
+ $result.='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
if ($currentURL=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
$result.=$1;
} elsif ($currentURL=~/\/ext\//) {
@@ -689,7 +786,7 @@ ENDPART
}
$form{'symb'}=$master_seq[$i];
$master_seq[$i]=~/(.*)___\d*___/;
- my $assignment=&Apache::lonnet::gettitle($1); #tittle of the assignment which contains this problem
+ my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($1),'header'); #tittle of the assignment which contains this problem
#&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
my $texversion=&Apache::lonnet::ssi($urlp,%form);
if ($urlp=~/\.page$/) {
@@ -710,16 +807,15 @@ ENDPART
my $answer=&Apache::lonnet::ssi($urlp,%form);
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
}
-# $result .= $texversion;
+ if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ $texversion=&IndexCreation($texversion,$urlp);
+ }
if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {
- my $name = &get_name();
- if ($name =~ /^\s*$/) {
- $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
- undef,'header');
- }
- my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
+ my ($name,$courseidinfo) = &get_name;
+ $courseidinfo = &get_course();
+ if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
$prevassignment=$assignment;
- $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
+ $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
}
$result .= $texversion;
$flag_latex_header_remove = 'YES';
@@ -750,7 +846,7 @@ ENDPART
&Apache::lonxml::init_counter();
foreach my $curresline (@master_seq) {
if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
- my ($map,$id,$res_url) = split(/___/,$curresline);
+ my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
if (&Apache::lonnet::allowed('bre',$res_url)) {
my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
$ENV{'request.course.id'},'tex');
@@ -771,13 +867,15 @@ ENDPART
$flag_latex_header_remove = 'YES';
}
}
- my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ my $courseidinfo = &get_course();
+ if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+ my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
if ($current_output=~/\\documentclass/) {
- $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$helper->{VARS}->{'assignment'}}}\\vskip 3 mm /;
+ $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
} else {
my $blanspages = '';
for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
- $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$helper->{VARS}->{'assignment'}.'}}} \vskip -5 mm '.$current_output;
+ $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}}} \vskip -5 mm '.$current_output;
}
$result .= $current_output;
&Apache::lonnet::delenv('form.counter');
@@ -795,6 +893,9 @@ ENDPART
@list_of_files=sort @list_of_files;
my $flag_latex_header_remove = 'NO';
my $rndseed=time;
+ if ($helper->{'VARS'}->{'curseed'}) {
+ $rndseed=$helper->{'VARS'}->{'curseed'};
+ }
for (my $i=0;$i<=$#list_of_files;$i++) {
my $urlp = $list_of_files[$i];
if ($urlp=~/\//) {
@@ -842,6 +943,13 @@ ENDPART
} else {
$texversion =~ s/\\end{document}//;
}
+ if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ $texversion=&IndexCreation($texversion,$urlp);
+ }
+ if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+
+ }
$result .= $texversion;
}
$flag_latex_header_remove = 'YES';
@@ -850,7 +958,7 @@ ENDPART
$result .= '\end{document}';
}
#-------------------------------------------------------- corrections for the different page formats
- $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'});
+ $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'});
$result = &latex_corrections($number_of_columns,$result);
#changes page's parameters for the one column output
if ($numberofcolumns == 1) {
@@ -859,7 +967,11 @@ ENDPART
$result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
$result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
}
- if ($helper->{'VARS'}->{'TABLE_CONTENTS'} eq 'yes') {$selectionmade+=10;}
+ if ($helper->{'VARS'}->{'TABLE_CONTENTS'} eq 'yes') {$selectionmade*=10;}
+ if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ if ($selectionmade<10) {$selectionmade*=100;} else {$selectionmade*=10;}
+ }
+ if ($ENV{'request.role.adv'}) {$selectionmade*=10000;}
#-- writing .tex file in prtspool
my $temp_file;
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
@@ -916,6 +1028,13 @@ sub handler {
use Apache::lonhelper;
+sub addMessage {
+ my $text = shift;
+ my $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{MESSAGE_TEXT} = $text;
+ Apache::lonhelper::message->new();
+}
+
sub printHelper {
my $r = shift;
@@ -952,6 +1071,7 @@ sub printHelper {
my $helper = Apache::lonhelper::helper->new("Printing Helper");
$helper->declareVar('symb');
$helper->declareVar('postdata');
+ $helper->declareVar('curseed');
$helper->declareVar('filename');
$helper->declareVar('construction');
$helper->declareVar('assignment');
@@ -960,7 +1080,7 @@ sub printHelper {
# very first screen.
# Detect whether we're coming from construction space
if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
- $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
+ $helper->{VARS}->{'filename'} = "~$1/$2";
$helper->{VARS}->{'construction'} = 1;
} else {
if ($ENV{'form.postdata'}) {
@@ -998,7 +1118,7 @@ sub printHelper {
$subdir = substr($helper->{VARS}->{'filename'},
0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
} else {
- ($map, $id, $url) = split(/___/, $symb);
+ ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
$helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
@@ -1007,8 +1127,14 @@ sub printHelper {
}
$subdir = &Apache::lonnet::filelocation("", $url);
}
+ if (!$helper->{VARS}->{'curseed'} && $ENV{'form.curseed'}) {
+ $helper->{VARS}->{'curseed'}=$ENV{'form.curseed'};
+ }
my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
+ my $userPriviledged = ($ENV{'request.role'}=~m/^cc\./ or
+ $ENV{'request.role'}=~m/^in\./ or
+ $ENV{'request.role'}=~m/^ta\./);
Apache::lonhelper::registerHelperTags();
@@ -1034,18 +1160,19 @@ sub printHelper {
my $printChoices = [];
my $paramHash;
- if ($resourceTitle) {
- push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+ if ($resourceTitle && $helper->{VARS}->{'postdata'}) {
+ push @{$printChoices}, ["<b>$resourceTitle</b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
}
# $r->print($helper->{VARS}->{'postdata'});
# If we're in a sequence...
- if ($helper->{'VARS'}->{'construction'} ne '1') {
+ if (($helper->{'VARS'}->{'construction'} ne '1') &&
+ $helper->{VARS}->{'postdata'}) {
# Allow problems from sequence
- push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+ push @{$printChoices}, ["<b>Selected problems</b> in $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS'];
# Allow all resources from sequence
- push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+ push @{$printChoices}, ["<b>Selected resources</b> in $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
my $isProblem = '$res->is_problem()';
$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
@@ -1056,7 +1183,7 @@ sub printHelper {
my $helperFragment = <<HELPERFRAGMENT;
<state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
<message>(mark them then click "next" button) <br /></message>
- <resource variable="RESOURCES" multichoice="1" toponly='1'>
+ <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
@@ -1066,7 +1193,7 @@ sub printHelper {
<state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
<message>(mark them then click "next" button) <br /></message>
- <resource variable="RESOURCES" multichoice="1" toponly='1'>
+ <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>
@@ -1080,9 +1207,9 @@ HELPERFRAGMENT
# If the user is priviledged, allow them to print all
# problems in the course, optionally for selected students
- if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($helper->{VARS}->{'postdata'}=~/\/res\//)) {
- push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];
- push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
+ if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) {
+ push @{$printChoices}, ['Selected problems from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+ push @{$printChoices}, ["Selected problems from $sequenceTitle for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
my $isProblem = '$res->is_problem()';
$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
@@ -1092,7 +1219,8 @@ HELPERFRAGMENT
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
<state name="ALL_PROBLEMS" title="Select Problem(s) to print">
<message>(mark them then click "next" button) <br /></message>
- <resource variable="RESOURCES" multichoice="1" suppressEmptySequences='1'>
+ <resource variable="RESOURCES" multichoice="1"
+ suppressEmptySequences='1' addstatus="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblemOrMap;</filterfunc>
<choicefunc>return $isProblem;</choicefunc>
@@ -1100,10 +1228,10 @@ HELPERFRAGMENT
</resource>
</state>
- <state name="CHOOSE_STUDENTS" title="Choose Students whose assignments you want to print">
+ <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
<student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
<message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
- <resource variable="RESOURCES" multichoice="1">
+ <resource variable="RESOURCES" multichoice="1" addstatus="1">
<filterfunc>return $isProblem</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symb</valuefunc>
@@ -1133,8 +1261,8 @@ CHOOSE_STUDENTS
CHOOSE_FROM_SUBDIR
$xmlfrag .= <<'CHOOSE_FROM_SUBDIR';
- <filefilter>return $filename =~
- m/\.(problem|exam|quiz|assess|survey|form|library)$/;
+ <filefilter>return Apache::lonhelper::files::not_old_version($filename) &&
+ $filename =~ m/\.(problem|exam|quiz|assess|survey|form|library)$/;
</filefilter>
</files>
</state>
@@ -1143,7 +1271,7 @@ CHOOSE_FROM_SUBDIR
}
# Generate the first state, to select which resources get printed.
- Apache::lonhelper::state->new("START", "What do you want to print? Make a choice.");
+ Apache::lonhelper::state->new("START", "Select Printing Options:");
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{MESSAGE_TEXT} = "";
Apache::lonhelper::message->new();
@@ -1153,43 +1281,45 @@ CHOOSE_FROM_SUBDIR
$paramHash->{CHOICES} = $printChoices;
Apache::lonhelper::choices->new();
+ my $startedTable = 0; # have we started an HTML table yet? (need
+ # to close it later)
+
if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or
($helper->{VARS}->{'construction'} eq '1')) {
- $paramHash = Apache::lonhelper::getParamHash();
- $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users: </i></b></big>";
- Apache::lonhelper::message->new();
+ addMessage("<hr width='33%' /><table><tr><td align='right'>Print With Answers:</td><td>");
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'ANSWER_TYPE';
$helper->declareVar('ANSWER_TYPE');
$paramHash->{CHOICES} = [
- ['Print without answer', 'yes'],
- ['Print with answers', 'no'] ];
+ ['No', 'yes'],
+ ['Yes', 'no'] ];
Apache::lonhelper::dropdown->new();
+ addMessage("</td></tr>");
+ $startedTable = 1;
}
if ($ENV{'request.role.adv'}) {
- $paramHash = Apache::lonhelper::getParamHash();
- $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Another option available only for advanced users: </i></b></big>";
- Apache::lonhelper::message->new();
+ if (!$startedTable) {
+ addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
+ $startedTable = 1;
+ } else {
+ addMessage("<tr><td align='right'>LaTeX mode: </td><td>");
+ }
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'LATEX_TYPE';
$helper->declareVar('LATEX_TYPE');
if ($helper->{VARS}->{'construction'} eq '1') {
$paramHash->{CHOICES} = [
- ['Print in standard LaTeX mode', 'standard'],
- ['Print in LaTeX batchmode', 'batchmode'], ];
+ ['standard LaTeX mode', 'standard'],
+ ['LaTeX batchmode', 'batchmode'], ];
} else {
$paramHash->{CHOICES} = [
- ['Print in LaTeX batchmode', 'batchmode'],
- ['Print in standard LaTeX mode', 'standard'] ];
+ ['LaTeX batchmode', 'batchmode'],
+ ['standard LaTeX mode', 'standard'] ];
}
Apache::lonhelper::dropdown->new();
- }
-
-
- $paramHash = Apache::lonhelper::getParamHash();
- $paramHash->{MESSAGE_TEXT} = "<br /><big><b>Print with <i>Table of Contents: </i></b></big>";
- Apache::lonhelper::message->new();
+
+ addMessage("</td></tr><tr><td align='right'>Print Table of Contents: </td><td>");
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'TABLE_CONTENTS';
$helper->declareVar('TABLE_CONTENTS');
@@ -1197,7 +1327,48 @@ CHOOSE_FROM_SUBDIR
['No', 'no'],
['Yes', 'yes'] ];
Apache::lonhelper::dropdown->new();
+ addMessage("</td></tr>");
+
+ if (not $helper->{VARS}->{'construction'}) {
+ addMessage("<tr><td align='right'>Print Index: </td><td>");
+ $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{'variable'} = 'TABLE_INDEX';
+ $helper->declareVar('TABLE_INDEX');
+ $paramHash->{CHOICES} = [
+ ['No', 'no'],
+ ['Yes', 'yes'] ];
+ Apache::lonhelper::dropdown->new();
+ addMessage("</td></tr>");
+ }
+ if ($helper->{VARS}->{'construction'}) {
+ addMessage("<tr><td align='right'>Print With URL: </td><td>");
+ $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{'variable'} = 'CONSTR_RESOURSE_URL';
+ $helper->declareVar('CONSTR_RESOURSE_URL');
+ $paramHash->{CHOICES} = [
+ ['No', 'no'],
+ ['Yes', 'yes'] ];
+ Apache::lonhelper::dropdown->new();
+ addMessage("</td></tr>");
+ }
+ if ($helper->{'VARS'}->{'construction'}) {
+ my $xmlfrag .= <<'RNDSEED';
+ <message><tr><td align='right'>Use random seed: </td><td></message>
+ <string variable="curseed" size="15" maxlength="15">
+ <defaultvalue>
+ return $helper->{VARS}->{'curseed'};
+ </defaultvalue>
+ </string>
+ <message></td></tr></message>
+RNDSEED
+ &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+ }
+ }
+
+ if ($startedTable) {
+ addMessage("</table>");
+ }
Apache::lonprintout::page_format_state->new("FORMAT");
@@ -1287,7 +1458,7 @@ sub render {
$result .= <<STATEHTML;
-<p><big><i><b>What page format do you prefer?</b></i></big></p>
+<hr width="33%" />
<table cellpadding="3">
<tr>
<td align="center"><b>Page layout</b></td>