--- loncom/interface/lonindexer.pm 2002/03/06 22:01:06 1.36
+++ loncom/interface/lonindexer.pm 2003/06/16 17:27:33 1.67
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.36 2002/03/06 22:01:06 matthew Exp $
+# $Id: lonindexer.pm,v 1.67 2003/06/16 17:27:33 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,15 +34,11 @@
# 05/9-05/19/2001 H. K. Ng
# 05/21/2001 H. K. Ng
# 05/23/2001 H. K. Ng
-# 5/31,6/1,6/2,6/15 Scott Harrison
# 6/26,7/8 H. K. Ng
-# 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
#
###
@@ -80,15 +76,26 @@ my $extrafield; # default extra table ce
my $fnum; # file counter
my $dnum; # directory counter
+# ----- Used to include or exclude files with certain extensions.
+my @Only = ();
+my @Omit = ();
+
+
# ----------------------------- Handling routine called via Apache and mod_perl
sub handler {
my $r = shift;
+ my $c = $r->connection();
$r->content_type('text/html');
+ &Apache::loncommon::no_cache($r);
$r->send_http_header;
return OK if $r->header_only;
$fnum=0;
$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') . "/";
@@ -108,7 +115,8 @@ sub handler {
# -------------------------------------- see if called from an interactive mode
# Get the parameters from the query string
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['catalogmode','launch','acts','mode','form','element']);
+ ['catalogmode','launch','acts','mode','form','element',
+ 'only','omit']);
#-------------------------------------------------------------------
my $closebutton='';
my $groupimportbutton='';
@@ -116,24 +124,23 @@ sub handler {
$extrafield='';
my $diropendb =
- "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+ "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db";
+ %hash = ();
+ my %dbfile;
+ if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
+ while(my($key,$value)=each(%dbfile)) {
+ $hash{$key}=$value;
+ }
+ untie(%dbfile);
- 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='
'.
'
';
@@ -143,7 +150,6 @@ sub handler {
END
}
elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
- $hash{'mode_catalog'}='groupimport';
$extrafield='
'.
'
';
@@ -164,14 +170,24 @@ END
# 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');
-
+ # &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') {
+ if ($mode eq 'edit' || $mode eq 'parmset') {
$form = $ENV{'form.form'};
$element = $ENV{'form.element'};
}
@@ -184,7 +200,15 @@ END
# by default (ie. if $mode is undefined). This is the easy
# way out. Hopefully in the future I'll find a way to get
# the calls dealt with in a more comprehensive manner.
- if (!defined($mode) || $mode ne 'edit') {
+
+#
+# There is now also mode "simple", which is for the simple version of the rat
+#
+#
+ if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {
+ my $location = "/adm/groupsort?catalogmode=groupimport&";
+ $location .= "mode=".$mode."&";
+ $location .= "acts=";
$catalogmodefunctions=<<"END";
function select_data(title,url) {
changeTitle(title);
@@ -192,7 +216,7 @@ function select_data(title,url) {
self.close();
}
function select_group() {
- window.location="/adm/groupsort?catalogmode=groupimport&acts="+document.forms.fileattr.acts.value;
+ window.location="$location"+document.forms.fileattr.acts.value;
}
function changeTitle(val) {
if (opener.inf) {
@@ -209,7 +233,9 @@ function changeURL(val) {
}
}
END
- } else { # we are in 'edit' mode
+ } elsif ($mode eq 'edit') { # we are in 'edit' mode
+ my $location = "/adm/groupsort?catalogmode=interactive&";
+ $location .= "form=$form&element=$element&mode=edit&acts=";
$catalogmodefunctions=<
-
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'};
@@ -319,37 +372,35 @@ ENDHEADER
}
}
-# ---------------------------------------------------------------- output title
- $r->print('
The LearningOnline 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<=8; $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<=8; $i++) {
+ $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
}
}
# ------------------------------- output state of file attributes to be showing
$r->print(<Display file attributes
