--- loncom/interface/lonindexer.pm 2002/08/20 13:01:53 1.51
+++ loncom/interface/lonindexer.pm 2003/03/14 16:12:14 1.62
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.51 2002/08/20 13:01:53 www Exp $
+# $Id: lonindexer.pm,v 1.62 2003/03/14 16:12:14 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,15 +34,10 @@
# 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
#
###
@@ -327,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'};
@@ -372,13 +366,9 @@ 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++) {
+ for (my $i=0; $i<=8; $i++) {
delete $hash{'display_attrs_'.$i};
if ($ENV{'form.attr'.$i} == 1) {
$attrchk[$i] = 'checked';
@@ -386,7 +376,7 @@ ENDHEADER
}
}
} else {
- for (my $i=0; $i<=7; $i++) {
+ for (my $i=0; $i<=8; $i++) {
$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
}
}
@@ -400,7 +390,7 @@ ENDHEADER
Size
Last access
Last modified
-
+
Show Resource
Author
Keywords
Language
@@ -437,6 +427,8 @@ END
if ($hash{'display_attrs_5'} == 1);
$r->print("
Language
\n")
if ($hash{'display_attrs_6'} == 1);
+ $r->print("
Resource
\n")
+ if ($hash{'display_attrs_8'} == 1);
$r->print('
');
# ----------------- read in what directories have previously been set to "open"
@@ -519,7 +511,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) {
@@ -527,7 +519,7 @@ sub scanDir {
my $fext = pop @fileparts;
my $ov = pop @fileparts;
my $fname = join ('.',@fileparts,$fext);
- next if (grep /$fname/,@list and $ov =~ /\d+/);
+ next if (grep /\Q$fname\E/,@list and $ov =~ /\d+/);
}
}
@@ -544,7 +536,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});
}
}
}
@@ -630,7 +623,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') . '/';
@@ -689,8 +682,12 @@ sub display_line {
$r->print ('print (' border="0" />'."\n");
- $r->print("Domain - $listname (".
- $Apache::lonnet::domaindescription{$listname}.") $tabtag\n");
+ $r->print ("Domain - $listname ");
+ if ($Apache::lonnet::domaindescription{$listname}) {
+ $r->print("(".$Apache::lonnet::domaindescription{$listname}.
+ ")");
+ }
+ $r->print (" $tabtag\n");
return OK;
# display user directory
@@ -712,7 +709,11 @@ sub display_line {
$r->print ('');
- $r->print ($listname.$tabtag.''."\n");
+ my $domain=(split(m|/|,$startdir))[2];
+ my $plainname=&Apache::loncommon::plainname($listname,$domain);
+ $r->print ($listname);
+ if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
+ $r->print ($tabtag.''."\n");
return OK;
}
@@ -738,7 +739,7 @@ sub display_line {
(!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
#
$r->print("
");
- my $metafile = grep /^$filecom[0]\.meta\&/, @list;
+ my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list;
my $title;
if ($ENV{'form.catalogmode'} eq 'interactive') {
$title=$listname;
@@ -838,6 +839,22 @@ sub display_line {
$r->print('