Diff for /loncom/interface/lonindexer.pm between versions 1.24 and 1.25

version 1.24, 2001/11/29 20:31:45 version 1.25, 2001/12/04 15:35:39
Line 39 Line 39
 # 8/6,8/7,8/10 Scott Harrison  # 8/6,8/7,8/10 Scott Harrison
 # 8/14 H. K. Ng  # 8/14 H. K. Ng
 # 8/28,10/15,11/28,11/29 Scott Harrison  # 8/28,10/15,11/28,11/29 Scott Harrison
   # 11/30 Matthew Hall
 #  #
 ###  ###
   
Line 478  sub match_ext { Line 479  sub match_ext {
     my @fileext;      my @fileext;
     my $dirptr=16384;      my $dirptr=16384;
   
     my $tabdir  = $r->dir_config('lonTabDir');  
     my $fn = $tabdir.'/filetypes.tab';  
     if (-e $fn) {  
  my $FH=Apache::File->new($fn);  
  my @content=<$FH>;  
  foreach my $line (@content) {  
     (my $ext,my $foo) = split /\s+/,$line;  
     push @fileext,$ext;  
  }  
     }  
     foreach my $line (@packlist) {      foreach my $line (@packlist) {
  chomp $line;   chomp $line;
  $line =~ s/^\/home\/httpd\/html//;   $line =~ s/^\/home\/httpd\/html//;
Line 498  sub match_ext { Line 489  sub match_ext {
  my $fext = pop(@filecom);   my $fext = pop(@filecom);
  my $fnptr = $unpackline[3]&$dirptr;   my $fnptr = $unpackline[3]&$dirptr;
   if ($fnptr == 0 and $unpackline[3] ne "") {    if ($fnptr == 0 and $unpackline[3] ne "") {
     foreach my $nextline (@fileext) {      my $embstyle = &Apache::lonnet::fileembstyle($fext);
  push @trimlist,$line if $nextline eq $fext;              push @trimlist,$line if (defined($embstyle) && 
     }       $embstyle ne 'hdn' );
  } else {   } else {
     push @trimlist,$line;      push @trimlist,$line;
  }   }
Line 600  sub display_line { Line 591  sub display_line {
 # display file  # display file
     if ($fnptr == 0 and $filecom[3] ne "") {      if ($fnptr == 0 and $filecom[3] ne "") {
  my @file_ext = split (/\./,$listname);   my @file_ext = split (/\./,$listname);
  my $curfext = $file_ext[scalar(@file_ext)-1];   my $curfext = $file_ext[-1];
    # Set the icon for the file
    my $iconname = "unknownfiletype.gif";
    my $embstyle = &Apache::lonnet::fileembstyle($curfext);
    # The unless conditional that follows is a bit of overkill
    $iconname = $curfext.".gif" unless
       (!defined($embstyle) || $embstyle eq 'hdn');
    #
  my $filelink = $startdir.$filecom[0];   my $filelink = $startdir.$filecom[0];
  $r->print("<tr><td nowrap valign='bottom' bgcolor=$fileclr>");   $r->print("<tr><td nowrap valign='bottom' bgcolor=$fileclr>");
  my $metafile = grep /^$filecom[0]\.meta\&/, @list;   my $metafile = grep /^$filecom[0]\.meta\&/, @list;
Line 654  sub display_line { Line 652  sub display_line {
       ".gif border='0' />\n") if $rem > 0;        ".gif border='0' />\n") if $rem > 0;
  }   }
   
  $r->print("<img src=$iconpath$curfext.gif border='0' />\n");   $r->print("<img src=$iconpath$iconname border='0' />\n");
  $r->print (" <a href=\"javascript:openWindow('".$filelink.   $r->print (" <a href=\"javascript:openWindow('".$filelink.
    "', 'metadatafile', '450', '500', 'no', 'yes')\";".     "', 'metadatafile', '450', '500', 'no', 'yes')\";".
    " TARGET=_self>$listname</a> ");     " TARGET=_self>$listname</a> ");

Removed from v.1.24  
changed lines
  Added in v.1.25


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