--- loncom/interface/lonprintout.pm 2003/09/16 20:03:12 1.235
+++ loncom/interface/lonprintout.pm 2003/10/10 13:38:26 1.254
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.235 2003/09/16 20:03:12 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.254 2003/10/10 13:38:26 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -611,6 +611,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 +705,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 +778,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 +838,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';
@@ -775,18 +853,21 @@ ENDPART
&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;
}
$form{'symb'}=$master_seq[$i];
- $master_seq[$i]=~/(.*)___\d*___/;
- my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($1),'header'); #tittle of the assignment which contains this problem
+ 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 +876,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 +916,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 +942,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;
}
@@ -898,6 +1003,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 +1015,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 {
@@ -1035,6 +1141,8 @@ sub addMessage {
Apache::lonhelper::message->new();
}
+use Data::Dumper;
+
sub printHelper {
my $r = shift;
@@ -1045,9 +1153,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;
@@ -1055,9 +1163,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;
@@ -1122,8 +1230,8 @@ sub printHelper {
$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);
}
@@ -1160,26 +1268,37 @@ sub printHelper {
my $printChoices = [];
my $paramHash;
- if ($resourceTitle && $helper->{VARS}->{'postdata'}) {
- push @{$printChoices}, ["<b>$resourceTitle</b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+ if ($resourceTitle) {
+ 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') &&
- $helper->{VARS}->{'postdata'}) {
+ $helper->{VARS}->{'postdata'} &&
+ $helper->{VARS}->{'assignment'}) {
# Allow problems from sequence
- push @{$printChoices}, ["<b>Selected problems</b> in $sequenceTitle", '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}, ["<b>Selected resources</b> in $sequenceTitle", '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()';
- $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
- my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
- my $isNotMap = '!$res->is_map()';
- $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
- 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>
@@ -1187,7 +1306,7 @@ sub printHelper {
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
- <valuefunc>return $symb;</valuefunc>
+ <valuefunc>return $symbFilter;</valuefunc>
</resource>
</state>
@@ -1197,7 +1316,7 @@ sub printHelper {
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>
- <valuefunc>return $symb;</valuefunc>
+ <valuefunc>return $symbFilter;</valuefunc>
</resource>
</state>
HELPERFRAGMENT
@@ -1208,14 +1327,11 @@ 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}, ['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'];
+ 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'];
+ }
- my $isProblem = '$res->is_problem()';
- $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
- my $isProblemOrMap = '($res->is_problem() || $res->is_map())';
- $isProblemOrMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
- my $symb = '$res->symb()';
&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>
@@ -1224,7 +1340,7 @@ HELPERFRAGMENT
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblemOrMap;</filterfunc>
<choicefunc>return $isProblem;</choicefunc>
- <valuefunc>return $symb;</valuefunc>
+ <valuefunc>return $symbFilter;</valuefunc>
</resource>
</state>
@@ -1232,9 +1348,9 @@ HELPERFRAGMENT
<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 $isProblem</filterfunc>
+ <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">
@@ -1245,12 +1361,35 @@ HELPERFRAGMENT
</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'}) and $ENV{'request.role.adv'}) {
- 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">
@@ -1260,6 +1399,8 @@ 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 Apache::lonhelper::files::not_old_version($filename) &&
$filename =~ m/\.(problem|exam|quiz|assess|survey|form|library)$/;
@@ -1270,6 +1411,36 @@ 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", "Select Printing Options:");
$paramHash = Apache::lonhelper::getParamHash();
@@ -1286,13 +1457,14 @@ CHOOSE_FROM_SUBDIR
if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or
($helper->{VARS}->{'construction'} eq '1')) {
- addMessage("<hr width='33%' /><table><tr><td align='right'>Print With Answers:</td><td>");
+ 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} = [
- ['No', 'yes'],
- ['Yes', 'no'] ];
+ ['Without Answers', 'yes'],
+ ['With Answers', 'no'],
+ ['Only Answers', 'only'] ];
Apache::lonhelper::dropdown->new();
addMessage("</td></tr>");
$startedTable = 1;