Diff for /loncom/interface/lonindexer.pm between versions 1.26 and 1.28

version 1.26, 2001/12/04 18:35:47 version 1.28, 2001/12/13 13:38:14
Line 40 Line 40
 # 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  # 11/30 Matthew Hall
   # 12/11,12/13 Scott Harrison
 #  #
 ###  ###
   
Line 80  my $dnum; # directory counter Line 81  my $dnum; # directory counter
 sub BEGIN {  sub BEGIN {
     my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.      my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
      '/language.tab');       '/language.tab');
     map {      while(<$fh>) {
  $_=~/(\w+)\s+([\w\s\-]+)/;   $_=~/(\w+)\s+([\w\s\-]+)/;
  $language{$1}=$2;   $language{$1}=$2;
     } <$fh>;      }
 }  }
   
 # ----------------------------- Handling routine called via Apache and mod_perl  # ----------------------------- Handling routine called via Apache and mod_perl
Line 239  ENDHEADER Line 240  ENDHEADER
     my %achash;      my %achash;
     my $ac=0;      my $ac=0;
     # some initial hashes for working with data      # some initial hashes for working with data
     map {      foreach (@Acts) {
  my ($state,$ref)=split(/a/);   my ($state,$ref)=split(/a/);
  $ahash{$ref}=$state;   $ahash{$ref}=$state;
  $achash{$ref}=$ac;   $achash{$ref}=$ac;
  $ac++;   $ac++;
     } (@Acts);      }
     # sorting through the actions and changing the tied database hash      # sorting through the actions and changing the tied database hash
     map {      foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {
  my $key=$_;   my $key=$_;
  if ($ahash{$key} eq '1') {   if ($ahash{$key} eq '1') {
     $hash{'store_'.$hash{'pre_'.$key.'_link'}}=      $hash{'store_'.$hash{'pre_'.$key.'_link'}}=
Line 260  ENDHEADER Line 261  ENDHEADER
  delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};   delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
     }      }
  }   }
     } sort {$achash{$a}<=>$achash{$b}} (keys %ahash);      }
     # deleting the previously cached listing      # deleting the previously cached listing
     map {      foreach (keys %hash) {
  if ($_ =~ /^pre_/ && $_ =~/link$/) {   if ($_ =~ /^pre_/ && $_ =~/link$/) {
     my $key = $_;      my $key = $_;
     $key =~ s/^pre_//;      $key =~ s/^pre_//;
Line 270  ENDHEADER Line 271  ENDHEADER
     delete $hash{'pre_'.$key.'_title'};      delete $hash{'pre_'.$key.'_title'};
     delete $hash{'pre_'.$key.'_link'};      delete $hash{'pre_'.$key.'_link'};
  }   }
     } keys %hash;      }
  }   }
   
 # ---------------------------------------------------------------- output title  # ---------------------------------------------------------------- output title
Line 335  END Line 336  END
  $r->print("</tr>");   $r->print("</tr>");
   
 # ----------------- read in what directories have previously been set to "open"  # ----------------- read in what directories have previously been set to "open"
  map {   foreach (keys %hash) {
     if ($_ =~ /^diropen_status_/) {      if ($_ =~ /^diropen_status_/) {
  my $key = $_;   my $key = $_;
  $key =~ s/^diropen_status_//;   $key =~ s/^diropen_status_//;
  $dirs{$key} = $hash{$_};   $dirs{$key} = $hash{$_};
     }      }
  } keys %hash;   }
   
  if ($ENV{'form.openuri'}) {  # take care of review and refresh options   if ($ENV{'form.openuri'}) {  # take care of review and refresh options
     my $uri=$ENV{'form.openuri'};      my $uri=$ENV{'form.openuri'};
Line 457  sub get_list { Line 458  sub get_list {
     $luri =~ s/\//_/g;      $luri =~ s/\//_/g;
   
     if ($ENV{'form.attrs'} eq "Refresh") {      if ($ENV{'form.attrs'} eq "Refresh") {
  map {   foreach (keys %hash) {
     delete $hash{$_} if ($_ =~ /^dirlist_files_/);      delete $hash{$_} if ($_ =~ /^dirlist_files_/);
     } keys %hash;      }
     }      }
   
     if ($hash{'dirlist_files'.$luri}) {      if ($hash{'dirlist_files'.$luri}) {
Line 489  sub match_ext { Line 490  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 "") {
     my $embstyle = &Apache::lonnet::fileembstyle($fext);      my $embstyle = &Apache::loncommon::fileembstyle($fext);
             push @trimlist,$line if (defined($embstyle) &&               push @trimlist,$line if (defined($embstyle) && 
      $embstyle ne 'hdn' );       $embstyle ne 'hdn' );
  } else {   } else {
Line 594  sub display_line { Line 595  sub display_line {
  my $curfext = $file_ext[-1];   my $curfext = $file_ext[-1];
  # Set the icon for the file   # Set the icon for the file
  my $iconname = "unknown.gif";   my $iconname = "unknown.gif";
  my $embstyle = &Apache::lonnet::fileembstyle($curfext);   my $embstyle = &Apache::loncommon::fileembstyle($curfext);
  # The unless conditional that follows is a bit of overkill   # The unless conditional that follows is a bit of overkill
  $iconname = $curfext.".gif" unless   $iconname = $curfext.".gif" unless
     (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');      (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
Line 689  sub display_line { Line 690  sub display_line {
  if ($hash{'display_attrs_5'} == 1) {   if ($hash{'display_attrs_5'} == 1) {
     my $lang = &Apache::lonnet::metadata($filelink,'language')      my $lang = &Apache::lonnet::metadata($filelink,'language')
  if ($metafile == 1);   if ($metafile == 1);
     $lang = $language{$lang};      $lang = &Apache::loncommon::languagedescription($lang);
     $lang = '&nbsp;' if (!$lang);      $lang = '&nbsp;' if (!$lang);
     $r->print("<td bgcolor=$fileclr valign=bottom> ".$lang.      $r->print("<td bgcolor=$fileclr valign=bottom> ".$lang.
       " </td>\n");        " </td>\n");
Line 753  sub begin_form { Line 754  sub begin_form {
   
 # ----------- grab unprocessed CGI variables that may have been appended to URL  # ----------- grab unprocessed CGI variables that may have been appended to URL
 sub get_unprocessed_cgi {  sub get_unprocessed_cgi {
     map {      foreach (split(/&/,$ENV{'QUERY_STRING'})) {
        my ($name, $value) = split(/=/,$_);         my ($name, $value) = split(/=/,$_);
        $value =~ tr/+/ /;         $value =~ tr/+/ /;
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;         $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
        if ($name eq 'catalogmode' or $name eq 'launch' or $name eq 'acts') {         if ($name eq 'catalogmode' or $name eq 'launch' or $name eq 'acts') {
            $ENV{'form.'.$name}=$value;             $ENV{'form.'.$name}=$value;
        }         }
     } (split(/&/,$ENV{'QUERY_STRING'}));      }
 }  }
   
 # --------- settings whenever the user causes the indexer window to be launched  # --------- settings whenever the user causes the indexer window to be launched
 sub start_fresh_session {  sub start_fresh_session {
     delete $hash{'mode_catalog'};      delete $hash{'mode_catalog'};
     map {      foreach (keys %hash) {
  if ($_ =~ /^pre_/) {   if ($_ =~ /^pre_/) {
     delete $hash{$_};      delete $hash{$_};
  }   }
  if ($_ =~ /^store/) {   if ($_ =~ /^store/) {
     delete $hash{$_};      delete $hash{$_};
  }   }
     } keys %hash;          }
 }  }
   
 1;  1;

Removed from v.1.26  
changed lines
  Added in v.1.28


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