--- loncom/interface/lonindexer.pm	2008/08/01 14:53:42	1.181
+++ loncom/interface/lonindexer.pm	2009/08/13 12:46:29	1.181.4.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.181 2008/08/01 14:53:42 bisitz Exp $
+# $Id: lonindexer.pm,v 1.181.4.2 2009/08/13 12:46:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -407,8 +407,14 @@ function gothere(val) {
 ENDHEADER
 
         my ($headerdom)=($uri=~m{^/res/($match_domain)/});
-	$r->print(&Apache::loncommon::start_page('Browse Resources',$js,
-						 {'domain' => $headerdom,}));
+        my %args = (
+                      'domain' => $headerdom,
+                   );
+        if ($env{'form.catalogmode'}) {
+            # "Popup mode"
+            $args{'only_body'} = 1;
+        }
+	$r->print(&Apache::loncommon::start_page('Browse Resources',$js,\%args));
 # ---------------------------------- get state of file types to be showing
 	if ($env{'form.only'}) {
 	    $typeselect = $env{'form.only'};
@@ -418,7 +424,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<=16; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($env{'form.attr'.$i} == 1) {
 		    $attrchk[$i] = 'checked';
@@ -426,7 +432,7 @@ ENDHEADER
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=11; $i++) {
+	    for (my $i=0; $i<=16; $i++) {
 		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
@@ -442,7 +448,12 @@ ENDHEADER
 					   'st' => 'Statistics',
 					   'au' => 'Author',
 					   'kw' => 'Keywords',
+                                           'sb' => 'Subject',
+                                           'nt' => 'Notes',
+                                           'ab' => 'Abstract',
 					   'ln' => 'Language',
+                                           'gl' => 'Grade Level',
+                                           'sd' => 'Standards',
 					   'sa' => 'Source Available',
 					   'sr' => 'Show resource',
 					   'li' => 'Linked/Related Resources',
@@ -450,9 +461,12 @@ ENDHEADER
 					   'ud' => 'Update Display',
 					   'pr' => 'Problems',
 					   'gr' => 'Graphics',
-					   'at' => 'All types'
+					   'at' => 'All types',
+                                           'hd' => 'Display Options',
 					   );
 	$r->print(<<END);
+<fieldset>
+<legend>$lt{'hd'}</legend>
 <form method="post" name="fileattr" action="$uri"
  enctype="application/x-www-form-urlencoded">
 <label><input type="checkbox" name="attr9" value="1" $attrchk[9] onClick="this.form.submit();" /> $lt{'av'}</label>
@@ -462,17 +476,23 @@ ENDHEADER
 <td><label><input type="checkbox" name="attr4" value="1" $attrchk[4] onClick="this.form.submit();" /> $lt{'au'}</label></td>
 <td><label><input type="checkbox" name="attr5" value="1" $attrchk[5] onClick="this.form.submit();" /> $lt{'kw'}</label></td>
 <td><label><input type="checkbox" name="attr6" value="1" $attrchk[6] onClick="this.form.submit();" /> $lt{'ln'}</label></td>
+<td><label><input type="checkbox" name="attr13" value="1" $attrchk[13] onClick="this.form.submit();" /> $lt{'nt'}</label></td>
+<td><label><input type="checkbox" name="attr16" value="1" $attrchk[16] onClick="this.form.submit();" /> $lt{'sd'}</label></td>
 </tr>
 <tr>
 <td><label><input type="checkbox" name="attr1" value="1" $attrchk[1] onClick="this.form.submit();" /> $lt{'si'}</label></td>
 <td><label><input type="checkbox" name="attr2" value="1" $attrchk[2] onClick="this.form.submit();" /> $lt{'la'}</label></td>
 <td><label><input type="checkbox" name="attr3" value="1" $attrchk[3] onClick="this.form.submit();" /> $lt{'lm'}</label></td>
 <td><label><input type="checkbox" name="attr10" value="1" $attrchk[10] onClick="this.form.submit();" /> $lt{'sa'}</label></td>
+<td><label><input type="checkbox" name="attr14" value="1" $attrchk[14] onClick="this.form.submit();" /> $lt{'ab'}</label></td>
+<td>&nbsp;</td>
 </tr>
 <tr>
 <td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onClick="this.form.submit();" /> $lt{'st'}</label></td>
 <td><label><input type="checkbox" name="attr11" value="1" $attrchk[11] onClick="this.form.submit();" /> $lt{'li'}</label></td>
 <td><label><input type="checkbox" name="attr7" value="1" $attrchk[7] onClick="this.form.submit();" /> $lt{'sr'}</label></td>
+<td><label><input type="checkbox" name="attr12" value="1" $attrchk[12] onClick="this.form.submit();" /> $lt{'sb'}</label></td>
+<td><label><input type="checkbox" name="attr15" value="1" $attrchk[15] onClick="this.form.submit();" /> $lt{'gl'}</label></td>
 <td>&nbsp;</td>
 </tr>
 </table>
@@ -493,8 +513,9 @@ END
 					    %select_file_categories);
         $type_element = '<label>'.&mt('File Type Displayed: [_1]',
 				      $type_element).'</label>';
+        $r->print($type_element
+                 .'</fieldset>');
         $r->print(<<END);
-$type_element
 <br />
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
@@ -563,6 +584,16 @@ END
 	    if ($hash{'display_attrs_11'} == 1);
 	$r->print("<td><b>".&mt("Resource")."</b></td>\n")
 	    if ($hash{'display_attrs_7'} == 1);
+        $r->print("<th>".&mt("Subject")."</th>\n")
+            if ($hash{'display_attrs_12'} == 1);
+        $r->print("<th>".&mt("Notes")."</th>\n")
+            if ($hash{'display_attrs_13'} == 1);
+        $r->print("<th>".&mt("Abstract")."</th>\n")
+            if ($hash{'display_attrs_14'} == 1);
+        $r->print("<th>".&mt("Grade Level")."</th>\n")
+            if ($hash{'display_attrs_15'} == 1);
+        $r->print("<th>".&mt("Standards")."</th>\n")
+            if ($hash{'display_attrs_16'} == 1);
 	$r->print('</tr>');
 
 # ----------------- read in what directories have previously been set to "open"
@@ -830,7 +861,7 @@ sub display_line {
 
     my $tabtag='</td>';
     my $i=0;
-    while ($i<=11) {
+    while ($i<=16) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
 	    if ($i != 9 &&
 		$hash{'display_attrs_'.$i} == 1);
@@ -854,7 +885,7 @@ sub display_line {
 		   'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");
 	$r->print(&Apache::loncommon::inhibit_menu_check('input'));
-	$r->print ('<input type=hidden name=openuri value="'.
+	$r->print ('<input type="hidden" name="openuri" value="'.
 		   $startdir.'" />'."\n");
 	$r->print ('<input type="hidden" name="acts" value="" />'."\n");
 	$r->print ('<input src="'.$iconpath.'arrow_up.gif"');
@@ -944,7 +975,8 @@ sub display_line {
         }
 	# Set the icon for the file
 	my $iconname = &Apache::loncommon::icon($listname);
-	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\"><td nowrap='nowrap' valign='top'>");
+	$r->print('<tr valign="'.$valign.'" bgcolor="'.$fileclr.'">'.
+                  '<td valign="top"><span class="LC_nobreak">');
 	
         if ($env{'form.catalogmode'} eq 'interactive') {
 	    my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
@@ -952,7 +984,7 @@ sub display_line {
                       $quotable_filelink,"')\">");
 	    $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
 		      "\n");
-	    $r->print("</td><td nowrap='nowrap' valign='top'>");
+	    $r->print('</span></td><td valign="top"><span class="LC_nobreak">');
 	} elsif ($env{'form.catalogmode'} eq 'import') {
 	    $r->print("<form name='form$fnum' action=''>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
@@ -962,7 +994,7 @@ sub display_line {
 		$r->print("checked");
 	    }
 	    $r->print(" />\n");
-	    $r->print("</form></td><td nowrap='nowrap' valign='top'>");
+	    $r->print('</form></span></td><td valign="top"><span class="LC_nobreak">');
 	    $hash{"pre_${fnum}_link"}=$filelink;
 	    $hash{"pre_${fnum}_title"}=$title;
 	    if (!$hash{"pre_${fnum}_title"}) {
@@ -977,7 +1009,7 @@ sub display_line {
 	    $indent--;
 	}
 # General indentation
-	if ($indent > 0 and $indent < 11) {
+	if ($indent > 0 and $indent < 16) {
 	    $r->print("<img alt=\"\" src='",$iconpath,"whitespace",$indent,
 		      ".gif' class='LC_icon' />\n");
 	} elsif ($indent >0) {
@@ -1019,12 +1051,12 @@ sub display_line {
 	if ($filelink=~/\.(page|sequence)$/) {
 	    $r->print('</form>');
 	}
-	$r->print("</td>\n");
+	$r->print("</span></td>\n");
 	if ($hash{'display_attrs_0'} == 1) {
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
-	$r->print('<td align=right> ',
+	$r->print('<td align="right"> ',
 		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
 	$r->print('<td> '.
@@ -1057,17 +1089,11 @@ sub display_line {
 # statistics
 	    &dynmetaread($filelink);
 	    $r->print("<td>");
-	    &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("&nbsp;</td>\n");
 
 	}
@@ -1090,12 +1116,10 @@ sub display_line {
 	   &dynmetaread($filelink);
 	   $r->print('<td>');
 	   &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');
-	   $r->print('</td>');
+           for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) {
+               &dynmetaprint($r,$filelink,$_);
+           }
+           $r->print('</td>');
         }
         if ($hash{'display_attrs_7'} == 1) {
 # Show resource
@@ -1103,6 +1127,36 @@ sub display_line {
            $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
 		      " </td>\n");
         }
+        if ($hash{'display_attrs_12'} == 1) {
+            my $subject = &Apache::lonnet::metadata($filelink,'subject');
+            $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
+                      " </td>\n");
+        }
+
+        if ($hash{'display_attrs_13'} == 1) {
+            my $notes = &Apache::lonnet::metadata($filelink,'notes');
+            $r->print('<td> '.($notes eq '' ? '&nbsp;' : $notes).
+                      " </td>\n");
+        }
+
+        if ($hash{'display_attrs_14'} == 1) {
+            my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
+            $r->print('<td> '.($abstract eq '' ? '&nbsp;' : $abstract).
+                      " </td>\n");
+        }
+
+        if ($hash{'display_attrs_15'} == 1) {
+            my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
+            $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).
+                      " </td>\n");
+        }
+
+        if ($hash{'display_attrs_16'} == 1) {
+            my $standards = &Apache::lonnet::metadata($filelink,'standards');
+            $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).
+                      " </td>\n");
+        }
+
 	$r->print("</tr>\n");
     }
 
@@ -1114,7 +1168,7 @@ sub display_line {
 	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
-	if ($indentm1 < 11 and $indentm1 > 0) {
+	if ($indentm1 < 16 and $indentm1 > 0) {
 	    $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,
 		      ".gif class='LC_icon' />\n");
 	} else {
@@ -1182,12 +1236,42 @@ sub display_line {
  	if ($hash{'display_attrs_10'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
 	}
-	if ($hash{'display_attrs_11'} == 1) {
-	   $r->print('<td>&nbsp;</td>');
-	}
 	if ($hash{'display_attrs_7'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
         }
+        if ($hash{'display_attrs_12'} == 1) {
+            my $subject = &Apache::lonnet::metadata($filelink,'subject');
+            $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
+                      " </td>\n");
+        }
+        if ($hash{'display_attrs_11'} == 1) {
+            $r->print('<td>&nbsp;</td>');
+        }
+        if ($hash{'display_attrs_12'} == 1) {
+            my $subject = &Apache::lonnet::metadata($filelink,'subject');
+            $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
+                      " </td>\n");
+        }
+        if ($hash{'display_attrs_13'} == 1) {
+            my $notes = &Apache::lonnet::metadata($filelink,'notes');
+            $r->print('<td> '.($notes eq '' ? '&nbsp;' : $notes).
+                      " </td>\n");
+        }
+        if ($hash{'display_attrs_14'} == 1) {
+            my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
+            $r->print('<td> '.($abstract eq '' ? '&nbsp;' : $abstract).
+                      " </td>\n");
+        }
+        if ($hash{'display_attrs_15'} == 1) {
+            my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
+            $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).
+                      " </td>\n");
+        }
+        if ($hash{'display_attrs_16'} == 1) {
+            my $standards = &Apache::lonnet::metadata($filelink,'standards');
+            $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).
+                      " </td>\n");
+        }
 	$r->print('</tr>');
     }