--- loncom/interface/lonindexer.pm 2003/12/22 19:30:25 1.83
+++ loncom/interface/lonindexer.pm 2004/01/05 15:02:43 1.86
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.83 2003/12/22 19:30:25 www Exp $
+# $Id: lonindexer.pm,v 1.86 2004/01/05 15:02:43 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -446,6 +446,8 @@ $groupimportbutton
END
# ---------------------------------------------------------------- Bread crumbs
$r->print(&Apache::lonhtmlcommon::crumbs($uri));
+# ------------------------------------------------------ Remember where we were
+ &Apache::loncommon::storeresurl($uri);
# ----------------- output starting row to the indexed file/directory hierarchy
my $titleclr="#ddffff";
# $r->print(&initdebug());
@@ -793,12 +795,7 @@ sub display_line {
return OK if ($skip > 0);
}
# Set the icon for the file
- my $iconname = "unknown.gif";
- my $embstyle = &Apache::loncommon::fileembstyle($curfext);
- # The unless conditional that follows is a bit of overkill
- $iconname = $curfext.".gif" unless
- (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
- #
+ my $iconname = &Apache::loncommon::icon($listname);
$r->print("
");
my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list;
my $title;
@@ -854,7 +851,7 @@ sub display_line {
".gif border='0' />\n") if $rem > 0;
}
- $r->print("\n");
+ $r->print("\n");
$r->print (" $listname ");
@@ -930,8 +927,6 @@ sub display_line {
# -- display directory
if ($fnptr == $dirptr) {
- my @file_ext = split (/\./,$listname);
- my $curfext = $file_ext[scalar(@file_ext)-1];
my $curdir = $startdir.$filecom[0].'/';
my $anchor = $curdir;
$anchor =~ s/\///g;
@@ -961,7 +956,49 @@ sub display_line {
$r->print (''.
"\n");
- $r->print ("$listname$tabtag |
\n");
+ $r->print ("$listname\n");
+# Attributes
+ my $filelink = $startdir.$filecom[0].'/default';
+
+ if ($hash{'display_attrs_0'} == 1) {
+ my $title = &Apache::lonnet::gettitle($filelink,'title');
+ $r->print(' '.($title eq '' ? ' ' : $title).
+ ' | '."\n");
+ }
+ $r->print(' ',
+ $filecom[8]," | \n")
+ if $hash{'display_attrs_1'} == 1;
+ $r->print(' '.
+ (localtime($filecom[9]))." | \n")
+ if $hash{'display_attrs_2'} == 1;
+ $r->print(' '.
+ (localtime($filecom[10]))." | \n")
+ if $hash{'display_attrs_3'} == 1;
+
+ if ($hash{'display_attrs_4'} == 1) {
+ my $author = &Apache::lonnet::metadata($filelink,'author');
+ $r->print(' '.($author eq '' ? ' ' : $author).
+ " | \n");
+ }
+ if ($hash{'display_attrs_5'} == 1) {
+ my $keywords = &Apache::lonnet::metadata($filelink,'keywords');
+ # $keywords = ' ' if (!$keywords);
+ $r->print(' '.($keywords eq '' ? ' ' : $keywords).
+ " | \n");
+ }
+ if ($hash{'display_attrs_6'} == 1) {
+ my $lang = &Apache::lonnet::metadata($filelink,'language');
+ $lang = &Apache::loncommon::languagedescription($lang);
+ $r->print(' '.($lang eq '' ? ' ' : $lang).
+ " | \n");
+ }
+ if ($hash{'display_attrs_7'} == 1) {
+ $r->print(' | ');
+ }
+ if ($hash{'display_attrs_8'} == 1) {
+ $r->print(' | ');
+ }
+ $r->print('');
}
}