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

Diff for /loncom/interface/lonindexer.pm between versions 1.210 and 1.211

version 1.210, 2011/10/14 16:58:32 version 1.211, 2011/10/17 12:41:30
Line 755  sub scanDir { Line 755  sub scanDir {
 sub get_list {  sub get_list {
     my ($r,$uri)=@_;      my ($r,$uri)=@_;
     my @list=();      my @list=();
       my $listerror;
           
     (my $luri = $uri) =~ s/\//_/g;      (my $luri = $uri) =~ s/\//_/g;
     if ($env{'form.updatedisplay'}) {      if ($env{'form.updatedisplay'}) {
Line 779  sub get_list { Line 780  sub get_list {
  $hash{'dirlist_files_'.$luri} = join("\n",@list);   $hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {      } else {
 # is really a directory  # is really a directory
  @list = &Apache::lonnet::dirlist($uri);   (my $listref,$listerror) = &Apache::lonnet::dirlist($uri);
           if (ref($listref) eq 'ARRAY') {
               @list = @{$listref};
           }
  $hash{'dirlist_files_'.$luri} = join("\n",@list);   $hash{'dirlist_files_'.$luri} = join("\n",@list);
  $hash{'dirlist_timestamp_files_'.$luri} = time;   $hash{'dirlist_timestamp_files_'.$luri} = time;
     }      }
 #Checking for error messages associated with empty directories or inaccessible servers (See Bug 4984)  #Checking for error messages associated with empty directories or inaccessible servers (See Bug 4984)
     if($list[0] eq 'no_such_dir' || $list[0] eq 'no_such_host') {       if (($listerror eq 'no_such_dir') || ($listerror eq 'no_such_host')) { 
         $r->print("<p class='LC_info'>" . &mt("Directory does not exist."). "</p>");          $r->print("<p class='LC_info'>" . &mt("Directory does not exist."). "</p>");
     }      } elsif ($listerror eq 'con_lost') {
     elsif($list[0] eq 'con_lost') {  
         $r->print("<p class='LC_info'>" . &mt("Directory temporarily not accessible."). "</p>");          $r->print("<p class='LC_info'>" . &mt("Directory temporarily not accessible."). "</p>");
     }      }
   
Removed from v.1.210  
changed lines
  Added in v.1.211

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