--- loncom/interface/lonindexer.pm 2002/03/06 20:28:19 1.35
+++ loncom/interface/lonindexer.pm 2003/09/27 13:20:46 1.78
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.35 2002/03/06 20:28:19 matthew Exp $
+# $Id: lonindexer.pm,v 1.78 2003/09/27 13:20:46 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
#
###
@@ -66,7 +62,9 @@ use strict;
use Apache::lonnet();
use Apache::loncommon();
use Apache::Constants qw(:common);
+use Apache::lonmeta;
use Apache::File;
+use Apache::lonlocal;
use GDBM_File;
# ---------------------------------------- variables used throughout the module
@@ -80,15 +78,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;
- $r->content_type('text/html');
+ my $c = $r->connection();
+ &Apache::loncommon::content_type($r,'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') . "/";
@@ -107,7 +116,9 @@ sub handler {
# -------------------------------------- see if called from an interactive mode
# Get the parameters from the query string
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['catalogmode','launch','acts','mode','form','element',
+ 'only','omit']);
#-------------------------------------------------------------------
my $closebutton='';
my $groupimportbutton='';
@@ -115,43 +126,47 @@ sub handler {
$extrafield='';
my $diropendb =
- "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
-
- if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+ "/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 ($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='
'.
'
';
$colspan=" colspan='2' ";
+ my $cl=&mt('Close');
$closebutton=<
+
END
}
elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
- $hash{'mode_catalog'}='groupimport';
$extrafield='
'.
'
';
$colspan=" colspan='2' ";
+ my $cl=&mt('Close');
+ my $gi=&mt('Group Import');
$closebutton=<
+
END
$groupimportbutton=<
END
}
@@ -163,14 +178,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'};
}
@@ -183,7 +208,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);
@@ -191,7 +224,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) {
@@ -208,7 +241,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=<
$catalogmodefunctions
-function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
- var options = "width=" + w + ",height=" + h + ",";
+function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
+ var xpos = (screen.width-w)/2;
+ xpos = (xpos < 0) ? '0' : xpos;
+ var ypos = (screen.height-h)/2-30;
+ ypos = (ypos < 0) ? '0' : ypos;
+ var options = "width=" + w + ",height=" + h + ",screenx="+xpos+",screeny="+ypos+",";
options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
- options += "menubar=no,toolbar="+toolbar+",location=no,directories=no";
+ options += "menubar=no,toolbar="+toolbar+",location="+locationbar+",directories=no";
var newWin = window.open(url, wdwName, options);
newWin.focus();
}
@@ -273,9 +340,10 @@ function gothere(val) {
-
ENDHEADER
-
+my ($headerdom)=($uri=~/^\/res\/(\w+)\//);
+$r->print(&Apache::loncommon::bodytag('Browse Resources',undef,undef,undef,
+ $headerdom));
# - Evaluate actions from previous page (both cumulatively and chronologically)
if ($ENV{'form.catalogmode'} eq 'groupimport') {
my $acts=$ENV{'form.acts'};
@@ -318,43 +386,57 @@ 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<=9; $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<=9; $i++) {
+ $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
}
}
# ------------------------------- output state of file attributes to be showing
+# All versions has to the last item
+# since it does not take an extra col
+ my %lt=&Apache::lonlocal::texthash(
+ 'ti' => 'Title',
+ 'si' => 'Size',
+ 'la' => 'Last access',
+ 'lm' => 'Last modified',
+ 'st' => 'Statistics',
+ 'au' => 'Author',
+ 'kw' => 'Keywords',
+ 'ln' => 'Language',
+ 'sr' => 'Show resource',
+ 'av' => 'All versions',
+ 'ud' => 'Update Display'
+ );
$r->print(<Display file attributes
@@ -362,22 +444,32 @@ END
# ----------------- output starting row to the indexed file/directory hierarchy
my $titleclr="#ddffff";
- $r->print("
\n");
- $r->print("
\n");
- $r->print("
Name
\n");
- $r->print("
Size (bytes) ".
- "
\n") if ($hash{'display_attrs_0'} == 1);
- $r->print("
Last accessed
\n")
- if ($hash{'display_attrs_1'} == 1);
- $r->print("
Last modified
\n")
+# $r->print(&initdebug());
+# $r->print(&writedebug("Omit:@Omit")) if (@Omit);
+# $r->print(&writedebug("Only:@Only")) if (@Only);
+ $r->print("
\n");
+ $r->print("
\n");
+ $r->print("
".&mt('Name')."
\n");
+ $r->print("
".&mt('Title')."
\n")
+ if ($hash{'display_attrs_0'} == 1);
+ $r->print("
".&mt("Size")." (".&mt("bytes").") ".
+ "
\n") if ($hash{'display_attrs_1'} == 1);
+ $r->print("
".&mt("Last accessed")."
\n")
if ($hash{'display_attrs_2'} == 1);
- $r->print("
Author(s)
\n")
+ $r->print("
".&mt("Last modified")."
\n")
if ($hash{'display_attrs_3'} == 1);
- $r->print("
Keywords
\n")
+ $r->print("
".&mt("Author(s)")."
\n")
if ($hash{'display_attrs_4'} == 1);
- $r->print("
Language
\n")
+ $r->print("
".&mt("Keywords")."
\n")
if ($hash{'display_attrs_5'} == 1);
- $r->print("
");
+ $r->print("
".&mt("Language")."
\n")
+ if ($hash{'display_attrs_6'} == 1);
+ $r->print("
".&mt("Resource")."
\n")
+ if ($hash{'display_attrs_7'} == 1);
+ $r->print("
\n")
+ if ($hash{'display_attrs_8'} == 1);
+ $r->print('');
# ----------------- read in what directories have previously been set to "open"
foreach (keys %hash) {
@@ -409,7 +501,7 @@ END
my $indent = 0;
$uri = $uri.'/' if $uri !~ /.*\/$/;
- if ($bredir ne "on") {
+ if ($bredir ne 'on') {
$hash{'top.level'} = $uri;
$toplevel = $uri;
@@ -418,7 +510,7 @@ END
}
# -------------------------------- if not at top level, provide an uplink arrow
- if ($toplevel ne "/res/"){
+ if ($toplevel ne '/res/'){
my (@uri_com) = split(/\//,$uri);
pop @uri_com;
my $upone = join('/',@uri_com);
@@ -435,23 +527,33 @@ END
$r->print("");
# -------------------------------------------------------------- end the tables
- $r->print("
");
- $r->print("
");
+ $r->print('
');
+ $r->print('
');
# --------------------------------------------------- end the output and return
- $r->print("
