Diff for /loncom/interface/lonindexer.pm between versions 1.117 and 1.123

version 1.117, 2004/06/22 13:27:51 version 1.123, 2004/09/07 20:38:20
Line 136  sub handler { Line 136  sub handler {
    if ($ENV{'form.launch'} eq '2') {     if ($ENV{'form.launch'} eq '2') {
        $r->content_type('text/html');         $r->content_type('text/html');
        my $extra='';         my $extra='';
        if (defined($ENV{'form.titleelement'})) {         if (defined($ENV{'form.titleelement'}) && 
      $ENV{'form.titleelement'} ne '') {
    my $verify_title = &Apache::lonnet::gettitle($ENV{'form.acts'});     my $verify_title = &Apache::lonnet::gettitle($ENV{'form.acts'});
 #   &Apache::lonnet::logthis("Hrrm $ENV{'form.acts'} -- $verify_title");  #   &Apache::lonnet::logthis("Hrrm $ENV{'form.acts'} -- $verify_title");
    $verify_title=~s/'/\\'/g;     $verify_title=~s/'/\\'/g;
Line 178  END Line 179  END
  ' border="0" /></td>';   ' border="0" /></td>';
     $colspan=" colspan='2' ";      $colspan=" colspan='2' ";
     my $cl=&mt('Close');      my $cl=&mt('Close');
             my $gi=&mt('Group Import');              my $gi=&mt('Import');
             $closebutton=<<END;              $closebutton=<<END;
 <input type="button" name="close" value='$cl' onClick="self.close()">  <input type="button" name="close" value='$cl' onClick="self.close()">
 END  END
Line 518  END Line 519  END
  $r->print("<td><b>".&mt("Language")."</b></td>\n")   $r->print("<td><b>".&mt("Language")."</b></td>\n")
     if ($hash{'display_attrs_6'} == 1);      if ($hash{'display_attrs_6'} == 1);
  $r->print("<td><b>".&mt("Usage Statistics")." <br />(".   $r->print("<td><b>".&mt("Usage Statistics")." <br />(".
   &mt("Courses/Network Hits").")</b></td>\n")    &mt("Courses/Network Hits").")</b> ".&mt('updated periodically')."</td>\n")
     if ($hash{'display_attrs_8'} == 1);      if ($hash{'display_attrs_8'} == 1);
  $r->print("<td><b>".&mt("Source Available")."</b></td>\n")   $r->print("<td><b>".&mt("Source Available")."</b></td>\n")
     if ($hash{'display_attrs_10'} == 1);      if ($hash{'display_attrs_10'} == 1);
Line 661  sub get_list { Line 662  sub get_list {
     if ($ENV{'form.updatedisplay'}) {      if ($ENV{'form.updatedisplay'}) {
  foreach (keys %hash) {   foreach (keys %hash) {
     delete $hash{$_} if ($_ =~ /^dirlist_files_/);      delete $hash{$_} if ($_ =~ /^dirlist_files_/);
       delete $hash{$_} if ($_ =~ /^dirlist_timestamp_files_/);
  }   }
     }      }
   
     if ($hash{'dirlist_files_'.$luri}) {      if (defined($hash{'dirlist_files_'.$luri}) &&
    $hash{'dirlist_timestamp_files_'.$luri}+600 > (time)) {
  @list = split(/\n/,$hash{'dirlist_files_'.$luri});   @list = split(/\n/,$hash{'dirlist_files_'.$luri});
     } elsif ($uri=~/\.(page|sequence)\/$/) {      } elsif ($uri=~/\.(page|sequence)\/$/) {
 # is a page or a sequence  # is a page or a sequence
Line 680  sub get_list { Line 683  sub get_list {
 # is really a directory  # is really a directory
  @list = &Apache::lonnet::dirlist($uri);   @list = &Apache::lonnet::dirlist($uri);
  $hash{'dirlist_files_'.$luri} = join("\n",@list);   $hash{'dirlist_files_'.$luri} = join("\n",@list);
    $hash{'dirlist_timestamp_files_'.$luri} = time;
     }      }
     return @list=&match_ext($r,@list);      return @list=&match_ext($r,@list);
 }  }
Line 1017  sub display_line { Line 1021  sub display_line {
  if ($hash{'display_attrs_10'} == 1) {   if ($hash{'display_attrs_10'} == 1) {
     my $source = &Apache::lonnet::metadata($filelink,'sourceavail');      my $source = &Apache::lonnet::metadata($filelink,'sourceavail');
     if($source eq 'open') {      if($source eq 'open') {
  my $sourcelink = &Apache::lonsource::make_link($filelink);   my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
  $r->print('<td>'."<a href=\"javascript:openWindow('".$sourcelink.   $r->print('<td>'."<a href=\"javascript:openWindow('".$sourcelink.
   "', 'previewsource', '700', '700', 'no', 'yes','yes')\";".    "', 'previewsource', '700', '700', 'no', 'yes','yes')\";".
   " TARGET=_self>Yes</a> "."</td>\n");    " TARGET=_self>Yes</a> "."</td>\n");

Removed from v.1.117  
changed lines
  Added in v.1.123


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