--- loncom/interface/lonindexer.pm 2004/06/17 01:44:34 1.112
+++ loncom/interface/lonindexer.pm 2004/06/17 20:43:04 1.114
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.112 2004/06/17 01:44:34 www Exp $
+# $Id: lonindexer.pm,v 1.114 2004/06/17 20:43:04 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -60,7 +60,7 @@ my %hash; # global user-specific gdbm fi
my %dirs; # keys are directories, values are the open/close status
my %language; # has the reference information present in language.tab
my %dynhash; # hash of hashes for dynamic metadata
-
+my %fieldnames; # Metadata fieldnames
# ----- Values which are set by the handler subroutine and are accessible to
# ----- other methods.
my $extrafield; # default extra table cell
@@ -87,6 +87,7 @@ sub handler {
# these global to this package? It is just so wrong....)
undef (@Only);
undef (@Omit);
+ %fieldnames=&Apache::lonmeta::fieldnames();
# ------------------------------------- read in machine configuration variables
my $iconpath= $r->dir_config('lonIconsURL') . "/";
@@ -136,7 +137,7 @@ sub handler {
my $extra='';
if (defined($ENV{'form.titleelement'})) {
my $verify_title = &Apache::lonnet::gettitle($ENV{'form.acts'});
- &Apache::lonnet::logthis("Hrrm $ENV{'form.acts'} -- $verify_title");
+# &Apache::lonnet::logthis("Hrrm $ENV{'form.acts'} -- $verify_title");
$verify_title=~s/'/\\'/g;
$extra='window.opener.document.forms["'.$ENV{'form.form'}.'"].elements["'.$ENV{'form.titleelement'}.'"].value=\''.$verify_title.'\';';
}
@@ -684,7 +685,6 @@ sub dynmetaread {
if (($hash{'display_attrs_8'}==1) || ($hash{'display_attrs_11'}==1)) {
%dynhash=
(%dynhash,&Apache::lonmeta::get_dynamic_metadata_from_sql($uri));
- &Apache::lonnet::logthis('Found: '.$uri." : ".join(',',keys %dynhash));
}
}
@@ -874,7 +874,7 @@ sub display_line {
}
# Set the icon for the file
my $iconname = &Apache::loncommon::icon($listname);
- $r->print("
");
+ $r->print(" |
");
my $metafile = $Apache::lonnet::perlvar{'lonDocRoot'}.$pathprefix.
$filecom[0].'.meta';
@@ -1017,10 +1017,17 @@ sub display_line {
if ($hash{'display_attrs_8'} == 1) {
# statistics
$r->print(" | ");
- if ($dynhash{$filelink}->{'stdno'}) {
- $r->print(&mt('Number of students: ').
- $dynhash{$filelink}->{'stdno'}.' ');
- }
+ &dynmetaprint($r,$filelink,'count');
+ &dynmetaprint($r,$filelink,'course');
+ &dynmetaprint($r,$filelink,'stdno');
+ &dynmetaprint($r,$filelink,'avetries');
+ &dynmetaprint($r,$filelink,'difficulty');
+ &dynmetaprint($r,$filelink,'disc');
+ &dynmetaprint($r,$filelink,'clear');
+ &dynmetaprint($r,$filelink,'technical');
+ &dynmetaprint($r,$filelink,'correct');
+ &dynmetaprint($r,$filelink,'helpful');
+ &dynmetaprint($r,$filelink,'depth');
$r->print(" | \n");
}
@@ -1037,17 +1044,13 @@ sub display_line {
}
if ($hash{'display_attrs_11'} == 1) {
# links
- $r->print("$filelink");
- if ($dynhash{$filelink}->{'goto_list'}) {
- $r->print(&mt('Number of students: ').
- $dynhash{$filelink}->{'goto_list'}.' ');
- }
- if ($dynhash{$filelink}->{'comefrom_list'}) {
- $r->print(&mt('Number of students: ').
- $dynhash{$filelink}->{'comefrom_list'}.' ');
- }
- $r->print(" | \n");
- }
+ $r->print('');
+ &dynmetaprint($r,$filelink,'goto_list');
+ &dynmetaprint($r,$filelink,'comefrom_list');
+ &dynmetaprint($r,$filelink,'sequsage_list');
+ &dynmetaprint($r,$filelink,'dependencies');
+ $r->print(' | ');
+ }
$r->print("
\n");
}
@@ -1135,6 +1138,18 @@ sub display_line {
}
+sub dynmetaprint {
+ my ($r,$filelink,$item)=@_;
+ if ($dynhash{$filelink}->{$item}) {
+ $r->print("\n
".$fieldnames{$item}.': '.
+ &Apache::lonmeta::prettyprint($item,
+ $dynhash{$filelink}->{$item},
+ (($ENV{'form.catalogmode'} ne 'groupimport')?'preview':''),
+ '',
+ (($ENV{'form.catalogmode'} eq 'groupimport')?'document.forms.fileattr':''),1));
+ }
+}
+
# ------------------- prints the beginning of a form for directory or file link
sub begin_form {
my ($r,$uri) = @_;