--- loncom/interface/lonprintout.pm 2003/09/09 13:31:08 1.232 +++ loncom/interface/lonprintout.pm 2003/09/25 18:19:34 1.239 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.232 2003/09/09 13:31:08 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.239 2003/09/25 18:19: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}}; @@ -775,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') { @@ -785,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$/) { @@ -846,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'); @@ -1035,6 +1035,8 @@ sub addMessage { Apache::lonhelper::message->new(); } +use Data::Dumper; + sub printHelper { my $r = shift; @@ -1080,7 +1082,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'}) { @@ -1118,12 +1120,12 @@ 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); } @@ -1132,6 +1134,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(); @@ -1157,43 +1162,54 @@ 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'}); + # 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'} && $sequenceTitle) { # Allow problems from sequence - push @{$printChoices}, ["Problem(s) from $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS']; + push @{$printChoices}, ["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}, ["Resources in $sequenceTitle", '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 = < (mark them then click "next" button)
- + PAGESIZE return $isProblem; $map - return $symb; + return $symbFilter; (mark them then click "next" button)
- + PAGESIZE return $isNotMap; $map - return $symb; + return $symbFilter; HELPERFRAGMENT @@ -1203,33 +1219,31 @@ 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']; - - 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()'; + if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) { + push @{$printChoices}, ['Problems from entire course', 'all_problems', 'ALL_PROBLEMS']; + if ($sequenceTitle) { + push @{$printChoices}, ["Problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS']; + } + &Apache::lonxml::xmlparse($r, 'helper', < (mark them then click "next" button)
- + PAGESIZE return $isProblemOrMap; return $isProblem; - return $symb; + return $symbFilter;
Select resources for the assignment
 - + return $isProblem $map - return $symb + return $symbFilter
How should the results be printed?
 @@ -1243,9 +1257,9 @@ CHOOSE_STUDENTS } # 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'}) { + 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}, ["Problems from current subdirectory $subdir", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR']; - + my $f = '$filename'; my $xmlfrag = < @@ -1255,6 +1269,8 @@ CHOOSE_STUDENTS return '$subdir'; 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'; return Apache::lonhelper::files::not_old_version($filename) && $filename =~ m/\.(problem|exam|quiz|assess|survey|form|library)$/; @@ -1265,6 +1281,32 @@ 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, ["Resources from selected sequence in course", + 'map_problems_pages', 'CHOOSE_SEQUENCE']; + &Apache::lonxml::xmlparse($r, 'helper', < + Select the sequence to print resources from: + + CHOOSE_FROM_ANY_SEQUENCE + return \$res->is_sequence; + return $urlValue; + + + + (mark desired resources then click "next" button)
+ + PAGESIZE + return $isProblem + return $helper->{VARS}->{'SEQUENCE'}; + return $symbFilter; + + +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();