--- loncom/interface/lonindexer.pm	2006/03/16 22:42:58	1.141
+++ 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.141 2006/03/16 22:42:58 albertel Exp $
+# $Id: lonindexer.pm,v 1.181.4.2 2009/08/13 12:46:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,7 +53,9 @@ use Apache::lonmeta;
 use Apache::File;
 use Apache::lonlocal;
 use Apache::lonsource();
+use Apache::groupsort();
 use GDBM_File;
+use LONCAPA qw(:match);
 
 # ---------------------------------------- variables used throughout the module
 my %hash; # global user-specific gdbm file
@@ -104,7 +106,7 @@ sub handler {
 
     my $fileclr='#ffffe6';
     my $line;
-    my (@attrchk,@openpath);
+    my (@attrchk,@openpath,$typeselect);
     my $uri=$r->uri;
 
 # -------------------------------------- see if called from an interactive mode
@@ -119,21 +121,26 @@ sub handler {
     
     $extrafield='';
     my $diropendb = 
-	"/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";
+	"/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
     %hash = ();
     {
 	my %dbfile;
-	if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_READER(),0640)) {
+	if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRITER(),0640)) {
+	    if ($env{'form.launch'} eq '1') {
+		&start_fresh_session(\%dbfile);
+	    }
 	    while(my($key,$value)=each(%dbfile)) {
 		$hash{$key}=$value;
 	    }
 	    untie(%dbfile);
 	}
     }
-    {
-	if ($env{'form.launch'} eq '1') {
-	    &start_fresh_session();
+# - Evaluate actions from previous page (both cumulatively and chronologically)
+        if ($env{'form.catalogmode'} eq 'import' || $hash{'form.catalogmode'} eq 'import') {
+	    &Apache::groupsort::update_actions_hash(\%hash);
 	}
+    
+    {
   #Hijack lonindexer to verify a title and be close down.
    if ($env{'form.launch'} eq '2') {
        &Apache::loncommon::content_type($r,'text/html');
@@ -159,7 +166,8 @@ ENDSUBM
        $r->print(&Apache::loncommon::start_page(undef,$js,
 						{'only_body'   =>1,
 						 'add_entries' =>
-						     'onLoad="load();"',}).
+						     {'onload' => "load();"},}
+						).
 		 &Apache::loncommon::end_page());
        return OK;
    }
@@ -170,18 +178,18 @@ ENDSUBM
 # --------------------- define extra fields and buttons in case of special mode
 	if ($env{'form.catalogmode'} eq 'interactive') {
 	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
-		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
-		' border="0" /></td>';
+		'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
+		' class="LC_icon" /></td>';
 	    $colspan=" colspan='2' ";
             my $cl=&mt('Close');
             $closebutton=<<END;
 <input type="button" name="close" value='$cl' onClick="self.close()" />
 END
         }
-	elsif ($env{'form.catalogmode'} eq 'groupimport') {
+	elsif ($env{'form.catalogmode'} eq 'import') {
 	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
-		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
-		' border="0" /></td>';
+		'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
+		' class="LC_icon" /></td>';
 	    $colspan=" colspan='2' ";
 	    my $cl=&mt('Close');
             my $gi=&mt('Import');
@@ -228,7 +236,7 @@ END
 # ------ set catalogmodefunctions to have extra needed javascript functionality
 	my $catalogmodefunctions='';
 	if ($env{'form.catalogmode'} eq 'interactive' or
-	    $env{'form.catalogmode'} eq 'groupimport') {
+	    $env{'form.catalogmode'} eq 'import') {
 	    # The if statement below sets us up to use the old version
 	    # by default (ie. if $mode is undefined).  This is the easy
 	    # way out.  Hopefully in the future I'll find a way to get 
@@ -239,7 +247,7 @@ END
 #
 #
 	    if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {
-                my $location = "/adm/groupsort?catalogmode=groupimport&";
+                my $location = "/adm/groupsort?&inhibitmenu=yes&catalogmode=import&";
                 $location .= "mode=".$mode."&";
                 $location .= "acts=";
 		$catalogmodefunctions=<<"END";
@@ -266,6 +274,9 @@ END
 function select_data(url) {
    var location = "/res/?launch=2&form=$form&element=$element&titleelement=$titleelement&acts=" + url;
    window.location=location;
+   if (window.opener.document.forms["$form"].elements["$element"].value != url) {
+       window.opener.unClean();
+   }
 }
 function select_group() {
     window.location="$location"+document.forms.fileattr.acts.value;
@@ -326,7 +337,7 @@ function rep_dirpath(suffix,val) {
     eval("document.forms.dirpath"+suffix+".acts.value=val");
 }
 END
-	if ($env{'form.catalogmode'} eq 'groupimport') {
+	if ($env{'form.catalogmode'} eq 'import') {
             $catalogmodefunctions.=<<END;
 function queue(val) {
     if (eval("document.forms."+val+".filelink.checked")) {
@@ -343,10 +354,41 @@ function queue(val) {
 END
 	}
 
+        my $inhibit_menu = "+'&".&Apache::loncommon::inhibit_menu_check()."'";
 # ---------------------------------------------------------------- Print Header
+        
 	my $js = <<"ENDHEADER";
 <script type="text/javascript">
-$catalogmodefunctions
+$catalogmodefunctions;
+function update_only(field) {
+    alert(field.name);
+}
+function checkAll() {
+    var numForms = document.forms.length;
+    for (i=0;i<numForms;i++) {
+        var numElements = document.forms[i].elements.length;
+        for (j=0;j<numElements;j++){
+            var fieldName = document.forms[i].elements[j].name;
+            if (fieldName == 'filelink') {
+                document.forms[i].elements[j].checked = true;
+                queue(document.forms[i].name);
+            }
+        }
+    }
+}
+function uncheckAll() {
+    var numForms = document.forms.length;
+    for (i=0;i<numForms;i++) {
+        var numElements = document.forms[i].elements.length;
+        for (j=0;j<numElements;j++){
+            var fieldName = document.forms[i].elements[j].name;
+            if (fieldName == 'filelink') {
+                document.forms[i].elements[j].checked = false;
+                queue(document.forms[i].name);
+            }
+        }
+    }
+}
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
     var xpos = (screen.width-w)/2;
     xpos = (xpos < 0) ? '0' : xpos;
@@ -359,59 +401,30 @@ function openWindow(url, wdwName, w, h,
     newWin.focus();
 }
 function gothere(val) {
-    window.location=val+'?acts='+document.forms.fileattr.acts.value;
+    window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;
 }
 </script>
 ENDHEADER
 
-        my ($headerdom)=($uri=~/^\/res\/(\w+)\//);
-	$r->print(&Apache::loncommon::start_page('Browse Resources',$js,
-						 {'domain' => $headerdom,}));
-# - Evaluate actions from previous page (both cumulatively and chronologically)
-        if ($env{'form.catalogmode'} eq 'groupimport') {
-	    my $acts=$env{'form.acts'};
-	    my @Acts=split(/b/,$acts);
-	    my %ahash;
-	    my %achash;
-	    my $ac=0;
-	    # some initial hashes for working with data
-	    foreach (@Acts) {
-		my ($state,$ref)=split(/a/);
-		$ahash{$ref}=$state;
-		$achash{$ref}=$ac;
-		$ac++;
-	    }
-	    # sorting through the actions and changing the global database hash
-	    foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {
-		my $key=$_;
-		if ($ahash{$key} eq '1') {
-		    $hash{'store_'.$hash{'pre_'.$key.'_link'}}=
-			$hash{'pre_'.$key.'_title'};
-		    $hash{'storectr_'.$hash{'pre_'.$key.'_link'}}=
-			$hash{'storectr'}+0;
-		    $hash{'storectr'}++;
-		}
-		if ($ahash{$key} eq '0') {
-		    if ($hash{'store_'.$hash{'pre_'.$key.'_link'}}) {
-			delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
-		    }
-		}
-	    }
-	    # deleting the previously cached listing
-	    foreach (keys %hash) {
-		if ($_ =~ /^pre_/ && $_ =~/link$/) {
-		    my $key = $_;
-		    $key =~ s/^pre_//;
-		    $key =~ s/_[^_]*$//;
-		    delete $hash{'pre_'.$key.'_title'};
-		    delete $hash{'pre_'.$key.'_link'};
-		}
-	    }
+        my ($headerdom)=($uri=~m{^/res/($match_domain)/});
+        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'};
+	} else {
+	    $typeselect = '';
 	}
-	
+
 # ---------------------------------- 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';
@@ -419,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;
 	    }
 	}
@@ -435,14 +448,25 @@ 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',
 					   'av' => 'All versions',
-					   'ud' => 'Update Display'
+					   'ud' => 'Update Display',
+					   'pr' => 'Problems',
+					   'gr' => 'Graphics',
+					   '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>
@@ -452,32 +476,60 @@ 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>
 <input type="hidden" name="attrs" value="1" />
+END
+        my @file_categories = &Apache::loncommon::filecategories();
+        my %select_file_categories;
+        my @select_form_order = ('');
+        $select_file_categories{''} = &mt('All file types');
+        foreach my $cat (@file_categories) {
+	    my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
+	    $select_file_categories{$types} = $cat;
+	    push(@select_form_order,$types);
+	}
+        $select_file_categories{'select_form_order'} = \@select_form_order;
+        my $type_element=
+	    &Apache::loncommon::select_form($typeselect,'only',
+					    %select_file_categories);
+        $type_element = '<label>'.&mt('File Type Displayed: [_1]',
+				      $type_element).'</label>';
+        $r->print($type_element
+                 .'</fieldset>');
+        $r->print(<<END);
+<br />
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton
 END
+        $r->print(&Apache::loncommon::inhibit_menu_check('input'));
+   
 # -------------- Filter out sequence containment in crumbs and "recent folders"
 	my $storeuri=$uri;
 	$storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
 	$storeuri=~s/\/+/\//g;
 # ---------------------------------------------------------------- Bread crumbs
         $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',
-				(($env{'form.catalogmode'} eq 'groupimport')?
+				(($env{'form.catalogmode'} eq 'import')?
 				 'document.forms.fileattr':'')).
 		  &Apache::lonhtmlcommon::select_recent('residx','resrecent',
 'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
@@ -485,8 +537,8 @@ END
 	my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
 	if ($reshome) {
 	    $r->print("<font size='+2'><a href='");
-	    if ($env{'form.catalogmode'} eq 'groupimport') {
-		$r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();');
+	    if ($env{'form.catalogmode'} eq 'import') {
+		$r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');
 	    } else {
 		$r->print($reshome);
 	    }
@@ -496,6 +548,11 @@ END
 # ------------------------------------------------------ Remember where we were
 	&Apache::loncommon::storeresurl($storeuri);
 	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
+# -------------------------------------------------- Check All and Uncheck all
+	if ($env{'form.catalogmode'} eq 'import') {
+	    $r->print('<br /><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onClick="javascript:checkAll()" />');
+	    $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onClick="javascript:uncheckAll()" />');
+	}
 # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";
         #$r->print(&initdebug());
@@ -527,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"
@@ -578,12 +645,13 @@ END
 # -------- recursively go through all the directories and output as appropriate
 	&scanDir ($r,$toplevel,$indent,\%hash);
 	
-# ---------------------------- embed hidden information useful for group import
-	$r->print("<form name='fnum'>");
-	$r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
 
 # -------------------------------------------------------------- end the tables
 	$r->print('</table>');
+# ---------------------------- embed hidden information useful for group import
+	$r->print("<form name='fnum' action=''>");
+	$r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
+# -------------------------------------------------------------- end the tables
 	$r->print('</td></tr></table>');
 
 # --------------------------------------------------- end the output and return
@@ -620,7 +688,7 @@ sub scanDir {
 	next if($strip =~ /.*\.meta$/ | $obs eq '1');
 	my (@fileparts) = split(/\./,$strip);
 	if ($hash{'display_attrs_9'} != 1) {
-# if not all versions to be shown
+            # if not all versions to be shown
 	    if (scalar(@fileparts) >= 3) {
 		my $fext = pop @fileparts;
 		my $ov = pop @fileparts;
@@ -676,7 +744,7 @@ sub get_list {
 	$uri=~s/\/+/\//g;
 	foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) {
 	    my @ratpart=split(/\:/,$_);
-	    push @list,$ratpart[1];
+	    push(@list,&LONCAPA::map::qtescape($ratpart[1]));
 	} 
 	$hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {
@@ -685,7 +753,7 @@ sub get_list {
 	$hash{'dirlist_files_'.$luri} = join("\n",@list);
 	$hash{'dirlist_timestamp_files_'.$luri} = time;
     }
-    return @list=&match_ext($r,@list);
+    return @list=&match_ext($r,@list);    
 }
 
 sub dynmetaread {
@@ -703,7 +771,7 @@ sub dynmetaread {
 	}
 # Actually get the data
 	%dynhash=
-	    (%dynhash,&Apache::lonmeta::get_dynamic_metadata_from_sql($uri));
+	    (%dynhash,&Apache::lonmeta::get_dynamic_metadata_from_sql($uri.'/'));
 # Remember that we got it
 	$dynread{$uri}=1;
     } 
@@ -793,9 +861,10 @@ sub display_line {
 
     my $tabtag='</td>';
     my $i=0;
-    while ($i<=11) {
+    while ($i<=16) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
-	    if $hash{'display_attrs_'.$i} == 1;
+	    if ($i != 9 &&
+		$hash{'display_attrs_'.$i} == 1);
 	$i++;
     }
     my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
@@ -807,7 +876,7 @@ sub display_line {
 	$updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
 	$updir=~s/\/+/\//g;
 
-	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
+	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
 	$r->print("<td>\n");
 	$r->print ('<form method="post" name="dirpathUP" action="'.$updir.
 		   '/" '.
@@ -815,11 +884,12 @@ sub display_line {
 		   'document.forms.fileattr.acts.value)" '.
 		   'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");
-	$r->print ('<input type=hidden name=openuri value="'.
+	$r->print(&Apache::loncommon::inhibit_menu_check('input'));
+	$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"');
-	$r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
 	$r->print(&mt("Up")."</form>$tabtag</tr>\n");
 	return OK;
@@ -835,24 +905,24 @@ sub display_line {
     if ($filecom[1] eq 'domain') {
  	$r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n")
  	    if ($env{'form.dirPointer'} eq "on");
-	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
+	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
 	$r->print("<td>");
 	&begin_form ($r,$filecom[0]);
 	my $anchor = $filecom[0];
-	$anchor =~ s/\///g;
-	$r->print ('<a name="'.$anchor.'">');
+	$anchor =~ s/\W//g;
+	$r->print ('<a name="'.$anchor.'"></a>');
 	$r->print ('<input type="hidden" name="acts" value="" />');
 	$r->print ('<input src="'.$iconpath.'folder_pointer_'.
 		   $diropen.'.gif"'); 
-	$r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
 	my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
-		   '\')"><img src="'.$iconpath.'server.gif"');
-	$r->print (' border="0" /></a>'."\n");
+		   '\')"><img alt="" src="'.$iconpath.'server.gif"');
+	$r->print (' class="LC_icon" /></a>'."\n");
 	$r->print (&mt("Domain")." - $listname ");
-	if ($Apache::lonnet::domaindescription{$listname}) {
-	    $r->print("(".$Apache::lonnet::domaindescription{$listname}.
+	if (&Apache::lonnet::domain($listname,'description')) {
+	    $r->print("(".&Apache::lonnet::domain($listname,'description').
 		      ")");
 	}
 	$r->print ("</form>$tabtag</tr>\n");
@@ -861,24 +931,23 @@ sub display_line {
 # display user directory
     }
     if ($filecom[1] eq 'user') {
-	$r->print("<tr valign=$valign bgcolor=$fileclr>$extrafield");
-	$r->print("<td nowrap>\n");
+	# $r->print("<tr valign=$valign bgcolor=\"$fileclr\">$extrafield");
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
-	$anchor =~ s/\///g;
+	$anchor =~ s/\W//g;
+	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
 	&begin_form ($r,$curdir);
-	$r->print ('<a name="'.$anchor.'"><img src="'.$iconpath.
-		   'whitespace1.gif" border="0" />'."\n");
+	$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
+		   'whitespace1.gif" class="LC_icon" />'."\n");
 	$r->print ('<input type="hidden" name="acts" value="" />');
 	$r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.
 		   '.gif"'); 
-	$r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_curdir
-		   .'\')"><img src='.
-		   $iconpath.'quill.gif border="0" name="'.$msg.
-		   '" height="22" /></a>');
+		   .'\')"><img alt="'.$msg.'" src="'.
+		   $iconpath.'quill.gif" class="LC_indexer_icon" /></a>');
 	my $domain=(split(m|/|,$startdir))[2];
 	my $plainname=&Apache::loncommon::plainname($listname,$domain);
 	$r->print ($listname);
@@ -889,30 +958,35 @@ sub display_line {
 
 # display file
     if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
+        my $title;
 	my $filelink = $pathprefix.$filecom[0];
+	if ($hash{'display_attrs_0'} == 1) {
+	    $title = &Apache::lonnet::gettitle($filelink);
+	}
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
         if (@Omit) {
-            foreach (@Omit) { return OK if ($curfext eq $_); }
+            foreach (@Omit) { return OK if (lc($curfext) eq $_); }
         }
         if (@Only) {
             my $skip = 1;
-            foreach (@Only) { $skip = 0 if ($curfext eq $_); }
+            foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); }
             return OK if ($skip > 0);
         }
 	# 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);
             $r->print("<a href=\"javascript:select_data(\'",
                       $quotable_filelink,"')\">");
-	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
+	    $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
 		      "\n");
-	    $r->print("</td><td nowrap>");
-	} elsif ($env{'form.catalogmode'} eq 'groupimport') {
-	    $r->print("<form name='form$fnum'>\n");
+	    $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"."' ".
 		      "value='$filelink' onClick='".
 		      "javascript:queue(\"form$fnum\")' ");
@@ -920,75 +994,76 @@ sub display_line {
 		$r->print("checked");
 	    }
 	    $r->print(" />\n");
-	    $r->print("</form></td><td nowrap>");
+	    $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"}) {
+	        $hash{"pre_${fnum}_title"} = 'Not_retrieved';
+	    }
   	    $fnum++;
 	}
 # Form to open or close sequences
 	if ($filelink=~/\.(page|sequence)$/) {
 	    my $curdir = $startdir.$filecom[0].'/';
-	    my $anchor = $curdir;
-	    $anchor =~ s/\///g;
 	    &begin_form($r,$curdir);
 	    $indent--;
 	}
 # General indentation
-	if ($indent > 0 and $indent < 11) {
-	    $r->print("<img src=",$iconpath,"whitespace",$indent,
-		      ".gif border='0' />\n");
+	if ($indent > 0 and $indent < 16) {
+	    $r->print("<img alt=\"\" src='",$iconpath,"whitespace",$indent,
+		      ".gif' class='LC_icon' />\n");
 	} elsif ($indent >0) {
 	    my $ten = int($indent/10.);
 	    my $rem = $indent%10.0;
 	    my $count = 0;
 	    while ($count < $ten) {
-		$r->print("<img src=",$iconpath,
-			  "whitespace10.gif border='0' />\n");
+		$r->print("<img alt=\"\" src=".$iconpath.
+			  "whitespace10.gif class='LC_icon' />\n");
 	    $count++;
 	    }
-	    $r->print("<img src=",$iconpath,"whitespace",$rem,
-		      ".gif border='0' />\n") if $rem > 0;
+	    $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
+		      ".gif class='LC_icon' />\n") if $rem > 0;
 	}
 # Sequence open/close icon
 	if ($filelink=~/\.(page|sequence)$/) {
 	    my $curdir = $startdir.$filecom[0].'/';
 	    my $anchor = $curdir;
-	    $anchor =~ s/\///g;
+	    $anchor =~ s/\W//g;
 	    $r->print ('<input type="hidden" name="acts" value="" />');
-	    $r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.
+	    $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
 		       'folder_pointer_'.$diropen.'.gif"');
-	    $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+	    $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		       "\n");
 	}
 # Filetype icons
-	$r->print("<img src='$iconname' border='0' />\n");
+	$r->print("<img alt=\"\" src='$iconname' class='LC_icon' />\n");
 	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
 
-
 	$r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
-		   "', 'previewfile', '450', '500', 'no', 'yes','yes')\";".
-		   " TARGET=_self>$listname</a> ");
-
+		   "?inhibitmenu=yes','previewfile','450','500','no','yes','yes');\"".
+		   " target=\"_self\">$listname</a> ");
+	$quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
+	&Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
 	$r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.
-		   ".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".
-		   "TARGET=_self>metadata</a>) ");
+		   "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".
+		   " target=\"_self\">".&mt('metadata')."</a>) ");
 # Close form to open/close sequence
 	if ($filelink=~/\.(page|sequence)$/) {
 	    $r->print('</form>');
 	}
-	$r->print("</td>\n");
+	$r->print("</span></td>\n");
 	if ($hash{'display_attrs_0'} == 1) {
-	    my $title = &Apache::lonnet::gettitle($filelink,'title');
 	    $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> '.
-		  (localtime($filecom[9]))." </td>\n") 
+                  (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
 	    if $hash{'display_attrs_2'} == 1;
 	$r->print('<td> '.
-		  (localtime($filecom[10]))." </td>\n") 
+                  (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
 	    if $hash{'display_attrs_3'} == 1;
 
 	if ($hash{'display_attrs_4'} == 1) {
@@ -1014,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");
 
 	}
@@ -1033,10 +1102,11 @@ sub display_line {
 	    if($source eq 'open') {
 		my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
 		my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);
+		&Apache::loncommon::inhibit_menu_check(\$quotable_sourcelink);
 		$r->print('<td>'."<a href=\"javascript:openWindow('"
 			  .$quotable_sourcelink.
-			  "', 'previewsource', '700', '700', 'no', 'yes','yes')\";".
-			  " TARGET=_self>Yes</a> "."</td>\n");
+			  "', 'previewsource', '700', '700', 'no', 'yes','yes');\"".
+			  " target=\"_self\">".&mt('Source Code')."</a> "."</td>\n");
 	    } else { #A cuddled else. :P
 		$r->print("<td>&nbsp;</td>\n");
 	    }
@@ -1045,12 +1115,11 @@ sub display_line {
 # links
 	   &dynmetaread($filelink);
 	   $r->print('<td>');
-	   &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>');
+	   &coursecontext($r,$filelink);
+           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
@@ -1058,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");
     }
 
@@ -1065,41 +1164,42 @@ sub display_line {
     if ($fnptr == $dirptr) {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
-	$anchor =~ s/\///g;
-	$r->print("<tr bgcolor=$fileclr>$extrafield<td valign=$valign>");
+	$anchor =~ s/\W//g;
+	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
-	if ($indentm1 < 11 and $indentm1 > 0) {
-	    $r->print("<img src=",$iconpath,"whitespace",$indentm1,
-		      ".gif border='0' />\n");
+	if ($indentm1 < 16 and $indentm1 > 0) {
+	    $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,
+		      ".gif class='LC_icon' />\n");
 	} else {
 	    my $ten = int($indentm1/10.);
 	    my $rem = $indentm1%10.0;
 	    my $count = 0;
 	    while ($count < $ten) {
-		$r->print ("<img src=",$iconpath
-			   ,"whitespace10.gif border='0' />\n");
+		$r->print ("<img alt=\"\" src=",$iconpath
+			   ,"whitespace10.gif class='LC_icon' />\n");
 		$count++;
 	    }
-	    $r->print ("<img src=",$iconpath,"whitespace",$rem,
-		       ".gif border='0' />\n") if $rem > 0;
+	    $r->print ("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
+		       ".gif class='LC_icon' />\n") if $rem > 0;
 	}
 	$r->print ('<input type="hidden" name="acts" value="" />');
-	$r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.
+	$r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
 		   'folder_pointer_'.$diropen.'.gif"');
-	$r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
 	$r->print ('<a href="javascript:gothere(\''
-		   .$quotable_curdir.'\')"><img src="'.
-		   $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.
+		   .$quotable_curdir.'\')">'
+		   .'<img alt="'.&mt('Open Folder').'"src="'.
+		   $iconpath.'folder_'.$diropen.'.gif" class="LC_icon" /></a>'.
 		   "\n");
-	$r->print ("$listname</td>\n");
+	$r->print ("$listname</form></td>\n");
 # Attributes
 	my $filelink = $startdir.$filecom[0].'/default';
 
 	if ($hash{'display_attrs_0'} == 1) {
-	    my $title = &Apache::lonnet::gettitle($filelink,'title');
+	    my $title = &Apache::lonnet::gettitle($filelink);
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
@@ -1107,10 +1207,10 @@ sub display_line {
 		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
 	$r->print('<td> '.
-		  (localtime($filecom[9]))." </td>\n") 
+                  (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
 	    if $hash{'display_attrs_2'} == 1;
 	$r->print('<td> '.
-		  (localtime($filecom[10]))." </td>\n") 
+                  (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
 	    if $hash{'display_attrs_3'} == 1;
 
 	if ($hash{'display_attrs_4'} == 1) {
@@ -1136,19 +1236,63 @@ 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>');
         }
-	$r->print('</form></tr>');
+        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>');
     }
 
 }
 
+sub coursecontext {
+    my ($r,$filelink)=@_;
+    my $filesymb=&Apache::lonnet::symbread($filelink);
+    if ($filesymb) {
+	my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb);
+	$r->print(&mt('Already in this course:<br />[_1] in folder/map [_2].<br />',
+	      &Apache::lonnet::gettitle($resource),
+	      &Apache::lonnet::gettitle($map)));
+    }
+}
+
 sub showpreview {
     my ($filelink)=@_;
+    if ($filelink=~m-^(/ext/|http://)-) {
+	return &mt('External Resource, preview not enabled');
+    }
     my ($curfext)=($filelink=~/\.(\w+)$/);
     my $output='';
     my $embstyle=&Apache::loncommon::fileembstyle($curfext);
@@ -1161,10 +1305,17 @@ sub showpreview {
           $output=join("\n",<FH>);
           close(FH);
        } else {
+# In update display mode, remove old cache. This is done to retroactively
+# clean up course context renderings.
+	  if (-e $cache) {
+	       unlink($cache);
+	  }
           $output=&Apache::lonnet::ssi_body($filelink);
+# Is access denied? Don't render, don't store
           if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/s) {
              $output='';
-          } else {
+# Was this rendered in course content? Don't store
+          } elsif (!&Apache::lonnet::symbread($filelink)) {
              open(FH,">$cache");
              print FH $output;
              close(FH);
@@ -1172,10 +1323,10 @@ sub showpreview {
        }
        $output='<font size="-2">'.$output.'</font>';
     } elsif ($embstyle eq 'img') {
-       $output='<img src="'.$filelink.'" />';
-    } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {
-       $output='<img src="http://'.
-                 $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.
+       $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
+    } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
+       $output='<img  alt="'.&mt('Preview').'" src="http://'.
+                 &Apache::lonnet::hostname(&Apache::lonnet::homeserver($2,$1)).
                  '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
     }
     return $output;
@@ -1187,9 +1338,9 @@ sub dynmetaprint {
 	$r->print("\n<br />".$fieldnames{$item}.': '.
 		  &Apache::lonmeta::prettyprint($item,
 						$dynhash{$filelink}->{$item},
-		  (($env{'form.catalogmode'} ne 'groupimport')?'preview':''),
+		  (($env{'form.catalogmode'} ne 'import')?'preview':''),
 		  '',
-		  (($env{'form.catalogmode'} eq 'groupimport')?'document.forms.fileattr':''),1));
+		  (($env{'form.catalogmode'} eq 'import')?'document.forms.fileattr':''),1));
     }
 }
 
@@ -1197,7 +1348,8 @@ sub dynmetaprint {
 sub begin_form {
     my ($r,$uri) = @_;
     my $anchor = $uri;
-    $anchor =~ s/\///g;
+    $anchor =~ s/\W//g;
+    $uri=&Apache::loncommon::escape_single($uri);
     $r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.
 	       '#'.$anchor.
 	       '" onSubmit="return rep_dirpath(\''.$dnum.'\''.
@@ -1206,19 +1358,21 @@ sub begin_form {
     $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.
 	       "\n");
     $r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n");
+    $r->print(&Apache::loncommon::inhibit_menu_check('input'));
     $dnum++;
 }
 
 # --------- settings whenever the user causes the indexer window to be launched
 sub start_fresh_session {
-    delete $hash{'form.catalogmode'};
-    delete $hash{'form.mode'};
-    delete $hash{'form.form'};
-    delete $hash{'form.element'};
-    delete $hash{'form.omit'};
-    delete $hash{'form.only'};
-    foreach (keys %hash) {
-        delete $hash{$_} if (/^(pre_|store)/);
+    my ($hash) = @_;
+    delete $hash->{'form.catalogmode'};
+    delete $hash->{'form.mode'};
+    delete $hash->{'form.form'};
+    delete $hash->{'form.element'};
+    delete $hash->{'form.omit'};
+    delete $hash->{'form.only'};
+    foreach (keys %{$hash}) {
+        delete $hash->{$_} if (/^(pre_|store)/);
     }
 }