--- loncom/interface/lonindexer.pm 2002/08/08 13:07:17 1.48
+++ loncom/interface/lonindexer.pm 2003/01/14 18:47:50 1.55
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.48 2002/08/08 13:07:17 matthew Exp $
+# $Id: lonindexer.pm,v 1.55 2003/01/14 18:47:50 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -90,6 +90,7 @@ my @Omit = ();
sub handler {
my $r = shift;
$r->content_type('text/html');
+ &Apache::loncommon::no_cache($r);
$r->send_http_header;
return OK if $r->header_only;
$fnum=0;
@@ -130,7 +131,7 @@ sub handler {
my $diropendb =
"/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
- if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+ if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
if ($ENV{'form.launch'} eq '1') {
&start_fresh_session();
}
@@ -326,9 +327,8 @@ function gothere(val) {
-
ENDHEADER
-
+$r->print(&Apache::loncommon::bodytag('Browse Resources'));
# - Evaluate actions from previous page (both cumulatively and chronologically)
if ($ENV{'form.catalogmode'} eq 'groupimport') {
my $acts=$ENV{'form.acts'};
@@ -371,10 +371,6 @@ ENDHEADER
}
}
-# ---------------------------------------------------------------- output title
- $r->print(
-'The LearningOnline Network with CAPA '.
- 'Network Directory Browser
'."\n");
# ---------------------------------- get state of file attributes to be showing
if ($ENV{'form.attrs'} ne '') {
for (my $i=0; $i<=7; $i++) {
@@ -518,7 +514,7 @@ sub scanDir {
my %dupdirs = %dirs;
my @list=&get_list($r,$startdir);
foreach my $line (@list) {
- my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5);
+ my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5);
next if $strip =~ /.*\.meta$/;
my (@fileparts) = split(/\./,$strip);
if ($hash{'display_attrs_7'} != 1) {
@@ -543,7 +539,8 @@ sub scanDir {
while (my ($key,$val)= each %dupdirs) {
if ($key eq $compuri and $val eq "open") {
$diropen = "opened";
- delete $dupdirs{key},$dirs{$key};
+ delete($dupdirs{$key});
+ delete($dirs{$key});
}
}
}
@@ -629,7 +626,7 @@ sub match_ext {
# ------------------------------- displays one line in appropriate table format
sub display_line {
my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
- my (@pathfn, $fndir, $fnptr);
+ my (@pathfn, $fndir);
my $dirptr=16384;
my $fileclr="#ffffe6";
my $iconpath= $r->dir_config('lonIconsURL') . '/';
@@ -688,7 +685,8 @@ sub display_line {
$r->print ('
print (' border="0" />'."\n");
- $r->print("Domain - $listname $tabtag\n");
+ $r->print("Domain - $listname (".
+ $Apache::lonnet::domaindescription{$listname}.") $tabtag\n");
return OK;
# display user directory
@@ -921,6 +919,15 @@ sub setvalues {
1;
+sub cleanup {
+ if (tied(%hash)){
+ &Apache::lonnet::logthis('Cleanup indexer: hash');
+ unless (untie(%hash)) {
+ &Apache::lonnet::logthis('Failed cleanup indexer: hash');
+ }
+ }
+}
+
=head1 NAME
Apache::lonindexer - mod_perl module for cross server filesystem browsing