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

Diff for /loncom/interface/lonprintout.pm between versions 1.479 and 1.480

version 1.479, 2006/08/14 22:20:20 version 1.480, 2006/08/21 22:53:19
Line 1051  sub recently_generated { Line 1051  sub recently_generated {
 #    my $helpervars = Dumper($helper->{'VARS'});  #    my $helpervars = Dumper($helper->{'VARS'});
 #    &Apache::lonnet::logthis("Dump of helper vars:\n $helpervars");  #    &Apache::lonnet::logthis("Dump of helper vars:\n $helpervars");
 #}  #}
   #sub dump_env {
   #    my $envvars = Dumper(\%env);
   #    &Apache::lonnet::logthis("Dump of env: \n $envvars");
   #}
   
 sub get_page_breaks  {  #sub get_page_breaks  {
     my ($helper) = @_;  #    my ($helper) = @_;
     my %page_breaks;  #    my %page_breaks;
   #
     foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {  #    foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
  $page_breaks{$break} = 1;  # $page_breaks{$break} = 1;
     }  #    }
     return %page_breaks;  #    return %page_breaks;
 }  #}
   
 #  Output a sequence (recursively if neeed)  #  Output a sequence (recursively if neeed)
 #  from construction space.  #  from construction space.
Line 2154  sub printHelper { Line 2158  sub printHelper {
  }   }
   
     }      }
   
           
     # This will persistently load in the data we want from the      # This will persistently load in the data we want from the
     # very first screen.      # very first screen.
Line 2193  sub printHelper { Line 2196  sub printHelper {
   
     # 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.      } elsif ($env{'form.postdata'} =~ /^\/res\// ) {
  $helper->{VARS}->{'postdata'} = $env{'form.postdata'};          $subdir = substr($env{'form.postdata'},
                            0, rindex($env{'form.postdata'}, '/') + 1);
     } elsif (!$helper->{VARS}->{'postdata'}) {      } elsif ((defined $helper->{VARS}->{'postdata'}) &&
        ($helper->{VARS}->{'postdata'} =~  /^\/res\//)){
           $subdir = substr($helper->{VARS}->{'postdata'},
                            0, rindex($helper->{VARS}->{'postdata'}, '/') + 1);
       } else {     #    (!$helper->{VARS}->{'postdata'}) {
         ($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));
Line 2220  sub printHelper { Line 2228  sub printHelper {
   
     my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();      my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
   
     Apache::lonhelper::registerHelperTags();      &Apache::lonhelper::registerHelperTags();
   
     # "Delete everything after the last slash."      # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;      $subdir =~ s|/[^/]+$||;
Line 2619  CHOOSE_STUDENTS1 Line 2627  CHOOSE_STUDENTS1
     $resource_selector      $resource_selector
 CHOOSE_ANON2  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       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     ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or 
Removed from v.1.479  
changed lines
  Added in v.1.480

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