--- loncom/interface/lonindexer.pm 2002/07/30 19:47:13 1.47
+++ loncom/interface/lonindexer.pm 2003/01/09 22:04:28 1.54
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.47 2002/07/30 19:47:13 ng Exp $
+# $Id: lonindexer.pm,v 1.54 2003/01/09 22:04:28 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,21 +131,15 @@ 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();
}
# -------------------- refresh environment with user database values (in %hash)
- if ($hash{'mode_catalog'} eq 'interactive') {
- $ENV{'form.catalogmode'}='interactive';
- }
- if ($hash{'mode_catalog'} eq 'groupimport') {
- $ENV{'form.catalogmode'}='groupimport';
- }
+ &setvalues(\%hash,'form.catalogmode',\%ENV,'form.catalogmode' );
# --------------------- define extra fields and buttons in case of special mode
if ($ENV{'form.catalogmode'} eq 'interactive') {
- $hash{'mode_catalog'}='interactive';
$extrafield=''.
' | ';
@@ -154,7 +149,6 @@ sub handler {
END
}
elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
- $hash{'mode_catalog'}='groupimport';
$extrafield=''.
' | ';
@@ -176,11 +170,11 @@ END
# $element is the name of the element in $formname which receives
# the URL.
# &Apache::lonxml::debug('Checking mode, form, element');
- &setvalues(\%hash,'form_mode' ,\%ENV,'form.mode' );
- &setvalues(\%hash,'form_form' ,\%ENV,'form.form' );
- &setvalues(\%hash,'form_element',\%ENV,'form.element');
- &setvalues(\%hash,'form_only' ,\%ENV,'form.only' );
- &setvalues(\%hash,'form_omit' ,\%ENV,'form.omit' );
+ &setvalues(\%hash,'form.mode' ,\%ENV,'form.mode' );
+ &setvalues(\%hash,'form.form' ,\%ENV,'form.form' );
+ &setvalues(\%hash,'form.element',\%ENV,'form.element');
+ &setvalues(\%hash,'form.only' ,\%ENV,'form.only' );
+ &setvalues(\%hash,'form.omit' ,\%ENV,'form.omit' );
# Deal with 'omit' and 'only'
if (exists $ENV{'form.omit'}) {
@@ -333,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'};
@@ -378,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++) {
@@ -525,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) {
@@ -550,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});
}
}
}
@@ -636,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') . '/';
@@ -695,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
@@ -902,19 +893,14 @@ sub begin_form {
# --------- settings whenever the user causes the indexer window to be launched
sub start_fresh_session {
- delete $hash{'mode_catalog'};
- delete $hash{'form_mode'};
- delete $hash{'form_form'};
- delete $hash{'form_element'};
- delete $hash{'form_omit'};
- delete $hash{'form_only'};
+ delete $hash{'form.catalogmode'};
+ delete $hash{'form.mode'};
+ delete $hash{'form.form'};
+ delete $hash{'form.element'};
+ delete $hash{'form.omit'};
+ delete $hash{'form.only'};
foreach (keys %hash) {
- if ($_ =~ /^pre_/) {
- delete $hash{$_};
- }
- if ($_ =~ /^store/) {
- delete $hash{$_};
- }
+ delete $hash{$_} if (/^(pre_|store)/);
}
}
@@ -933,6 +919,10 @@ sub setvalues {
1;
+sub cleanup {
+ untie(%hash) if (tied(%hash));
+}
+
=head1 NAME
Apache::lonindexer - mod_perl module for cross server filesystem browsing