--- loncom/interface/lonprintout.pm 2003/09/25 18:16:04 1.238 +++ loncom/interface/lonprintout.pm 2003/10/20 17:38:51 1.256 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.238 2003/09/25 18:16:04 bowersj2 Exp $ +# $Id: lonprintout.pm,v 1.256 2003/10/20 17:38:51 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,17 +25,6 @@ # # http://www.lon-capa.org/ # -# (Internal Server Error Handler -# -# (Login Screen -# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14, -# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer) -# -# 3/1/1 Gerd Kortemeyer) -# -# 3/1 Gerd Kortemeyer -# -# 9/17 Alex Sakharuk # package Apache::lonprintout; @@ -51,6 +40,7 @@ use Apache::File(); use Apache::lonnavmaps; use Apache::lonratedt; use POSIX qw(strftime); +use Apache::lonlocal; use GDBM_File; @@ -611,6 +601,56 @@ sub IndexCreation { return $texversion; } +sub print_latex_header { + my $mode=shift; + my $output='\documentclass[letterpaper]{article}'; + if ($mode eq 'batchmode') { + $output.='\batchmode'; + } + $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'. + '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'. + '\usepackage[dvips]{graphicx}\usepackage{epsfig}\usepackage{calc}'. + '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'. + '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'. + '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'. + '\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}'. + '\setlength{\abovedisplayshortskip}{-0.04in}'. + '\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'. + '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large'. + '\textbf{Index}} \newline \setlength{\rightmargin}{0in}'. + '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}'. + '\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}'. + '\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}'. + '\setlength{\abovedisplayshortskip}{-0.04in}'. + '\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}\begin{document}'; + return $output; +} + +sub path_to_problem { + my ($urlp,$LaTeXwidth)=@_; + my $newurlp = ''; + $LaTeXwidth=~s/\s*mm\s*$//; + my $HowMany = length($urlp)*2; + if ($HowMany > $LaTeXwidth) { + my @temporrary = split '/',$urlp; + my $HowManyNew = 0; + for (my $ii=0;$ii<=$#temporrary;$ii++) { + if ($temporrary[$ii] ne '') { + $HowManyNew += length($temporrary[$ii])*2; + if ($HowManyNew < $LaTeXwidth ) { + $newurlp .= '/'.$temporrary[$ii]; + } else { + $HowManyNew = 0; + $newurlp .= '|\vskip -1 mm \noindent \verb|'; + $ii--; + } + } + } + } else { + $newurlp=$urlp; + } + return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}'; +} sub output_data { my ($r,$helper,$rparmhash) = @_; @@ -655,38 +695,54 @@ ENDPART $currentURL=$helper->{'VARS'}->{'postdata'}; } else { #prints resource from the construction space - $currentURL=$helper->{'VARS'}->{'filename'}; - $currentURL=~s/\/home\//\/~/; - $currentURL=~s/public_html\///; + $currentURL='/'.$helper->{'VARS'}->{'filename'}; if ($currentURL=~/([^?]+)/) {$currentURL=$1;} } $selectionmade = 1; if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { - my %moreenv; - $moreenv{'request.filename'}=$currentURL; - my %form; - $form{'grade_target'}='tex'; - $form{'textwidth'}=$LaTeXwidth; - $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'}; + my $texversion=''; + if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') { + my %moreenv; + $moreenv{'request.filename'}=$currentURL; + my %form; + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; + $form{'problem_split'}=$parmhash{'problem_stream_switch'}; + $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; + if ($helper->{'VARS'}->{'curseed'}) { + $rndseed=$helper->{'VARS'}->{'curseed'}; + } + $form{'rndseed'}=$rndseed; + &Apache::lonnet::appenv(%moreenv); + &Apache::lonnet::delenv('form.counter'); + &Apache::lonxml::init_counter(); + $texversion=&Apache::lonnet::ssi($currentURL,%form); + &Apache::lonnet::delenv('form.counter'); + &Apache::lonnet::delenv('request.filename'); } - $form{'rndseed'}=$rndseed; - &Apache::lonnet::appenv(%moreenv); - &Apache::lonnet::delenv('form.counter'); - &Apache::lonxml::init_counter(); - my $texversion=&Apache::lonnet::ssi($currentURL,%form); - &Apache::lonnet::delenv('form.counter'); - &Apache::lonnet::delenv('request.filename'); - if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || + ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) { my %form; $form{'grade_target'}='answer'; $form{'answer_output_mode'}='tex'; $form{'rndseed'}=$rndseed; my $answer=&Apache::lonnet::ssi($currentURL,%form); - $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; + if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; + } else { + $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); + if ($helper->{'VARS'}->{'construction'} ne '1') { + $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm '; + $texversion.=&path_to_problem ($currentURL,$LaTeXwidth); + } else { + $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm '; + my $URLpath=$currentURL; + $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/; + $texversion.=&path_to_problem ($URLpath,$LaTeXwidth); + } + $texversion.='\vskip 1 mm '.$answer.'\end{document}'; + } } if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') { $texversion=&IndexCreation($texversion,$currentURL); @@ -712,22 +768,33 @@ ENDPART $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 $texversion=''; + if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') { + 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; + $texversion=&Apache::lonnet::ssi($urlp,%form); + } + if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || + ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && + ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) { 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 ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; + } else { + $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); + $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm '; + $texversion.=&path_to_problem ($currentURL,$LaTeXwidth); + $texversion.='\vskip 1 mm '.$answer.'\end{document}'; + } } if ($flag_latex_header_remove ne 'NO') { $texversion = &latex_header_footer_remove($texversion); @@ -761,7 +828,8 @@ ENDPART } } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or - ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { + ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') or + ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) { #-- produce an output string my %form=(); $form{'grade_target'}='tex'; @@ -783,10 +851,13 @@ ENDPART $selectionmade = 3; } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') { $selectionmade = 4; + } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') { + $selectionmade = 7; } $form{'symb'}=$master_seq[$i]; my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]); my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem + if ($i==0) {$prevassignment=$assignment;} #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]"); my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($urlp=~/\.page$/) { @@ -795,24 +866,36 @@ ENDPART $texversion =~ s/\\end{document}\d*/\\end{document}/; $flag_page_in_sequence = 'YES'; } - if ($flag_latex_header_remove ne 'NO') { - $texversion = &latex_header_footer_remove($texversion); - } else { - $texversion =~ s/\\end{document}//; - } - if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || + ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) { my %form; $form{'grade_target'}='answer'; $form{'answer_output_mode'}='tex'; my $answer=&Apache::lonnet::ssi($urlp,%form); - $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; + if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; + } else { + if ($urlp=~/\.(problem|exam|quiz|library)$/) { + $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); + $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($urlp).'}\vskip 0 mm '; + $texversion.=&path_to_problem ($urlp,$LaTeXwidth); + $texversion.='\vskip 1 mm '.$answer; + } else { + $texversion=''; + } + } + } + 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 (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) { - my ($name,$courseidinfo) = &get_name; - $courseidinfo = &get_course(); + if (($selectionmade == 4) and ($assignment ne $prevassignment)) { + my $name = &get_name(); + my $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 '; @@ -823,9 +906,13 @@ ENDPART &Apache::lonnet::delenv('form.counter'); if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;} $result .= '\end{document}'; - } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') { + } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') || ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')) { #-- prints assignments for whole class or for selected students - $selectionmade=5; + if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') { + $selectionmade=5; + } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') { + $selectionmade=8; + } my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'}; my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'}; #loop over students @@ -845,22 +932,30 @@ ENDPART &Apache::lonnet::delenv('form.counter'); &Apache::lonxml::init_counter(); foreach my $curresline (@master_seq) { - if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) { + if ((($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) && ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students')) || ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')) { 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'); - if ($flag_latex_header_remove eq 'YES') { - $rendered = &latex_header_footer_remove($rendered); - } else { - $rendered =~ s/\\end{document}//; - } - if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || + ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) { my %form; $form{'answer_output_mode'}='tex'; $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form); - $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/; + if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/; + } else { + $rendered=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); + $rendered.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm '; + $rendered.=&path_to_problem ($curresline,$LaTeXwidth); + $rendered.='\vskip 1 mm '.$ansrendered; + } + } + if ($flag_latex_header_remove eq 'YES') { + $rendered = &latex_header_footer_remove($rendered); + } else { + $rendered =~ s/\\end{document}//; } $current_output .= $rendered; } @@ -881,7 +976,7 @@ ENDPART &Apache::lonnet::delenv('form.counter'); &Apache::lonxml::init_counter(); &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - 'last student '.$fullname); + &mt('last student').' '.$fullname); } &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); $result .= '\end{document}'; @@ -898,6 +993,7 @@ ENDPART } for (my $i=0;$i<=$#list_of_files;$i++) { my $urlp = $list_of_files[$i]; + $urlp=~s|//|/|; if ($urlp=~/\//) { my %form; $form{'grade_target'}='tex'; @@ -909,35 +1005,35 @@ ENDPART $urlp =~ s|^/home/httpd/html||; } my $texversion=&Apache::lonnet::ssi($urlp,%form); - if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || + ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) { my %form; $form{'grade_target'}='answer'; $form{'answer_output_mode'}='tex'; $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; $form{'rndseed'}=$rndseed; my $answer=&Apache::lonnet::ssi($urlp,%form); - $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; - } - #this chunck is responsible for printing the path to problem - my $newurlp = ''; - my $HowMany = length($urlp)*2; - if ($HowMany > $LaTeXwidth) { - my @temporrary = split '/',$urlp; - my $HowManyNew = 0; - for (my $ii=0;$ii<=$#temporrary;$ii++) { - if ($temporrary[$ii] ne '') { - $HowManyNew += length($temporrary[$ii])*2; - if ($HowManyNew < $LaTeXwidth ) { - $newurlp .= '/'.$temporrary[$ii]; - } else { - $HowManyNew = 0; - $newurlp .= '|\vskip -1 mm \noindent \verb|'; - $ii--; - } + if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; + } else { + $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); + if ($helper->{'VARS'}->{'construction'} ne '1') { + $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 1 mm '.$answer.'\end{document}'; } } - $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/; + #this chunck 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); + $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/; if ($flag_latex_header_remove ne 'NO') { $texversion = &latex_header_footer_remove($texversion); } else { @@ -978,11 +1074,22 @@ ENDPART unless ($temp_file = Apache::File->new('>'.$filename)) { $r->log_error("Couldn't open $filename for output $!"); return SERVER_ERROR; - } + } + +######## + my $identifier = time.'_'.int(rand(1000)); + &Apache::lonnet::appenv($identifier.'.file' => $filename, + $identifier.'.layout' => $laystyle, + $identifier.'.numcol' => $numberofcolumns, + $identifier.'.selection' => $selectionmade); + +## +######## + print $temp_file $result; $r->print(< + FINALEND @@ -1047,9 +1154,9 @@ sub printHelper { if ($r->header_only) { if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); + &Apache::loncommon::content_type($r,'text/xml'); } else { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); } $r->send_http_header; return OK; @@ -1057,9 +1164,9 @@ sub printHelper { # Send header, nocache if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); + &Apache::loncommon::content_type($r,'text/xml'); } else { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); } &Apache::loncommon::no_cache($r); $r->send_http_header; @@ -1148,9 +1255,6 @@ sub printHelper { # "Remove all duplicate slashes." $subdir =~ s|/+|/|g; - # If it's a ~ directory, convert back to /home/user/public_html - $subdir =~ s/^~(\w+)\//\/home\/$1\/public_html\//; - # What can be printed is a very dynamic decision based on # lots of factors. So we need to dynamically build this list. # To prevent security leaks, states are only added to the wizard @@ -1165,8 +1269,8 @@ sub printHelper { my $printChoices = []; my $paramHash; - if ($resourceTitle && $helper->{VARS}->{'postdata'}) { - push @{$printChoices}, ["$resourceTitle (what you just saw on the screen)", 'current_document', 'PAGESIZE']; + if ($resourceTitle) { + push @{$printChoices}, ["$resourceTitle (what you just saw on the screen)", 'current_document', 'PAGESIZE']; } # $r->print($helper->{VARS}->{'postdata'}); @@ -1189,11 +1293,12 @@ sub printHelper { # If we're in a sequence... if (($helper->{'VARS'}->{'construction'} ne '1') && - $helper->{VARS}->{'postdata'} && $sequenceTitle) { + $helper->{VARS}->{'postdata'} && + $helper->{VARS}->{'assignment'}) { # Allow problems from sequence - push @{$printChoices}, ["Problems in $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS']; + push @{$printChoices}, ["Problems in $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS']; # Allow all resources from sequence - push @{$printChoices}, ["Resources in $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML']; + push @{$printChoices}, ["Resources in $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML']; my $helperFragment = < @@ -1223,9 +1328,9 @@ HELPERFRAGMENT # If the user is priviledged, allow them to print all # problems in the course, optionally for selected students if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) { - push @{$printChoices}, ['Problems from entire course', 'all_problems', 'ALL_PROBLEMS']; - if ($sequenceTitle) { - push @{$printChoices}, ["Problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS']; + push @{$printChoices}, ['Problems from entire course', 'all_problems', 'ALL_PROBLEMS']; + if ($helper->{VARS}->{'assignment'}) { + push @{$printChoices}, ["Problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS']; } &Apache::lonxml::xmlparse($r, 'helper', <
Select resources for the assignment
 - return $isProblem + return $isProblem; $map - return $symbFilter + return $symbFilter;
How should the results be printed?
 @@ -1257,11 +1362,34 @@ HELPERFRAGMENT CHOOSE_STUDENTS + + if ($helper->{VARS}->{'assignment'}) { + push @{$printChoices}, ["Resources from $sequenceTitle for selected students", 'resources_for_students', 'CHOOSE_STUDENTS1']; + } + &Apache::lonxml::xmlparse($r, 'helper', < + +
Select resources for the assignment
 + + return $isNotMap; + $map + return $symbFilter; + +
How should the results be printed?
 + + Start each student\'s assignment on a new page/column (add a pagefeed after each assignment) + Add one empty page/column after each student\'s assignment + Add two empty pages/column after each student\'s assignment + Add three empty pages/column after each student\'s assignment + + +CHOOSE_STUDENTS1 + } # FIXME: That RE should come from a library somewhere. if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'} and $subdir ne '/home/httpd/html/res/') { - push @{$printChoices}, ["Problems from current subdirectory $subdir", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR']; + push @{$printChoices}, ["Problems from current subdirectory $subdir", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR']; my $f = '$filename'; my $xmlfrag = <selected sequence in course", - 'map_problems_pages', 'CHOOSE_SEQUENCE']; - &Apache::lonxml::xmlparse($r, 'helper', <{VARS}->{'construction'}) { + push @$printChoices, ["Resources from selected sequence in course", + 'select_sequences', 'CHOOSE_SEQUENCE']; + my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'}; + #Escape apostrophes and backslashes for Perl + $escapedSequenceName =~ s/\\/\\\\/g; + $escapedSequenceName =~ s/'/\\'/g; + &Apache::lonxml::xmlparse($r, 'helper', < Select the sequence to print resources from: @@ -1302,11 +1435,12 @@ CHOOSE_FROM_SUBDIR PAGESIZE return $isProblem - return $helper->{VARS}->{'SEQUENCE'}; + return '$escapedSequenceName'; return $symbFilter; CHOOSE_FROM_ANY_SEQUENCE +} # Generate the first state, to select which resources get printed. Apache::lonhelper::state->new("START", "Select Printing Options:"); @@ -1324,13 +1458,14 @@ CHOOSE_FROM_ANY_SEQUENCE if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or ($helper->{VARS}->{'construction'} eq '1')) { - addMessage("
Print With Answers:"); + addMessage("
"); $startedTable = 1;
Print: "); $paramHash = Apache::lonhelper::getParamHash(); $paramHash->{'variable'} = 'ANSWER_TYPE'; $helper->declareVar('ANSWER_TYPE'); $paramHash->{CHOICES} = [ - ['No', 'yes'], - ['Yes', 'no'] ]; + ['Without Answers', 'yes'], + ['With Answers', 'no'], + ['Only Answers', 'only'] ]; Apache::lonhelper::dropdown->new(); addMessage("