--- loncom/interface/lonindexer.pm 2008/12/05 10:23:56 1.184
+++ 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.184 2008/12/05 10:23:56 bisitz 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);
@@ -967,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"}) {
@@ -992,34 +1018,27 @@ sub display_line {
$indent--;
}
# General indentation
- if ($indent > 0 and $indent < 11) {
- $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) {
@@ -1060,7 +1079,6 @@ sub display_line {
$r->print(' '.($keywords eq '' ? ' ' : $keywords).
" \n");
}
-#'
if ($hash{'display_attrs_6'} == 1) {
my $lang = &Apache::lonnet::metadata($filelink,'language');
@@ -1072,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");
}
@@ -1105,21 +1119,55 @@ 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(' ');
}
- if ($hash{'display_attrs_7'} == 1) {
+
+
+
+ if ($hash{'display_attrs_7'} == 1) {
# Show resource
my $output=&showpreview($filelink);
$r->print(' '.($output eq '' ? ' ':$output).
" \n");
- }
- $r->print(&Apache::loncommon::end_data_table_row());
}
+
+ if ($hash{'display_attrs_12'} == 1) {
+ my $subject = &Apache::lonnet::metadata($filelink,'subject');
+ $r->print(' '.($subject eq '' ? ' ' : $subject).
+ " \n");
+ }
+
+ if ($hash{'display_attrs_13'} == 1) {
+ my $notes = &Apache::lonnet::metadata($filelink,'notes');
+ $r->print(' '.($notes eq '' ? ' ' : $notes).
+ " \n");
+ }
+
+ if ($hash{'display_attrs_14'} == 1) {
+ my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
+ $r->print(' '.($abstract eq '' ? ' ' : $abstract).
+ " \n");
+ }
+
+ if ($hash{'display_attrs_15'} == 1) {
+ my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
+ $r->print(' '.($gradelevel eq '' ? ' ' : $gradelevel).
+ " \n");
+ }
+
+ if ($hash{'display_attrs_16'} == 1) {
+ my $standards = &Apache::lonnet::metadata($filelink,'standards');
+ $r->print(' '.($standards eq '' ? ' ' : $standards).
+ " \n");
+ }
+
+ $r->print(&Apache::loncommon::end_data_table_row());
+}
+
+
# -- display directory
if ($fnptr == $dirptr) {
@@ -1129,36 +1177,31 @@ sub display_line {
#SB $r->print(" ');
- $r->print($extrafield.'');
+ $r->print($extrafield.' ');
&begin_form ($r,$curdir);
my $indentm1 = $indent-1;
- if ($indentm1 < 11 and $indentm1 > 0) {
- $r->print(" \n");
- } else {
- my $ten = int($indentm1/10.);
- my $rem = $indentm1%10.0;
- my $count = 0;
- while ($count < $ten) {
- $r->print (" \n");
- $count++;
- }
- $r->print (" \n") if $rem > 0;
+ my $count = 0;
+ while ($count < $indentm1) {
+ $r->print (" \n");
+ $count++;
}
$r->print (' ');
- $r->print (' print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+ $r->print (' ');
+ $r->print (' print (' name="'.$msg.'" class="LC_fileicon" /> '.
"\n");
my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
- $r->print (''
- .' '.
- "\n");
- $r->print ("$listname \n");
+
+ my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+ my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';
+ $r->print (''
+ .' '.
+ "\n");
+ $r->print ("$listname \n");
# Attributes
my $filelink = $startdir.$filecom[0].'/default';
@@ -1167,13 +1210,13 @@ sub display_line {
$r->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;
@@ -1194,19 +1237,50 @@ sub display_line {
$r->print(' '.($lang eq '' ? ' ' : $lang).
" \n");
}
+
if ($hash{'display_attrs_8'} == 1) {
$r->print(' ');
}
if ($hash{'display_attrs_10'} == 1) {
$r->print(' ');
}
- if ($hash{'display_attrs_11'} == 1) {
- $r->print(' ');
- }
if ($hash{'display_attrs_7'} == 1) {
$r->print(' ');
- }
- $r->print(&Apache::loncommon::end_data_table_row());
+ }
+ if ($hash{'display_attrs_11'} == 1) {
+ $r->print(' ');
+ }
+ if ($hash{'display_attrs_12'} == 1) {
+ my $subject = &Apache::lonnet::metadata($filelink,'subject');
+ $r->print(' '.($subject eq '' ? ' ' : $subject).
+ " \n");
+ }
+ if ($hash{'display_attrs_13'} == 1) {
+ my $notes = &Apache::lonnet::metadata($filelink,'notes');
+ $r->print(' '.($notes eq '' ? ' ' : $notes).
+ " \n");
+ }
+
+ if ($hash{'display_attrs_14'} == 1) {
+ my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
+ $r->print(' '.($abstract eq '' ? ' ' : $abstract).
+ " \n");
+ }
+
+ if ($hash{'display_attrs_15'} == 1) {
+ my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
+ $r->print(' '.($gradelevel eq '' ? ' ' : $gradelevel).
+ " \n");
+ }
+
+ if ($hash{'display_attrs_16'} == 1) {
+ my $standards = &Apache::lonnet::metadata($filelink,'standards');
+ $r->print(' '.($standards eq '' ? ' ' : $standards).
+ " \n");
+ }
+
+
+ $r->print(&Apache::loncommon::end_data_table_row());
}
}
@@ -1255,7 +1329,7 @@ sub showpreview {
close(FH);
}
}
- $output=''.$output.' ';
+ $output=''.$output.' ';
} elsif ($embstyle eq 'img') {
$output=' ';
} elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {