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

Diff for /loncom/interface/lonprintout.pm between versions 1.478 and 1.482

version 1.478, 2006/08/14 10:52:04 version 1.482, 2006/08/22 14:44:39
Line 812  sub details_for_menu { Line 812  sub details_for_menu {
     if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }      if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
     my $name_of_resource = &Apache::lonnet::gettitle($postdata);      my $name_of_resource = &Apache::lonnet::gettitle($postdata);
     my $symbolic = &Apache::lonnet::symbread($postdata);      my $symbolic = &Apache::lonnet::symbread($postdata);
       return if ( $symbolic eq '');
   
     my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);      my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
     $map=&Apache::lonnet::clutter($map);      $map=&Apache::lonnet::clutter($map);
     my $name_of_sequence = &Apache::lonnet::gettitle($map);      my $name_of_sequence = &Apache::lonnet::gettitle($map);
Line 1110  sub print_construction_sequence { Line 1112  sub print_construction_sequence {
  $answerform{'answer_output_mode'}='tex';   $answerform{'answer_output_mode'}='tex';
  $answerform{'rndseed'}=$rndseed;   $answerform{'rndseed'}=$rndseed;
  $answerform{'problem_split'}=$parmhash{'problem_stream_switch'};   $answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
  if ($urlp=~/\/res\//) {   if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
     $env{'request.state'}='published';  
  }  
   
  $resources_printed .= $urlp.':';   $resources_printed .= $urlp.':';
  my $answer=&Apache::lonnet::ssi($urlp,%answerform);   my $answer=&Apache::lonnet::ssi($urlp,%answerform);
  if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {   if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
Line 1201  ENDPART Line 1200  ENDPART
     my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);      my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);
     my $msg = &mt('Please stand by while processing your print request, this may take some time ...');      my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
   
   
   
     $r->print($start_page."\n<p>\n$msg\n</p>\n");      $r->print($start_page."\n<p>\n$msg\n</p>\n");
   
     # fetch the pagebreaks and store them in the course environment      # fetch the pagebreaks and store them in the course environment
Line 1254  ENDPART Line 1251  ENDPART
     }      }
   
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {      if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
   
       #-- single document - problem, page, html, xml, ...        #-- single document - problem, page, html, xml, ...
  my ($currentURL,$cleanURL);   my ($currentURL,$cleanURL);
   
Line 2162  sub printHelper { Line 2158  sub printHelper {
     if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {      if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
         $helper->{VARS}->{'filename'} = "~$1/$2";          $helper->{VARS}->{'filename'} = "~$1/$2";
         $helper->{VARS}->{'construction'} = 1;          $helper->{VARS}->{'construction'} = 1;
     } elsif ($env{'form.postdata'}) {      } else {
         if ($env{'form.postdata'}) {          if ($env{'form.postdata'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});              $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
       if ( $helper->{VARS}->{'symb'} eq '') {
    $helper->{VARS}->{'postdata'} = $env{'form.postdata'};
       }
         }          }
         if ($env{'form.symb'}) {          if ($env{'form.symb'}) {
             $helper->{VARS}->{'symb'} = $env{'form.symb'};              $helper->{VARS}->{'symb'} = $env{'form.symb'};
Line 2174  sub printHelper { Line 2173  sub printHelper {
         }          }
   
     }      }
   
     if ($env{'form.symb'}) {      if ($env{'form.symb'}) {
         $helper->{VARS}->{'symb'} = $env{'form.symb'};          $helper->{VARS}->{'symb'} = $env{'form.symb'};
     }      }
Line 2185  sub printHelper { Line 2185  sub printHelper {
  &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});   &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);      my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
     if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}      if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
   
           
     # Extract map      # Extract map
     my $symb = $helper->{VARS}->{'symb'};      my $symb = $helper->{VARS}->{'symb'};
Line 2192  sub printHelper { Line 2193  sub printHelper {
     my $subdir;      my $subdir;
   
     # Get the resource name from construction space      # Get the resource name from construction space
   
     if ($helper->{VARS}->{'construction'}) {      if ($helper->{VARS}->{'construction'}) {
         $resourceTitle = substr($helper->{VARS}->{'filename'},           $resourceTitle = substr($helper->{VARS}->{'filename'}, 
                                 rindex($helper->{VARS}->{'filename'}, '/')+1);                                  rindex($helper->{VARS}->{'filename'}, '/')+1);
         $subdir = substr($helper->{VARS}->{'filename'},          $subdir = substr($helper->{VARS}->{'filename'},
                          0, rindex($helper->{VARS}->{'filename'}, '/') + 1);                           0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
     } elsif ($env{'form.postdata'} =~ /^\/res\//) { # Get resource name from res space.      } else {
  $helper->{VARS}->{'postdata'} = $env{'form.postdata'};   if ($symb ne '') {
       ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
       $helper->{VARS}->{'postdata'} = 
    &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
    } else {
       $url = $helper->{VARS}->{'postdata'};
    }
    $url = &Apache::lonnet::clutter($url);
   
     } elsif (!$helper->{VARS}->{'postdata'}) {  
         ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);  
         $helper->{VARS}->{'postdata'} =   
     &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));  
         if (!$resourceTitle) { # if the resource doesn't have a title, use the filename          if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
             my $postdata = $helper->{VARS}->{'postdata'};              my $postdata = $helper->{VARS}->{'postdata'};
             $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);              $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
Line 2224  sub printHelper { Line 2227  sub printHelper {
   
     # "Delete everything after the last slash."      # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;      $subdir =~ s|/[^/]+$||;
     if (not $helper->{VARS}->{'construction'}) {  
  $subdir=$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$subdir;  
     }  
     # "Remove all duplicate slashes."  
     $subdir =~ s|/+|/|g;  
   
     # What can be printed is a very dynamic decision based on      # What can be printed is a very dynamic decision based on
     # lots of factors. So we need to dynamically build this list.      # lots of factors. So we need to dynamically build this list.
Line 2620  CHOOSE_ANON2 Line 2618  CHOOSE_ANON2
     }      }
   
     # FIXME: That RE should come from a library somewhere.      # 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 $perm{'pav'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {          if ($perm{'pav'} 
         push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$subdir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];   && $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
    && (defined($helper->{'VARS'}->{'construction'})
       ||
       (&Apache::lonnet::allowed('bre',$subdir) eq 'F'
        && 
        $helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)
       )
    ) {
   
         my $f = '$filename';   my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
           push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$pretty_dir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;          my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
   <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">    <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">
   
     <files variable="FILES" multichoice='1'>      <files variable="FILES" multichoice='1'>
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
Removed from v.1.478  
changed lines
  Added in v.1.482

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