--- loncom/interface/lonprintout.pm 2003/09/25 18:16:04 1.238 +++ loncom/interface/lonprintout.pm 2003/10/01 19:51:31 1.246 @@ -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.246 2003/10/01 19:51:31 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -611,6 +611,54 @@ 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--; + } + } + } + } + return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}'; +} sub output_data { my ($r,$helper,$rparmhash) = @_; @@ -655,38 +703,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 +776,32 @@ 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')) { 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); @@ -787,6 +861,7 @@ ENDPART $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 + my $texversion=''; #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]"); my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($urlp=~/\.page$/) { @@ -795,17 +870,25 @@ 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 { + $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 ($urlp,$LaTeXwidth); + $texversion.='\vskip 1 mm '.$answer; + } + } + 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); @@ -919,25 +1002,8 @@ ENDPART $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--; - } - } - } - } - $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/; + 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); } else { @@ -1047,9 +1113,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 +1123,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 +1214,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,7 +1228,7 @@ sub printHelper { my $printChoices = []; my $paramHash; - if ($resourceTitle && $helper->{VARS}->{'postdata'}) { + if ($resourceTitle) { push @{$printChoices}, ["$resourceTitle (what you just saw on the screen)", 'current_document', 'PAGESIZE']; } @@ -1189,7 +1252,8 @@ 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']; # Allow all resources from sequence @@ -1224,7 +1288,7 @@ HELPERFRAGMENT # 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) { + if ($helper->{VARS}->{'assignment'}) { push @{$printChoices}, ["Problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS']; } @@ -1286,9 +1350,14 @@ CHOOSE_FROM_SUBDIR # Allow the user to select any sequence in the course, feed it to # another resource selector for that sequence - push @$printChoices, ["Resources from selected sequence in course", - 'map_problems_pages', 'CHOOSE_SEQUENCE']; - &Apache::lonxml::xmlparse($r, 'helper', <{VARS}->{'construction'}) { + push @$printChoices, ["Resources from selected sequence in course", + 'map_problems_pages', '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 +1371,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 +1394,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("