--- loncom/interface/lonindexer.pm 2001/11/29 20:31:45 1.24
+++ loncom/interface/lonindexer.pm 2002/08/12 18:21:42 1.49
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.24 2001/11/29 20:31:45 harris41 Exp $
+# $Id: lonindexer.pm,v 1.49 2002/08/12 18:21:42 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,6 +39,11 @@
# 8/6,8/7,8/10 Scott Harrison
# 8/14 H. K. Ng
# 8/28,10/15,11/28,11/29 Scott Harrison
+# 11/30 Matthew Hall
+# 12/11,12/13 Scott Harrison
+# YEAR=2002
+# 1/17 Scott Harrison
+# 6/29/2002 H. K. Ng
#
###
@@ -60,6 +65,7 @@ package Apache::lonindexer;
# ------------------------------------------------- modules used by this module
use strict;
use Apache::lonnet();
+use Apache::loncommon();
use Apache::Constants qw(:common);
use Apache::File;
use GDBM_File;
@@ -75,15 +81,10 @@ my $extrafield; # default extra table ce
my $fnum; # file counter
my $dnum; # directory counter
-# ---------------------------------------------------------------------- BEGIN
-sub BEGIN {
- my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
- '/language.tab');
- map {
- $_=~/(\w+)\s+([\w\s\-]+)/;
- $language{$1}=$2;
- } <$fh>;
-}
+# ----- Used to include or exclude files with certain extensions.
+my @Only = ();
+my @Omit = ();
+
# ----------------------------- Handling routine called via Apache and mod_perl
sub handler {
@@ -95,6 +96,11 @@ sub handler {
$dnum=0;
untie %hash;
+ # Deal with stupid global variables (is there a way around making
+ # these global to this package? It is just so wrong....)
+ undef (@Only);
+ undef (@Omit);
+
# ------------------------------------- read in machine configuration variables
my $iconpath= $r->dir_config('lonIconsURL') . "/";
my $domain = $r->dir_config('lonDefDomain');
@@ -111,8 +117,11 @@ sub handler {
my $uri=$r->uri;
# -------------------------------------- see if called from an interactive mode
- &get_unprocessed_cgi();
-
+ # Get the parameters from the query string
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['catalogmode','launch','acts','mode','form','element',
+ 'only','omit']);
+ #-------------------------------------------------------------------
my $closebutton='';
my $groupimportbutton='';
my $colspan='';
@@ -121,22 +130,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='
'.
'
';
@@ -146,7 +148,6 @@ sub handler {
END
}
elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
- $hash{'mode_catalog'}='groupimport';
$extrafield='
'.
'
';
@@ -159,35 +160,136 @@ END
onClick="javascript:select_group()">
END
}
-
+ # Additions made by Matthew to make the browser a little easier to deal
+ # with in the future.
+ #
+ # $mode (at this time) indicates if we are in edit mode.
+ # $form is the name of the form that the URL is placed when the
+ # selection is made.
+ # $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' );
+
+ # Deal with 'omit' and 'only'
+ if (exists $ENV{'form.omit'}) {
+ @Omit = split(',',$ENV{'form.omit'});
+ }
+ if (exists $ENV{'form.only'}) {
+ @Only = split(',',$ENV{'form.only'});
+ }
+
+ my $mode = $ENV{'form.mode'};
+ my ($form,$element);
+ if ($mode eq 'edit' || $mode eq 'parmset') {
+ $form = $ENV{'form.form'};
+ $element = $ENV{'form.element'};
+ }
+ &Apache::lonxml::debug("mode=$mode form=$form element=$element");
# ------ set catalogmodefunctions to have extra needed javascript functionality
my $catalogmodefunctions='';
if ($ENV{'form.catalogmode'} eq 'interactive' or
$ENV{'form.catalogmode'} eq 'groupimport') {
- $catalogmodefunctions=<$achash{$b}} (keys %ahash)) {
my $key=$_;
if ($ahash{$key} eq '1') {
$hash{'store_'.$hash{'pre_'.$key.'_link'}}=
@@ -259,9 +358,9 @@ ENDHEADER
delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
}
}
- } sort {$achash{$a}<=>$achash{$b}} (keys %ahash);
+ }
# deleting the previously cached listing
- map {
+ foreach (keys %hash) {
if ($_ =~ /^pre_/ && $_ =~/link$/) {
my $key = $_;
$key =~ s/^pre_//;
@@ -269,41 +368,42 @@ ENDHEADER
delete $hash{'pre_'.$key.'_title'};
delete $hash{'pre_'.$key.'_link'};
}
- } keys %hash;
+ }
}
# ---------------------------------------------------------------- output title
- $r->print('
The LearningOnline With CAPA '.
+ $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<=6; $i++) {
+ if ($ENV{'form.attrs'} ne '') {
+ for (my $i=0; $i<=7; $i++) {
delete $hash{'display_attrs_'.$i};
if ($ENV{'form.attr'.$i} == 1) {
- $attrchk[$i] = "checked";
+ $attrchk[$i] = 'checked';
$hash{'display_attrs_'.$i} = 1;
}
}
} else {
- for (my $i=0; $i<=6; $i++) {
- $attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1;
+ for (my $i=0; $i<=7; $i++) {
+ $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
}
}
# ------------------------------- output state of file attributes to be showing
$r->print(<Display file attributes
