--- loncom/interface/lonprintout.pm 2003/09/05 19:34:28 1.228 +++ loncom/interface/lonprintout.pm 2003/09/10 19:38:34 1.234 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.228 2003/09/05 19:34:28 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.234 2003/09/10 19:38:34 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -531,7 +531,7 @@ sub details_for_menu { my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}}; my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'}); - my ($map,$id,$resource)=split(/___/,$symbolic); + my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic); $map=&Apache::lonnet::clutter($map); my $name_of_sequence; $name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}}; @@ -670,6 +670,9 @@ ENDPART $form{'problem_split'}=$parmhash{'problem_stream_switch'}; $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; my $rndseed=time; + if ($helper->{'VARS'}->{'curseed'}) { + $rndseed=$helper->{'VARS'}->{'curseed'}; + } $form{'rndseed'}=$rndseed; &Apache::lonnet::appenv(%moreenv); &Apache::lonnet::delenv('form.counter'); @@ -700,6 +703,9 @@ ENDPART #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++) { @@ -709,14 +715,17 @@ ENDPART my %form; $form{'grade_target'}='tex'; $form{'textwidth'}=$LaTeXwidth; + $form{'problem_split'}=$parmhash{'problem_stream_switch'}; + $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; $form{'rndseed'}=$rndseed; my $texversion=&Apache::lonnet::ssi($urlp,%form); if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { my %form; $form{'grade_target'}='answer'; $form{'answer_output_mode'}='tex'; - $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; $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/; } @@ -728,13 +737,13 @@ ENDPART if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') { $texversion=&IndexCreation($texversion,$urlp); } - if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') { + 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 This is sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent '; + $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\} /;} @@ -837,7 +846,7 @@ ENDPART &Apache::lonxml::init_counter(); foreach my $curresline (@master_seq) { if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) { - my ($map,$id,$res_url) = split(/___/,$curresline); + my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline); if (&Apache::lonnet::allowed('bre',$res_url)) { my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain, $ENV{'request.course.id'},'tex'); @@ -884,6 +893,9 @@ ENDPART @list_of_files=sort @list_of_files; my $flag_latex_header_remove = 'NO'; my $rndseed=time; + if ($helper->{'VARS'}->{'curseed'}) { + $rndseed=$helper->{'VARS'}->{'curseed'}; + } for (my $i=0;$i<=$#list_of_files;$i++) { my $urlp = $list_of_files[$i]; if ($urlp=~/\//) { @@ -1059,6 +1071,7 @@ sub printHelper { my $helper = Apache::lonhelper::helper->new("Printing Helper"); $helper->declareVar('symb'); $helper->declareVar('postdata'); + $helper->declareVar('curseed'); $helper->declareVar('filename'); $helper->declareVar('construction'); $helper->declareVar('assignment'); @@ -1105,7 +1118,7 @@ sub printHelper { $subdir = substr($helper->{VARS}->{'filename'}, 0, rindex($helper->{VARS}->{'filename'}, '/') + 1); } else { - ($map, $id, $url) = split(/___/, $symb); + ($map, $id, $url) = &Apache::lonnet::decode_symb($symb); $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url); if (!$resourceTitle) { # if the resource doesn't have a title, use the filename @@ -1114,6 +1127,9 @@ sub printHelper { } $subdir = &Apache::lonnet::filelocation("", $url); } + if (!$helper->{VARS}->{'curseed'} && $ENV{'form.curseed'}) { + $helper->{VARS}->{'curseed'}=$ENV{'form.curseed'}; + } my $userCanSeeHidden = Apache::lonnavmaps::advancedUser(); @@ -1163,7 +1179,7 @@ sub printHelper { my $helperFragment = < (mark them then click "next" button)
- + PAGESIZE return $isProblem; $map @@ -1173,7 +1189,7 @@ sub printHelper { (mark them then click "next" button)
- + PAGESIZE return $isNotMap; $map @@ -1199,7 +1215,8 @@ HELPERFRAGMENT &Apache::lonxml::xmlparse($r, 'helper', < (mark them then click "next" button)
- + PAGESIZE return $isProblemOrMap; return $isProblem; @@ -1210,7 +1227,7 @@ HELPERFRAGMENT
Select resources for the assignment
 - + return $isProblem $map return $symb @@ -1270,8 +1287,8 @@ CHOOSE_FROM_SUBDIR $paramHash->{'variable'} = 'ANSWER_TYPE'; $helper->declareVar('ANSWER_TYPE'); $paramHash->{CHOICES} = [ - ['Yes', 'yes'], - ['No', 'no'] ]; + ['No', 'yes'], + ['Yes', 'no'] ]; Apache::lonhelper::dropdown->new(); addMessage(""); $startedTable = 1; @@ -1331,6 +1348,18 @@ CHOOSE_FROM_SUBDIR Apache::lonhelper::dropdown->new(); addMessage(""); } + if ($helper->{'VARS'}->{'construction'}) { + my $xmlfrag .= <<'RNDSEED'; + Use random seed: + + + return $helper->{VARS}->{'curseed'}; + + + +RNDSEED + &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag); + } } if ($startedTable) {