--- loncom/interface/lonindexer.pm 2008/12/05 10:23:56 1.184
+++ loncom/interface/lonindexer.pm 2009/02/26 16:17:30 1.189
@@ -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.189 2009/02/26 16:17:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -409,7 +409,7 @@ function gothere(val) {
ENDHEADER
my ($headerdom)=($uri=~m{^/res/($match_domain)/});
- $r->print(&Apache::loncommon::start_page('Browse Resources',$js,
+ $r->print(&Apache::loncommon::start_page('Content Library',$js,
{'domain' => $headerdom,}));
# ---------------------------------- get state of file types to be showing
if ($env{'form.only'}) {
@@ -420,7 +420,7 @@ ENDHEADER
# ---------------------------------- get state of file attributes to be showing
if ($env{'form.attrs'}) {
- for (my $i=0; $i<=11; $i++) {
+ for (my $i=0; $i<=14; $i++) {
delete $hash{'display_attrs_'.$i};
if ($env{'form.attr'.$i} == 1) {
$attrchk[$i] = 'checked';
@@ -428,7 +428,7 @@ ENDHEADER
}
}
} else {
- for (my $i=0; $i<=11; $i++) {
+ for (my $i=0; $i<=14; $i++) {
$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
}
}
@@ -444,6 +444,9 @@ ENDHEADER
'st' => 'Statistics',
'au' => 'Author',
'kw' => 'Keywords',
+ 'sb' => 'Subject',
+ 'nt' => 'Notes',
+ 'ab' => 'Abstract',
'ln' => 'Language',
'sa' => 'Source Available',
'sr' => 'Show resource',
@@ -467,17 +470,20 @@ ENDHEADER
+
+
+
@@ -569,7 +575,16 @@ END
if ($hash{'display_attrs_11'} == 1);
$r->print("
".&mt("Resource")."
\n")
if ($hash{'display_attrs_7'} == 1);
- $r->print(&Apache::loncommon::end_data_table_header_row());
+ $r->print("
".&mt("Subject")."
\n")
+ if ($hash{'display_attrs_12'} == 1);
+ $r->print("
".&mt("Notes")."
\n")
+ if ($hash{'display_attrs_13'} == 1);
+ $r->print("
".&mt("Abstract")."
\n")
+ if ($hash{'display_attrs_14'} == 1);
+
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+
+
# ----------------- read in what directories have previously been set to "open"
foreach (keys %hash) {
@@ -834,7 +849,7 @@ sub display_line {
my $tabtag='';
my $i=0;
- while ($i<=11) {
+ while ($i<=14) {
$tabtag=join('',$tabtag,"
")
if ($i != 9 &&
$hash{'display_attrs_'.$i} == 1);
@@ -992,7 +1007,7 @@ sub display_line {
$indent--;
}
# General indentation
- if ($indent > 0 and $indent < 11) {
+ if ($indent > 0 and $indent < 14) {
$r->print("\n");
} elsif ($indent >0) {
@@ -1060,7 +1075,6 @@ sub display_line {
$r->print('
'.($keywords eq '' ? ' ' : $keywords).
"
\n");
}
-#'
if ($hash{'display_attrs_6'} == 1) {
my $lang = &Apache::lonnet::metadata($filelink,'language');
@@ -1112,14 +1126,38 @@ sub display_line {
&dynmetaprint($r,$filelink,'course_list');
$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('