--- loncom/interface/lonindexer.pm 2002/06/13 15:05:16 1.43
+++ loncom/interface/lonindexer.pm 2003/02/20 19:41:26 1.61
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.43 2002/06/13 15:05:16 matthew Exp $
+# $Id: lonindexer.pm,v 1.61 2003/02/20 19:41:26 www 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
#
###
@@ -89,6 +85,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;
@@ -129,21 +126,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='
'.
'
';
@@ -153,7 +144,6 @@ sub handler {
END
}
elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
- $hash{'mode_catalog'}='groupimport';
$extrafield='
'.
'
';
@@ -175,11 +165,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'}) {
@@ -332,9 +322,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'};
@@ -377,39 +366,35 @@ 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<=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
