[BACK]Return to lonprintout.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.588 and 1.589

version 1.588, 2011/05/18 11:26:44 version 1.589, 2011/05/23 09:31:21
Line 3346  sub printHelper { Line 3346  sub printHelper {
     my ($map, $id, $url);      my ($map, $id, $url);
     my $subdir;      my $subdir;
     my $is_published=0; # True when printing from resource space.      my $is_published=0; # True when printing from resource space.
       my $res_printable = 1; # By default the current resource is printable.    
       my $userCanPrint = ($perm{'pav'} || $perm{'pfo'});
   
     # Get the resource name from construction space      # Get the resource name from construction space
     if ($helper->{VARS}->{'construction'}) {      if ($helper->{VARS}->{'construction'}) {
Line 3360  sub printHelper { Line 3362  sub printHelper {
     ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);      ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
     $helper->{VARS}->{'postdata'} =       $helper->{VARS}->{'postdata'} = 
  &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));   &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
       my $navmap = Apache::lonnavmaps::navmap->new();
       my $res   = $navmap->getBySymb($symb);
       $res_printable  = $res->resprintable() || $userCanPrint; #printability in course context
  } else {   } else {
       # Resource space.
   
     $url = $helper->{VARS}->{'postdata'};      $url = $helper->{VARS}->{'postdata'};
     $is_published=1; # From resource space.      $is_published=1; # From resource space.
  }   }
Line 3370  sub printHelper { Line 3377  sub printHelper {
             $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);              $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
         }          }
         $subdir = &Apache::lonnet::filelocation("", $url);          $subdir = &Apache::lonnet::filelocation("", $url);
   
   
     }      }
     if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {      if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
  $helper->{VARS}->{'curseed'}=$env{'form.curseed'};   $helper->{VARS}->{'curseed'}=$env{'form.curseed'};
Line 3399  sub printHelper { Line 3408  sub printHelper {
     my $printChoices = [];      my $printChoices = [];
     my $paramHash;      my $paramHash;
   
     if ($resourceTitle) {      # If there is a current resource and it is printable
       # Give that as a choice.
   
       if ($resourceTitle && $res_printable) {
         push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];          push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];
     }      }
   
     # Useful filter strings      # Useful filter strings
     my $isProblem = '(($res->is_problem()||$res->contains_problem||$res->is_practice())) && $res->resprintable() ';  
       my $isPrintable = ' && $res->resprintable()';
   
       my $isProblem = '(($res->is_problem()||$res->contains_problem||$res->is_practice()))';
       $isProblem .= $isPrintable unless $userCanPrint;
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;      $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isProblemOrMap = '($res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()) && $res->resprintable()';      my $isProblemOrMap = '($res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice())';
     my $isNotMap = '(!$res->is_sequence()) && $res->resprintable()';      $isProblemOrMap .= $isPrintable unless $userCanPrint;
       my $isNotMap = '(!$res->is_sequence())';
       $isNotMap .= $isPrintable unless $userCanPrint;
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;      $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map() && $res->resprintable()';      my $isMap = '$res->is_map()';
     my $symbFilter = '$res->shown_symb() && $res->resprintable()';      $isMap .= $isPrintable unless $userCanPrint;
       my $symbFilter = '$res->shown_symb() ';
       $symbFilter .= $isPrintable unless $userCanPrint;
     my $urlValue = '$res->link()';      my $urlValue = '$res->link()';
   
     $helper->declareVar('SEQUENCE');      $helper->declareVar('SEQUENCE');
Removed from v.1.588  
changed lines
  Added in v.1.589

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>