--- loncom/interface/lonindexer.pm 2009/03/18 13:47:14 1.193
+++ loncom/interface/lonindexer.pm 2009/04/07 20:12:06 1.196
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.193 2009/03/18 13:47:14 jms Exp $
+# $Id: lonindexer.pm,v 1.196 2009/04/07 20:12:06 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -178,7 +178,7 @@ ENDSUBM
# --------------------- define extra fields and buttons in case of special mode
if ($env{'form.catalogmode'} eq 'interactive') {
#SB $extrafield='
);
- $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
- $r->print('');
+ $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
+ $r->print(' | ');
if ($env{'form.catalogmode'} eq 'interactive') {
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
@@ -991,7 +993,7 @@ sub display_line {
$quotable_filelink,"')\">");
$r->print("".
"\n");
- $r->print(' | ');
+ $r->print(' | ');
} elsif ($env{'form.catalogmode'} eq 'import') {
$r->print(" | ');
+ $r->print(' | ');
$hash{"pre_${fnum}_link"}=$filelink;
$hash{"pre_${fnum}_title"}=$title;
if (!$hash{"pre_${fnum}_title"}) {
@@ -1016,34 +1018,27 @@ sub display_line {
$indent--;
}
# General indentation
- if ($indent > 0 and $indent < 16) {
- $r->print("\n");
- } elsif ($indent >0) {
- my $ten = int($indent/10.);
- my $rem = $indent%10.0;
my $count = 0;
- while ($count < $ten) {
+ while ($count < $indent) {
$r->print("\n");
- $count++;
+ "whitespace_21.gif class='LC_icon' />\n");
+ $count++;
}
- $r->print("\n") if $rem > 0;
- }
# Sequence open/close icon
if ($filelink=~/\.(page|sequence)$/) {
my $curdir = $startdir.$filecom[0].'/';
my $anchor = $curdir;
$anchor =~ s/\W//g;
$r->print ('');
- $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+ $r->print ('');
+ $r->print ('');
+ $r->print ('print (' name="'.$msg.'" type="image" class="LC_fileicon" />'.
"\n");
}
# Filetype icons
- $r->print("\n");
+ $r->print("\n");
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
$r->print (" print(' | '.($title eq '' ? ' ' : $title).
' | '."\n");
}
- $r->print(' ',
+ $r->print(' | ',
$filecom[8]," | \n")
if $hash{'display_attrs_1'} == 1;
- $r->print(' '.
+ $r->print(' | '.
(&Apache::lonlocal::locallocaltime($filecom[9]))." | \n")
if $hash{'display_attrs_2'} == 1;
- $r->print(' '.
+ $r->print(' | '.
(&Apache::lonlocal::locallocaltime($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).
+ $r->print(' | '.($author eq '' ? ' ' : $author).
" | \n");
}
if ($hash{'display_attrs_5'} == 1) {
@@ -1095,17 +1090,13 @@ sub display_line {
# statistics
&dynmetaread($filelink);
$r->print("");
- &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');
+
+ for (qw(count course stdno avetries difficulty disc clear technical
+ correct helpful depth)) {
+
+ dynmetaprint($r,$filelink,$_);
+ }
+
$r->print(" | \n");
}
@@ -1128,11 +1119,9 @@ sub display_line {
&dynmetaread($filelink);
$r->print('');
&coursecontext($r,$filelink);
- &dynmetaprint($r,$filelink,'goto_list');
- &dynmetaprint($r,$filelink,'comefrom_list');
- &dynmetaprint($r,$filelink,'sequsage_list');
- &dynmetaprint($r,$filelink,'dependencies');
- &dynmetaprint($r,$filelink,'course_list');
+ for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) {
+ dynmetaprint($r,$filelink,$_);
+ }
$r->print(' | ');
}
@@ -1188,36 +1177,31 @@ sub display_line {
#SB $r->print("