--- loncom/interface/lonprintout.pm 2003/06/19 15:46:42 1.191
+++ loncom/interface/lonprintout.pm 2003/10/15 18:01:10 1.255
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.191 2003/06/19 15:46:42 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.255 2003/10/15 18:01:10 www 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;
@@ -49,7 +38,9 @@ use Apache::grades;
use Apache::edit;
use Apache::File();
use Apache::lonnavmaps;
+use Apache::lonratedt;
use POSIX qw(strftime);
+use Apache::lonlocal;
use GDBM_File;
@@ -286,6 +277,7 @@ sub character_chart {
$result =~ s/&(mu|\#956);/\$\\mu \$/g;
$result =~ s/&(nu|\#957);/\$\\nu \$/g;
$result =~ s/&(xi|\#958);/\$\\xi \$/g;
+ $result =~ s/&(omicron|\#959);/o/g;
$result =~ s/&(pi|\#960);/\$\\pi \$/g;
$result =~ s/&(rho|\#961);/\$\\rho \$/g;
$result =~ s/&(sigma|\#963);/\$\\sigma \$/g;
@@ -295,17 +287,88 @@ sub character_chart {
$result =~ s/&(chi|\#967);/\$\\chi \$/g;
$result =~ s/&(psi|\#968);/\$\\psi \$/g;
$result =~ s/&(omega|\#969);/\$\\omega \$/g;
+ $result =~ s/&(thetasym|\#977);/\$\\vartheta \$/g;
+ $result =~ s/&(piv|\#982);/\$\\varpi \$/g;
+ $result =~ s/&(Alpha|\#913);/A/g;
+ $result =~ s/&(Beta|\#914);/B/g;
$result =~ s/&(Gamma|\#915);/\$\\Gamma \$/g;
$result =~ s/&(Delta|\#916);/\$\\Delta \$/g;
+ $result =~ s/&(Epsilon|\#917);/E/g;
+ $result =~ s/&(Zeta|\#918);/Z/g;
+ $result =~ s/&(Eta|\#919);/H/g;
$result =~ s/&(Theta|\#920);/\$\\Theta \$/g;
+ $result =~ s/&(Iota|\#921);/I/g;
+ $result =~ s/&(Kappa|\#922);/K/g;
$result =~ s/&(Lambda|\#923);/\$\\Lambda \$/g;
+ $result =~ s/&(Mu|\#924);/M/g;
+ $result =~ s/&(Nu|\#925);/N/g;
$result =~ s/&(Xi|\#926);/\$\\Xi \$/g;
+ $result =~ s/&(Omicron|\#927);/O/g;
$result =~ s/&(Pi|\#928);/\$\\Pi \$/g;
+ $result =~ s/&(Rho|\#929);/P/g;
$result =~ s/&(Sigma|\#931);/\$\\Sigma \$/g;
+ $result =~ s/&(Tau|\#932);/T/g;
$result =~ s/&(Upsilon|\#933);/\$\\Upsilon \$/g;
$result =~ s/&(Phi|\#934);/\$\\Phi \$/g;
+ $result =~ s/&(Chi|\#935);/X/g;
$result =~ s/&(Psi|\#936);/\$\\Psi \$/g;
$result =~ s/&(Omega|\#937);/\$\\Omega \$/g;
+#Arrows (extended HTML 4.01)
+ $result =~ s/&(larr|\#8592);/\$\\leftarrow \$/g;
+ $result =~ s/&(uarr|\#8593);/\$\\uparrow \$/g;
+ $result =~ s/&(rarr|\#8594);/\$\\rightarrow \$/g;
+ $result =~ s/&(darr|\#8595);/\$\\downarrow \$/g;
+ $result =~ s/&(harr|\#8596);/\$\\leftrightarrow \$/g;
+ $result =~ s/&(lArr|\#8656);/\$\\Leftarrow \$/g;
+ $result =~ s/&(uArr|\#8657);/\$\\Uparrow \$/g;
+ $result =~ s/&(rArr|\#8658);/\$\\Rightarrow \$/g;
+ $result =~ s/&(dArr|\#8659);/\$\\Downarrow \$/g;
+ $result =~ s/&(hArr|\#8660);/\$\\Leftrightarrow \$/g;
+#Mathematical Operators (extended HTML 4.01)
+ $result =~ s/&(forall|\#8704);/\$\\forall \$/g;
+ $result =~ s/&(part|\#8706);/\$\\partial \$/g;
+ $result =~ s/&(exist|\#8707);/\$\\exists \$/g;
+ $result =~ s/&(empty|\#8709);/\$\\emptyset \$/g;
+ $result =~ s/&(nabla|\#8711);/\$\\nabla \$/g;
+ $result =~ s/&(isin|\#8712);/\$\\in \$/g;
+ $result =~ s/&(notin|\#8713);/\$\\notin \$/g;
+ $result =~ s/&(ni|\#8715);/\$\\ni \$/g;
+ $result =~ s/&(prod|\#8719);/\$\\prod \$/g;
+ $result =~ s/&(sum|\#8721);/\$\\sum \$/g;
+ $result =~ s/&(minus|\#8722);/\$-\$/g;
+ $result =~ s/&(lowast|\#8727);/\$*\$/g;
+ $result =~ s/&(radic|\#8730);/\$\\surd \$/g;
+ $result =~ s/&(prop|\#8733);/\$\\propto \$/g;
+ $result =~ s/&(infin|\#8734);/\$\\infty \$/g;
+ $result =~ s/&(ang|\#8736);/\$\\angle \$/g;
+ $result =~ s/&(and|\#8743);/\$\\wedge \$/g;
+ $result =~ s/&(or|\#8744);/\$\\vee \$/g;
+ $result =~ s/&(cap|\#8745);/\$\\cap \$/g;
+ $result =~ s/&(cup|\#8746);/\$\\cup \$/g;
+ $result =~ s/&(int|\#8747);/\$\\int \$/g;
+ $result =~ s/&(sim|\#8764);/\$\\sim \$/g;
+ $result =~ s/&(cong|\#8773);/\$\\cong \$/g;
+ $result =~ s/&(asymp|\#8776);/\$\\approx \$/g;
+ $result =~ s/&(ne|\#8800);/\$\\not= \$/g;
+ $result =~ s/&(equiv|\#8801);/\$\\equiv \$/g;
+ $result =~ s/&(le|\#8804);/\$\\leq \$/g;
+ $result =~ s/&(ge|\#8805);/\$\\geq \$/g;
+ $result =~ s/&(sub|\#8834);/\$\\subset \$/g;
+ $result =~ s/&(sup|\#8835);/\$\\supset \$/g;
+ $result =~ s/&(nsub|\#8836);/\$\\not\\subset \$/g;
+ $result =~ s/&(sube|\#8838);/\$\\subseteq \$/g;
+ $result =~ s/&(supe|\#8839);/\$\\supseteq \$/g;
+ $result =~ s/&(oplus|\#8853);/\$\\oplus \$/g;
+ $result =~ s/&(otimes|\#8855);/\$\\otimes \$/g;
+ $result =~ s/&(perp|\#8869);/\$\\perp \$/g;
+ $result =~ s/&(sdot|\#8901);/\$\\cdot \$/g;
+#Geometric Shapes (extended HTML 4.01)
+ $result =~ s/&(loz|\#9674);/\$\\Diamond \$/g;
+#Miscellaneous Symbols (extended HTML 4.01)
+ $result =~ s/&(spades|\#9824);/\$\\spadesuit \$/g;
+ $result =~ s/&(clubs|\#9827);/\$\\clubsuit \$/g;
+ $result =~ s/&(hearts|\#9829);/\$\\heartsuit \$/g;
+ $result =~ s/&(diams|\#9830);/\$\\diamondsuit \$/g;
return $result;
}
@@ -324,7 +387,7 @@ sub page_format {
# 8 - "A6 [105x148 mm]"
#
my ($papersize,$layout,$numberofcolumns) = @_;
- my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
+ my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = (0,0,0,0,0);
if ($papersize eq '0') {
if ($layout eq 'book') {
if ($numberofcolumns == 1) {
@@ -345,10 +408,11 @@ sub page_format {
$oddoffset = '-40 pt';
$evenoffset = '-60 pt';
} elsif ($numberofcolumns == 2) {
- $textwidth = '4.2 in';
+ $textwidth = '4.4 in';
$textheight = '6.8 in';
- $oddoffset = '-40 pt';
- $evenoffset = '-60 pt';
+ $oddoffset = '-0.5 in';
+ $evenoffset = '-1.5 in';
+ $topmargin = '3.5 in';
}
}
# } elsif($papersize eq '1') {
@@ -385,45 +449,56 @@ sub page_format {
# } elsif($papersize eq '7') {
# } elsif($papersize eq '8') {
}
- return $textwidth,$textheight,$oddoffset,$evenoffset;
+ return $textwidth,$textheight,$oddoffset,$evenoffset,$topmargin;
}
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) = @_;
- my ($textwidth,$textheight,$oddoffset,$evenoffset);
- $assignment=~s/_/ /g;
- if ($numberofcolumns != 1) {
- ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
- } 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');
+ my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist) = @_;
+ my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
+ $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') {
- $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$name}} \\hfill $courseidinfo} \\vskip 5 mm /;
+ 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} /;
} 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/(\\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;
}
@@ -446,7 +521,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}};
@@ -498,6 +573,85 @@ 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 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) = @_;
my %parmhash = %$rparmhash;
@@ -541,66 +695,169 @@ 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;
my $rndseed=time;
- $form{'rndseed'}=$rndseed;
- &Apache::lonnet::appenv(%moreenv);
- my $texversion=&Apache::lonnet::ssi($currentURL,%form);
- &Apache::lonnet::delenv('form.counter');
- &Apache::lonnet::delenv('request.filename');
- if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ 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');
+ }
+ 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);
+ }
+ 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 $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=&Apache::lonnet::ssi($urlp,%form);
+ 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);
+ } 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: ';
-# if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
-# $result.=$1;
-# } else {
-# $result.=$ENV{'form.url'};
-# }
-# $result.=' \end{document}'
+ $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\//) {
+ $result.=' \strut \\\\ THIS IS EXTERNAL RESOURCE WITH URL \strut \\\\ '.$currentURL.' ';
+ } else {
+ $result.=$currentURL;
+ }
+ $result.=' \end{document}'
}
} 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';
+ $form{'textwidth'}=$LaTeXwidth;
+ $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
my $flag_latex_header_remove = 'NO';
my $flag_page_in_sequence = 'NO';
my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+ my $prevassignment='';
+ &Apache::lonnet::delenv('form.counter');
+ &Apache::lonxml::init_counter();
for (my $i=0;$i<=$#master_seq;$i++) {
- $master_seq[$i]=~/___\d+___(.*)$/;
- my $urlp='/res/'.$1;
+ my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
+ $urlp=&Apache::lonnet::clutter($urlp);
if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
$selectionmade = 2;
} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {
$selectionmade = 3;
} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
$selectionmade = 4;
+ } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') {
+ $selectionmade = 7;
}
- my %form;
- $form{'grade_target'}='tex';
- $form{'textwidth'}=$LaTeXwidth;
$form{'symb'}=$master_seq[$i];
- $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ 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$/) {
@@ -609,27 +866,53 @@ ENDPART
$texversion =~ s/\\end{document}\d*/\\end{document}/;
$flag_page_in_sequence = 'YES';
}
+ 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);
+ 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'}->{'ANSWER_TYPE'} eq 'no') {
- 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'}->{'TABLE_INDEX'} eq 'yes') {
+ $texversion=&IndexCreation($texversion,$urlp);
}
- $result .= $texversion;
+ 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 ';
+ }
+ $result .= $texversion;
$flag_latex_header_remove = 'YES';
}
&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
@@ -643,43 +926,57 @@ ENDPART
# my ($usersection,$username,$userdomain) = split /:/,$person;
my ($username,$userdomain) = split /:/,$person;
my $fullname = &get_name($username,$userdomain);
+
+ if ($parmhash{'anonymous_quiz'}=~/yes/) {$fullname=' ';} #put here something reasonable for anonymous exams or quiz
#goes through all resources, checks if they are available for current student, and produces output
+ &Apache::lonnet::delenv('form.counter');
+ &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);
+ 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(($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);
+ 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}//;
}
- if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- my %form;
- $form{'answer_output_mode'}='tex';
- my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,
- $ENV{'request.course.id'},%form);
- $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
- }
$current_output .= $rendered;
}
$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');
&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}';
@@ -691,8 +988,12 @@ 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];
+ $urlp=~s|//|/|;
if ($urlp=~/\//) {
my %form;
$form{'grade_target'}='tex';
@@ -704,39 +1005,47 @@ 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 {
$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';
@@ -745,15 +1054,20 @@ 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'});
+ $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) {
-# $result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/;
-# $result =~ s/\\textheight 25\.9cm/\\textheight $ENV{'form.height'}/;
-# $result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $ENV{'form.leftmargin'}/;
-# $result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $ENV{'form.leftmargin'}/;
-# }
+ if ($numberofcolumns == 1) {
+ $result =~ s/\\textwidth= 9cm/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
+ $result =~ s/\\textheight 25\.9cm/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
+ $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_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";
@@ -763,7 +1077,6 @@ ENDPART
}
print $temp_file $result;
-#<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
$r->print(<<FINALEND);
<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
</body>
@@ -799,6 +1112,11 @@ sub handler {
my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
+# my $key;
+# foreach $key (keys %parmhash) {
+# $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
+# }
+# return OK;
&output_data($r,$helper,\%parmhash);
return OK;
@@ -806,6 +1124,15 @@ sub handler {
use Apache::lonhelper;
+sub addMessage {
+ my $text = shift;
+ my $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{MESSAGE_TEXT} = $text;
+ Apache::lonhelper::message->new();
+}
+
+use Data::Dumper;
+
sub printHelper {
my $r = shift;
@@ -816,9 +1143,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;
@@ -826,9 +1153,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;
@@ -842,6 +1169,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');
@@ -849,9 +1177,8 @@ sub printHelper {
# This will persistently load in the data we want from the
# very first screen.
# Detect whether we're coming from construction space
- if ($ENV{'form.postdata'} =~ /http:\/\// ) {
- $ENV{'form.postdata'} =~ /http:\/\/[^\/]+\/~([^\/]+)\/(.*)/;
- $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
+ if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
+ $helper->{VARS}->{'filename'} = "~$1/$2";
$helper->{VARS}->{'construction'} = 1;
} else {
if ($ENV{'form.postdata'}) {
@@ -889,15 +1216,23 @@ 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
- my $url = $helper->{VARS}->{'postdata'};
- $resourceTitle = substr($url, rindex($url, '/') + 1);
+ my $postdata = $helper->{VARS}->{'postdata'};
+ $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
}
$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();
@@ -924,40 +1259,54 @@ sub printHelper {
my $paramHash;
if ($resourceTitle) {
- push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+ push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
}
# $r->print($helper->{VARS}->{'postdata'});
+ # Useful filter strings
+ my $isProblem = '$res->is_problem()';
+ $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
+ my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
+ my $isNotMap = '!$res->is_map()';
+ $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
+ my $isMap = '$res->is_map()';
+ my $symbFilter = '$res->symb()';
+ my $urlValue = '$res->src()';
+
+ $helper->declareVar('SEQUENCE');
+
+ # Useful for debugging: Dump the help vars
+ #$r->print(Dumper($helper->{VARS}));
+ #$r->print($map);
+
# If we're in a sequence...
- if ($helper->{'VARS'}->{'construction'} ne '1') {
+ if (($helper->{'VARS'}->{'construction'} ne '1') &&
+ $helper->{VARS}->{'postdata'} &&
+ $helper->{VARS}->{'assignment'}) {
# Allow problems from sequence
- push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+ push @{$printChoices}, ["<b>Problems</b> in <b><i>$sequenceTitle</i></b>", '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>Resources</b> in <b><i>$sequenceTitle</i></b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
- my $isProblem = '$res->is_problem();';
- my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
- my $isNotMap = '!$res->is_map();';
- my $symb = '$res->symb();';
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>
+ <filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
- <valuefunc>return $symb</valuefunc>
+ <valuefunc>return $symbFilter;</valuefunc>
</resource>
</state>
<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>
- <valuefunc>return $symb</valuefunc>
+ <valuefunc>return $symbFilter;</valuefunc>
</resource>
</state>
HELPERFRAGMENT
@@ -967,46 +1316,70 @@ 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'];
-
- my $isProblem = '$res->is_problem();';
- my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
- my $symb = '$res->symb();';
+ if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) {
+ push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+ if ($helper->{VARS}->{'assignment'}) {
+ push @{$printChoices}, ["<b>Problems</b> from <b><i>$sequenceTitle</i></b> for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
+ }
+
&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>
- <valuefunc>return $symb</valuefunc>
+ <filterfunc>return $isProblemOrMap;</filterfunc>
+ <choicefunc>return $isProblem;</choicefunc>
+ <valuefunc>return $symbFilter;</valuefunc>
</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">
- <filterfunc>return $isProblem</filterfunc>
+ <resource variable="RESOURCES" multichoice="1" addstatus="1">
+ <filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
- <valuefunc>return $symb</valuefunc>
+ <valuefunc>return $symbFilter;</valuefunc>
</resource>
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
<choices variable="EMPTY_PAGES">
- <choice computer='0'>Start each student's assignment on a new page (add a pagefeed after each assignment)</choice>
- <choice computer='1'>Add one empty page after each student's assignment</choice>
- <choice computer='2'>Add two empty pages after each student's assignment</choice>
+ <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
+ <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
+ <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
+ <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
</choices>
</state>
CHOOSE_STUDENTS
+
+ if ($helper->{VARS}->{'assignment'}) {
+ push @{$printChoices}, ["<b>Resources</b> from <b><i>$sequenceTitle</i></b> for <b>selected students</b>", 'resources_for_students', 'CHOOSE_STUDENTS1'];
+ }
+ &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
+ <state name="CHOOSE_STUDENTS1" 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" addstatus="1">
+ <filterfunc>return $isNotMap;</filterfunc>
+ <mapurl>$map</mapurl>
+ <valuefunc>return $symbFilter;</valuefunc>
+ </resource>
+ <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
+ <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='1'>Add one empty page/column after each student\'s assignment</choice>
+ <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
+ <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
+ </choices>
+ </state>
+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'}) {
- push @{$printChoices}, ["Problems from current subdirectory <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
-
+ 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}, ["<b>Problems</b> from current subdirectory <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+
my $f = '$filename';
my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
<state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
@@ -1016,9 +1389,11 @@ CHOOSE_STUDENTS
<filechoice>return '$subdir';</filechoice>
CHOOSE_FROM_SUBDIR
+ # this is broken up because I really want interpolation above,
+ # and I really DON'T want it below
$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>
@@ -1026,8 +1401,38 @@ CHOOSE_FROM_SUBDIR
&Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
}
+ # Allow the user to select any sequence in the course, feed it to
+ # another resource selector for that sequence
+ if (!$helper->{VARS}->{'construction'}) {
+ push @$printChoices, ["<b>Resources</b> from <b>selected sequence</b> 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', <<CHOOSE_FROM_ANY_SEQUENCE);
+ <state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">
+ <message>Select the sequence to print resources from:</message>
+ <resource variable="SEQUENCE">
+ <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
+ <filterfunc>return \$res->is_sequence;</filterfunc>
+ <valuefunc>return $urlValue;</valuefunc>
+ </resource>
+ </state>
+ <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
+ <message>(mark desired resources then click "next" button) <br /></message>
+ <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">
+ <nextstate>PAGESIZE</nextstate>
+ <filterfunc>return $isProblem</filterfunc>
+ <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
+ <valuefunc>return $symbFilter;</valuefunc>
+ </resource>
+ </state>
+CHOOSE_FROM_ANY_SEQUENCE
+}
+
# 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();
@@ -1037,18 +1442,94 @@ 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><br />";
- Apache::lonhelper::message->new();
+ addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'ANSWER_TYPE';
$helper->declareVar('ANSWER_TYPE');
$paramHash->{CHOICES} = [
- ['Print without answer', 'yes'],
- ['Print with answers', 'no'] ];
- Apache::lonhelper::choices->new();
+ ['Without Answers', 'yes'],
+ ['With Answers', 'no'],
+ ['Only Answers', 'only'] ];
+ Apache::lonhelper::dropdown->new();
+ addMessage("</td></tr>");
+ $startedTable = 1;
+ }
+
+ if ($ENV{'request.role.adv'}) {
+ 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} = [
+ ['standard LaTeX mode', 'standard'],
+ ['LaTeX batchmode', 'batchmode'], ];
+ } else {
+ $paramHash->{CHOICES} = [
+ ['LaTeX batchmode', 'batchmode'],
+ ['standard LaTeX mode', 'standard'] ];
+ }
+ Apache::lonhelper::dropdown->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');
+ $paramHash->{CHOICES} = [
+ ['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");
@@ -1139,7 +1620,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>