Diff for /loncom/interface/lonindexer.pm between versions 1.154 and 1.157

version 1.154, 2006/12/05 02:55:53 version 1.157, 2007/03/02 23:17:59
Line 680  sub get_list { Line 680  sub get_list {
  $uri=~s/\/+/\//g;   $uri=~s/\/+/\//g;
  foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) {   foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) {
     my @ratpart=split(/\:/,$_);      my @ratpart=split(/\:/,$_);
     push @list,$ratpart[1];      push(@list,&LONCAPA::map::qtescape($ratpart[1]));
  }    } 
  $hash{'dirlist_files_'.$luri} = join("\n",@list);   $hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {      } else {
Line 689  sub get_list { Line 689  sub get_list {
  $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;
     }      }
     return @list=&match_ext($r,@list);      return @list=&match_ext($r,@list);    
 }  }
   
 sub dynmetaread {  sub dynmetaread {
Line 799  sub display_line { Line 799  sub display_line {
     my $i=0;      my $i=0;
     while ($i<=11) {      while ($i<=11) {
  $tabtag=join('',$tabtag,"<td>&nbsp;</td>")   $tabtag=join('',$tabtag,"<td>&nbsp;</td>")
     if $hash{'display_attrs_'.$i} == 1;      if ($i != 9 &&
    $hash{'display_attrs_'.$i} == 1);
  $i++;   $i++;
     }      }
     my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');      my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
Line 1202  sub showpreview { Line 1203  sub showpreview {
        $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';         $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
     } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {      } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
        $output='<img  alt="'.&mt('Preview').'" src="http://'.         $output='<img  alt="'.&mt('Preview').'" src="http://'.
                  $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.                   &Apache::lonnet::hostname(&Apache::lonnet::homeserver($2,$1)).
                  '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';                   '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
     }      }
     return $output;      return $output;

Removed from v.1.154  
changed lines
  Added in v.1.157


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