--- loncom/interface/lonprintout.pm 2003/09/06 17:21:16 1.230 +++ loncom/interface/lonprintout.pm 2003/09/22 20:00:08 1.237 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.230 2003/09/06 17:21:16 albertel Exp $ +# $Id: lonprintout.pm,v 1.237 2003/09/22 20:00:08 albertel 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}}; @@ -703,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++) { @@ -712,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/; } @@ -731,7 +737,7 @@ 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; @@ -769,8 +775,8 @@ 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') { @@ -779,8 +785,8 @@ ENDPART $selectionmade = 4; } $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 #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]"); my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($urlp=~/\.page$/) { @@ -840,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'); @@ -1074,7 +1080,7 @@ sub printHelper { # very first screen. # Detect whether we're coming from construction space if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) { - $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2"; + $helper->{VARS}->{'filename'} = "~$1/$2"; $helper->{VARS}->{'construction'} = 1; } else { if ($ENV{'form.postdata'}) { @@ -1112,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 @@ -1126,6 +1132,9 @@ sub printHelper { } 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(); @@ -1151,18 +1160,19 @@ sub printHelper { my $printChoices = []; my $paramHash; - if ($resourceTitle) { - push @{$printChoices}, ["$resourceTitle (prints what you just saw on the screen)", 'current_document', 'PAGESIZE']; + if ($resourceTitle && $helper->{VARS}->{'postdata'}) { + push @{$printChoices}, ["$resourceTitle (what you just saw on the screen)", 'current_document', 'PAGESIZE']; } # $r->print($helper->{VARS}->{'postdata'}); # If we're in a sequence... - if ($helper->{'VARS'}->{'construction'} ne '1') { + if (($helper->{'VARS'}->{'construction'} ne '1') && + $helper->{VARS}->{'postdata'}) { # Allow problems from sequence - push @{$printChoices}, ["Problem(s) from $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS']; + push @{$printChoices}, ["Selected problems in $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS']; # Allow all resources from sequence - push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML']; + push @{$printChoices}, ["Selected resources in $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML']; my $isProblem = '$res->is_problem()'; $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden; @@ -1173,7 +1183,7 @@ sub printHelper { my $helperFragment = < (mark them then click "next" button)
- + PAGESIZE return $isProblem; $map @@ -1183,7 +1193,7 @@ sub printHelper { (mark them then click "next" button)
- + PAGESIZE return $isNotMap; $map @@ -1197,9 +1207,9 @@ 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}, ['Problems in this course', 'all_problems', 'ALL_PROBLEMS']; - push @{$printChoices}, ["Problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS']; + if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) { + push @{$printChoices}, ['Selected problems from entire course', 'all_problems', 'ALL_PROBLEMS']; + push @{$printChoices}, ["Selected problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS']; my $isProblem = '$res->is_problem()'; $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden; @@ -1209,7 +1219,8 @@ HELPERFRAGMENT &Apache::lonxml::xmlparse($r, 'helper', < (mark them then click "next" button)
- + PAGESIZE return $isProblemOrMap; return $isProblem; @@ -1220,7 +1231,7 @@ HELPERFRAGMENT
Select resources for the assignment
 - + return $isProblem $map return $symb