--- loncom/interface/lonindexer.pm	2003/06/14 00:15:01	1.66
+++ loncom/interface/lonindexer.pm	2006/03/02 20:16:10	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.66 2003/06/14 00:15:01 albertel Exp $
+# $Id: lonindexer.pm,v 1.139 2006/03/02 20:16:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,21 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# YEAR=1999
-# 5/21/99, 5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer)
-# 11/23 Gerd Kortemeyer
-# YEAR=2000
-# 07/20-08/04 H.K. Ng
-# YEAR=2001
-# 05/9-05/19/2001 H. K. Ng
-# 05/21/2001 H. K. Ng
-# 05/23/2001 H. K. Ng
-# 6/26,7/8 H. K. Ng
-# 8/14 H. K. Ng
-# 11/30 Matthew Hall
-# YEAR=2002
-# 6/29/2002 H. K. Ng
-#
 ###
 
 ###############################################################################
@@ -59,17 +44,24 @@ package Apache::lonindexer;
 
 # ------------------------------------------------- modules used by this module
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonhtmlcommon();
+use Apache::lonsequence();
 use Apache::Constants qw(:common);
+use Apache::lonmeta;
 use Apache::File;
+use Apache::lonlocal;
+use Apache::lonsource();
 use GDBM_File;
 
 # ---------------------------------------- variables used throughout the module
-my %hash; # tied to a user-specific gdbm file
+my %hash; # global user-specific gdbm file
 my %dirs; # keys are directories, values are the open/close status
 my %language; # has the reference information present in language.tab
-
+my %dynhash; # hash of hashes for dynamic metadata
+my %dynread; # hash of directories already read for dynamic metadata
+my %fieldnames; # Metadata fieldnames
 # ----- Values which are set by the handler subroutine and are accessible to
 # -----     other methods.
 my $extrafield; # default extra table cell
@@ -81,21 +73,24 @@ my @Only = ();
 my @Omit = ();
 
 
+
+
 # ----------------------------- Handling routine called via Apache and mod_perl
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
+    my $c = $r->connection();
+    &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
     $fnum=0;
     $dnum=0;
-    untie %hash;
 
     # Deal with stupid global variables (is there a way around making
     # these global to this package?  It is just so wrong....)
     undef (@Only);
     undef (@Omit);
+    %fieldnames=&Apache::lonmeta::fieldnames();
 
 # ------------------------------------- read in machine configuration variables
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
@@ -116,7 +111,7 @@ sub handler {
     # Get the parameters from the query string
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 	     ['catalogmode','launch','acts','mode','form','element',
-              'only','omit']);
+              'only','omit','titleelement']);
     #-------------------------------------------------------------------
     my $closebutton='';
     my $groupimportbutton='';
@@ -124,36 +119,81 @@ sub handler {
 
     $extrafield='';
     my $diropendb = 
-	"/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db";
-
-    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
-	if ($ENV{'form.launch'} eq '1') {
+	"/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";
+    %hash = ();
+    {
+	my %dbfile;
+	if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_READER(),0640)) {
+	    while(my($key,$value)=each(%dbfile)) {
+		$hash{$key}=$value;
+	    }
+	    untie(%dbfile);
+	}
+    }
+    {
+	if ($env{'form.launch'} eq '1') {
 	    &start_fresh_session();
-        }
+   }
+  #Hijack lonindexer to verify a title and be close down.
+   if ($env{'form.launch'} eq '2') {
+       &Apache::loncommon::content_type($r,'text/html');
+       my $extra='';
+       if (defined($env{'form.titleelement'}) && 
+	   $env{'form.titleelement'} ne '') {
+	   my $verify_title = &Apache::lonnet::gettitle($env{'form.acts'});
+#	   &Apache::lonnet::logthis("Hrrm $env{'form.acts'} -- $verify_title");
+	   $verify_title=~s/'/\\'/g;
+	   $extra='window.opener.document.forms["'.$env{'form.form'}.'"].elements["'.$env{'form.titleelement'}.'"].value=\''.$verify_title.'\';';
+       }
+       my $html=&Apache::lonxml::xmlbegin();
+       $r->print(<<ENDSUBM);
+	   $html
+	     <!-- Generated by lonindexer.pm -->
+	     <head>
+	       <script type="text/javascript">
+		function load() {
+			window.opener.document.forms["$env{'form.form'}"]
+			    .elements["$env{'form.element'}"]
+			    .value='$env{'form.acts'}';
+			$extra
+			window.close();
+		}
+   	       </script>
+	     </head>
+    	<body onLoad="load();">
+     	</body>
+    	</html>
+ENDSUBM
+       return OK;
+   }
+    
 # -------------------- refresh environment with user database values (in %hash)
-	&setvalues(\%hash,'form.catalogmode',\%ENV,'form.catalogmode'   );
+	&setvalues(\%hash,'form.catalogmode',\%env,'form.catalogmode'   );
 
 # --------------------- define extra fields and buttons in case of special mode
-	if ($ENV{'form.catalogmode'} eq 'interactive') {
+	if ($env{'form.catalogmode'} eq 'interactive') {
 	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
 		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
 		' border="0" /></td>';
 	    $colspan=" colspan='2' ";
+            my $cl=&mt('Close');
             $closebutton=<<END;
-<input type="button" name="close" value='CLOSE' onClick="self.close()">
+<input type="button" name="close" value='$cl' onClick="self.close()" />
 END
         }
-	elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
+	elsif ($env{'form.catalogmode'} eq 'groupimport') {
 	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
 		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
 		' border="0" /></td>';
 	    $colspan=" colspan='2' ";
+	    my $cl=&mt('Close');
+            my $gi=&mt('Import');
             $closebutton=<<END;
-<input type="button" name="close" value='CLOSE' onClick="self.close()">
+<input type="button" name="close" value='$cl' onClick="self.close()" />
 END
             $groupimportbutton=<<END;
-<input type="button" name="groupimport" value='GROUP IMPORT'
-onClick="javascript:select_group()">
+<input type="button" name="groupimport" value='$gi'
+onClick="javascript:select_group()" />
 END
         }
 	# Additions made by Matthew to make the browser a little easier to deal
@@ -164,32 +204,34 @@ END
 	#       selection is made.
 	# $element is the name of the element in $formname which receives
 	#       the URL.
-	# &Apache::lonxml::debug('Checking mode, form, element');
-	&setvalues(\%hash,'form.mode'   ,\%ENV,'form.mode'   );
-	&setvalues(\%hash,'form.form'   ,\%ENV,'form.form'   );
-	&setvalues(\%hash,'form.element',\%ENV,'form.element');
-	&setvalues(\%hash,'form.only'   ,\%ENV,'form.only'   );
-	&setvalues(\%hash,'form.omit'   ,\%ENV,'form.omit'   );
+	#&Apache::lonxml::debug('Checking mode, form, element');
+	&setvalues(\%hash,'form.mode'        ,\%env,'form.mode'   );
+	&setvalues(\%hash,'form.form'        ,\%env,'form.form'   );
+	&setvalues(\%hash,'form.element'     ,\%env,'form.element');
+	&setvalues(\%hash,'form.titleelement',\%env,'form.titleelement');
+	&setvalues(\%hash,'form.only'        ,\%env,'form.only'   );
+	&setvalues(\%hash,'form.omit'        ,\%env,'form.omit'   );
 
         # Deal with 'omit' and 'only' 
-        if (exists $ENV{'form.omit'}) {
-            @Omit = split(',',$ENV{'form.omit'});
+        if (exists $env{'form.omit'}) {
+            @Omit = split(',',$env{'form.omit'});
         }
-        if (exists $ENV{'form.only'}) {
-            @Only = split(',',$ENV{'form.only'});
+        if (exists $env{'form.only'}) {
+            @Only = split(',',$env{'form.only'});
         }
         
-	my $mode = $ENV{'form.mode'};
-	my ($form,$element);
+	my $mode = $env{'form.mode'};
+	my ($form,$element,$titleelement);
 	if ($mode eq 'edit' || $mode eq 'parmset') {
-	    $form    = $ENV{'form.form'};
-	    $element = $ENV{'form.element'};
+	    $form         = $env{'form.form'};
+	    $element      = $env{'form.element'};
+	    $titleelement = $env{'form.titleelement'};
 	}
-	&Apache::lonxml::debug("mode=$mode form=$form element=$element");
+	#&Apache::lonxml::debug("mode=$mode form=$form element=$element titleelement=$titleelement");
 # ------ set catalogmodefunctions to have extra needed javascript functionality
 	my $catalogmodefunctions='';
-	if ($ENV{'form.catalogmode'} eq 'interactive' or
-	    $ENV{'form.catalogmode'} eq 'groupimport') {
+	if ($env{'form.catalogmode'} eq 'interactive' or
+	    $env{'form.catalogmode'} eq 'groupimport') {
 	    # 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 
@@ -204,21 +246,13 @@ END
                 $location .= "mode=".$mode."&";
                 $location .= "acts=";
 		$catalogmodefunctions=<<"END";
-function select_data(title,url) {
-    changeTitle(title);
+function select_data(url) {
     changeURL(url);
     self.close();
 }
 function select_group() {
     window.location="$location"+document.forms.fileattr.acts.value;
 }
-function changeTitle(val) {
-    if (opener.inf) {
-        if (opener.inf.document.forms.resinfo.elements.t) {
-            opener.inf.document.forms.resinfo.elements.t.value=val;
-        }
-    }
-}
 function changeURL(val) {
     if (opener.inf) {
         if (opener.inf.document.forms.resinfo.elements.u) {
@@ -232,11 +266,10 @@ END
                 $location .= "form=$form&element=$element&mode=edit&acts=";
 		$catalogmodefunctions=<<END;
 // mode = $mode
-function select_data(title,url) {
-    changeURL(url);
-    self.close();
+function select_data(url) {
+   var location = "/res/?launch=2&form=$form&element=$element&titleelement=$titleelement&acts=" + url;
+   window.location=location;
 }
-
 function select_group() {
     window.location="$location"+document.forms.fileattr.acts.value;
 }
@@ -248,14 +281,26 @@ function changeURL(val) {
 	    alert("The file you selected is: "+val);
     }
 }
-
 END
+                if (!$titleelement) {
+		    $catalogmodefunctions.='function changeTitle(val) {}';
+		} else {
+		    $catalogmodefunctions.=<<END;
+function changeTitle(val) {
+    if (window.opener.document) {
+	    window.opener.document.forms["$form"].elements["$titleelement"].value=val;
+    } else {
+	    alert("The title of the file you selected is: "+val);
+    }
+}
+END
+                }
             } elsif ($mode eq 'parmset') {
                 my $location = "/adm/groupsort?catalogmode=interactive&";
                 $location .= "form=$form&element=$element&mode=parmset&acts=";
 		$catalogmodefunctions=<<END;
 // mode = $mode
-function select_data(title,url) {
+function select_data(url) {
     changeURL(url);
     self.close();
 }
@@ -284,7 +329,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 'groupimport') {
             $catalogmodefunctions.=<<END;
 function queue(val) {
     if (eval("document.forms."+val+".filelink.checked")) {
@@ -302,17 +347,24 @@ END
 	}
 
 # ---------------------------------------------------------------- Print Header
+	my $html=&Apache::lonxml::xmlbegin();
 	$r->print(<<ENDHEADER);
-<html>
+$html
 <head>
 <title>The LearningOnline Network With CAPA Directory Browser</title>
 
+<!-- Generated by lonindexer.pm -->
+
 <script type="text/javascript">
 $catalogmodefunctions
-function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
-    var options = "width=" + w + ",height=" + h + ",";
+function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
+    var xpos = (screen.width-w)/2;
+    xpos = (xpos < 0) ? '0' : xpos;
+    var ypos = (screen.height-h)/2-30;
+    ypos = (ypos < 0) ? '0' : ypos;
+    var options = "width=" + w + ",height=" + h + ",screenx="+xpos+",screeny="+ypos+",";
     options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
-    options += "menubar=no,toolbar="+toolbar+",location=no,directories=no";
+    options += "menubar=no,toolbar="+toolbar+",location="+locationbar+",directories=no";
     var newWin = window.open(url, wdwName, options);
     newWin.focus();
 }
@@ -323,10 +375,12 @@ function gothere(val) {
 
 </head>
 ENDHEADER
-$r->print(&Apache::loncommon::bodytag('Browse Resources'));
+my ($headerdom)=($uri=~/^\/res\/(\w+)\//);
+$r->print(&Apache::loncommon::bodytag('Browse Resources',undef,undef,undef,
+				      $headerdom));
 # - Evaluate actions from previous page (both cumulatively and chronologically)
-        if ($ENV{'form.catalogmode'} eq 'groupimport') {
-	    my $acts=$ENV{'form.acts'};
+        if ($env{'form.catalogmode'} eq 'groupimport') {
+	    my $acts=$env{'form.acts'};
 	    my @Acts=split(/b/,$acts);
 	    my %ahash;
 	    my %achash;
@@ -338,7 +392,7 @@ $r->print(&Apache::loncommon::bodytag('B
 		$achash{$ref}=$ac;
 		$ac++;
 	    }
-	    # sorting through the actions and changing the tied database hash
+	    # 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') {
@@ -367,68 +421,122 @@ $r->print(&Apache::loncommon::bodytag('B
 	}
 	
 # ---------------------------------- get state of file attributes to be showing
-	if ($ENV{'form.attrs'} ne '') {
-	    for (my $i=0; $i<=8; $i++) {
+	if ($env{'form.attrs'}) {
+	    for (my $i=0; $i<=11; $i++) {
 		delete $hash{'display_attrs_'.$i};
-		if ($ENV{'form.attr'.$i} == 1) {
+		if ($env{'form.attr'.$i} == 1) {
 		    $attrchk[$i] = 'checked';
 		    $hash{'display_attrs_'.$i} = 1;
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=8; $i++) {
+	    for (my $i=0; $i<=11; $i++) {
 		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
+
 # ------------------------------- output state of file attributes to be showing
+#                                 All versions has to the last item
+#                                 since it does not take an extra col
+	my %lt=&Apache::lonlocal::texthash(
+					   'ti' => 'Title',
+					   'si' => 'Size',
+					   'la' => 'Last access',
+					   'lm' => 'Last modified',
+					   'st' => 'Statistics',
+					   'au' => 'Author',
+					   'kw' => 'Keywords',
+					   'ln' => 'Language',
+					   'sa' => 'Source Available',
+					   'sr' => 'Show resource',
+					   'li' => 'Linked/Related Resources',
+					   'av' => 'All versions',
+					   'ud' => 'Update Display'
+					   );
 	$r->print(<<END);
 <form method="post" name="fileattr" action="$uri"
  enctype="application/x-www-form-urlencoded">
-<b><font color="#666666">Display file attributes</font></b><br />
-<table border=0><tr>
-<td><input type="checkbox" name="attr0" value="1" $attrchk[0] /> Title</td>
-<td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> Size</td>
-<td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> Last access</td>
-<td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> Last modified</td>
-<td><input type="checkbox" name="attr8" value="1" $attrchk[8] /> All versions</td></tr><tr>
-<td><input type="checkbox" name="attr4" value="1" $attrchk[4] /> Author</td>
-<td><input type="checkbox" name="attr5" value="1" $attrchk[5] /> Keywords</td>
-<td><input type="checkbox" name="attr6" value="1" $attrchk[6] /> Language</td>
-<td><input type="checkbox" name="attr7" value="1" $attrchk[7] /> Show Resource</td>
+<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onClick="this.form.submit();" /> $lt{'av'}</label>
+<table border="0">
+<tr>
+<td><label><input type="checkbox" name="attr0" value="1" $attrchk[0] onClick="this.form.submit();" /> $lt{'ti'}</label></td>
+<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>
+</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>
+</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>&nbsp;</td>
-</tr></table>
-<input type="hidden" name="dirPointer" value="on" />
+</tr>
+</table>
+<input type="hidden" name="attrs" value="1" />
+<input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
-<input type="submit" name="attrs" value="Review" />&nbsp;
-<input type="submit" name="attrs" value="Refresh" />
-$closebutton
-$groupimportbutton
-</form>
+$closebutton $groupimportbutton
 END
-
+# -------------- 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')?
+				 '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();'));
+# -------------------------------------------------------- Resource Home Button
+	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();');
+	    } else {
+		$r->print($reshome);
+	    }
+	    $r->print("'>".&mt('Home').'</a></font>');
+	}
+	$r->print('</form>');
+# ------------------------------------------------------ Remember where we were
+	&Apache::loncommon::storeresurl($storeuri);
+	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";
-#        $r->print(&initdebug());
-#        $r->print(&writedebug("Omit:@Omit")) if (@Omit);
-#        $r->print(&writedebug("Only:@Only")) if (@Only);
-        $r->print("<table width='100\%' border=0><tr><td bgcolor=#777777>\n");
-	$r->print("<table width='100\%' border=0><tr bgcolor=$titleclr>\n");
-	$r->print("<td $colspan><b>Name</b></td>\n");
-	$r->print("<td><b>Title</b></td>\n") 
+        #$r->print(&initdebug());
+        #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
+        #$r->print(&writedebug("Only:@Only")) if (@Only);
+        $r->print('<table width="100%" border="0"><tr><td bgcolor="#777777">'."\n");
+	$r->print('<table width="100%" border="0"><tr bgcolor="'.$titleclr.'">'."\n");
+	$r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");
+	$r->print("<td><b>".&mt('Title')."</b></td>\n") 
 	    if ($hash{'display_attrs_0'} == 1);
-	$r->print("<td align=right><b>Size (bytes) ".
+	$r->print("<td align=right><b>".&mt("Size")." (".&mt("bytes").") ".
 		  "</b></td>\n") if ($hash{'display_attrs_1'} == 1);
-	$r->print("<td><b>Last accessed</b></td>\n") 
+	$r->print("<td><b>".&mt("Last accessed")."</b></td>\n") 
 	    if ($hash{'display_attrs_2'} == 1);
-	$r->print("<td><b>Last modified</b></td>\n")
+	$r->print("<td><b>".&mt("Last modified")."</b></td>\n")
 	    if ($hash{'display_attrs_3'} == 1);
-	$r->print("<td><b>Author(s)</b></td>\n")
+	$r->print("<td><b>".&mt("Author(s)")."</b></td>\n")
 	    if ($hash{'display_attrs_4'} == 1);
-	$r->print("<td><b>Keywords</b></td>\n")
+	$r->print("<td><b>".&mt("Keywords")."</b></td>\n")
 	    if ($hash{'display_attrs_5'} == 1);
-	$r->print("<td><b>Language</b></td>\n")
+	$r->print("<td><b>".&mt("Language")."</b></td>\n")
 	    if ($hash{'display_attrs_6'} == 1);
-	$r->print("<td><b>Resource</b></td>\n")
+	$r->print("<td><b>".&mt("Usage Statistics")." <br />(".
+		  &mt("Courses/Network Hits").")</b> ".&mt('updated periodically')."</td>\n")
+	    if ($hash{'display_attrs_8'} == 1);
+	$r->print("<td><b>".&mt("Source Available")."</b></td>\n")
+	    if ($hash{'display_attrs_10'} == 1);
+	$r->print("<td><b>".&mt("Linked/Related Resources")."</b></td>\n")
+	    if ($hash{'display_attrs_11'} == 1);
+	$r->print("<td><b>".&mt("Resource")."</b></td>\n")
 	    if ($hash{'display_attrs_7'} == 1);
 	$r->print('</tr>');
 
@@ -441,8 +549,8 @@ END
 	    }
 	}
 
-	if ($ENV{'form.openuri'}) {  # take care of review and refresh options
-	    my $uri=$ENV{'form.openuri'};
+	if ($env{'form.openuri'}) {  # take care of review and refresh options
+	    my $uri=$env{'form.openuri'};
 	    if (exists($hash{'diropen_status_'.$uri})) {
 		my $cursta = $hash{'diropen_status_'.$uri};
 		$dirs{$uri} = 'open';
@@ -457,18 +565,16 @@ END
 	    }
 	}
 	
-	my $bredir = $ENV{'form.dirPointer'};
 	my $toplevel;
 	my $indent = 0;
 	$uri = $uri.'/' if $uri !~ /.*\/$/;
 
-	if ($bredir ne 'on') {
-	    $hash{'top.level'} = $uri;
-	    $toplevel = $uri;
-
-	} else {
-	    $toplevel = $hash{'top.level'};
-	}
+ 	if ($env{'form.dirPointer'} ne 'on') {
+ 	    $hash{'top.level'} = $uri;
+ 	    $toplevel = $uri;
+ 	} else {
+ 	    $toplevel = $hash{'top.level'};
+ 	}
 
 # -------------------------------- if not at top level, provide an uplink arrow
 	if ($toplevel ne '/res/'){
@@ -485,7 +591,7 @@ END
 	
 # ---------------------------- embed hidden information useful for group import
 	$r->print("<form name='fnum'>");
-	$r->print("<input type='hidden' name='fnum' value='$fnum'></form>");
+	$r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
 
 # -------------------------------------------------------------- end the tables
 	$r->print('</table>');
@@ -493,47 +599,58 @@ END
 
 # --------------------------------------------------- end the output and return
 	$r->print('</body></html>'."\n");
-	untie(%hash);
-    } else {
-	$r->print('<html><head></head><body>Unable to tie hash to db '.
-		  'file</body></html>');
-	return OK;
     }
+    if(! $c->aborted()) {
+# write back into the temporary file
+	my %dbfile;
+        if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_NEWDB(),0640)) {
+            while (my($key,$value) = each(%hash)) {
+                $dbfile{$key}=$value;
+            }
+            untie(%dbfile);
+        }
+    }
+
     return OK;
 }
 
 # ----------------------------------------------- recursive scan of a directory
 sub scanDir {
     my ($r,$startdir,$indent,$hashref)=@_;
+    my $c = $r->connection();
     my ($compuri,$curdir);
     my $dirptr=16384;
+    my $obs;
     $indent++;
-
     my %dupdirs = %dirs;
     my @list=&get_list($r,$startdir);
     foreach my $line (@list) {
-	my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5); 
-	next if $strip =~ /.*\.meta$/;
+        return if ($c->aborted());
+	#This is a kludge, sorry aboot this
+	my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
+	next if($strip =~ /.*\.meta$/ | $obs eq '1');
 	my (@fileparts) = split(/\./,$strip);
-	if ($hash{'display_attrs_8'} != 1) {
+	if ($hash{'display_attrs_9'} != 1) {
+# if not all versions to be shown
 	    if (scalar(@fileparts) >= 3) {
 		my $fext = pop @fileparts;
 		my $ov = pop @fileparts;
 		my $fname = join ('.',@fileparts,$fext);
-		next if (grep /\Q$fname\E/,@list and $ov =~ /\d+/);
+		next if (grep /\Q$fname\E/,@list and $ov =~ /^\d+$/);
 	    }
 	}
 
 	if ($dom eq 'domain') {
-	    $compuri = join('',$strip,'/');  # dom list has /res/<domain name>
-	    $curdir = $compuri;
+	    # dom list has full path /res/<domain name>/ already
+	    $curdir='';
+	    $compuri = (split(/\&/,$line))[0];
 	} else {
 	    # user, dir & file have name only, i.e., w/o path
 	    $compuri = join('',$startdir,$strip,'/');
 	    $curdir = $startdir;
 	}
 	my $diropen = 'closed';
-	if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) {
+	if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/) or ($compuri=~/\.(sequence|page)\/$/)) {
 	    while (my ($key,$val)= each %dupdirs) {
 		if ($key eq $compuri and $val eq "open") {
 		    $diropen = "opened";
@@ -551,25 +668,60 @@ sub scanDir {
 # --------------- get complete matched list based on the uri (returns an array)
 sub get_list {
     my ($r,$uri)=@_;
-    my @list;
+    my @list=();
     (my $luri = $uri) =~ s/\//_/g;
-
-    if ($ENV{'form.attrs'} eq 'Refresh') {
+    if ($env{'form.updatedisplay'}) {
 	foreach (keys %hash) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
-	    }
+	    delete $hash{$_} if ($_ =~ /^dirlist_timestamp_files_/);
+	}
     }
 
-    if ($hash{'dirlist_files'.$luri}) {
+    if (defined($hash{'dirlist_files_'.$luri}) &&
+	$hash{'dirlist_timestamp_files_'.$luri}+600 > (time)) {
 	@list = split(/\n/,$hash{'dirlist_files_'.$luri});
+    } elsif ($uri=~/\.(page|sequence)\/$/) {
+# is a page or a sequence
+	$uri=~s/\/$//;
+	$uri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
+	$uri=~s/\/+/\//g;
+	foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) {
+	    my @ratpart=split(/\:/,$_);
+	    push @list,$ratpart[1];
+	} 
+	$hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {
+# is really a directory
 	@list = &Apache::lonnet::dirlist($uri);
-	$hash{'dirlist_files_'.$luri} = join('\n',@list);
+	$hash{'dirlist_files_'.$luri} = join("\n",@list);
+	$hash{'dirlist_timestamp_files_'.$luri} = time;
     }
     return @list=&match_ext($r,@list);
 }
 
+sub dynmetaread {
+    my $uri=shift;
+    if (($hash{'display_attrs_8'}==1) || ($hash{'display_attrs_11'}==1)) {
+# We don't want the filename
+	$uri=~s/\/[^\/]+$//;
+# Did we already see this?
+	my $builddir=$uri;
+	while ($builddir) {
+	    if ($dynread{$builddir}) {
+		return 0;
+	    }
+	    $builddir=~s/\/[^\/]+$//;
+	}
+# Actually get the data
+	%dynhash=
+	    (%dynhash,&Apache::lonmeta::get_dynamic_metadata_from_sql($uri));
+# Remember that we got it
+	$dynread{$uri}=1;
+    } 
+}
+
 sub initdebug {
+    my $html=&Apache::lonxml::xmlbegin();
     return <<ENDJS;
 <script>
 var debugging = true;
@@ -582,7 +734,7 @@ function output(text) {
         debuggingWindow.document.writeln(text);
     }
 }
-output("<html><head><title>Debugging Window</title></head><body><pre>");   
+output('$html<head><title>Debugging Window</title><!-- for lonindexer.pm --></head><body><pre>');   
 </script>
 ENDJS
 }
@@ -608,7 +760,7 @@ sub match_ext {
 	next if ($unpackline[0] eq '..');
 	my @filecom = split (/\./,$unpackline[0]);
 	my $fext = pop(@filecom);
-	my $fnptr = $unpackline[3]&$dirptr;
+	my $fnptr = ($unpackline[3]&$dirptr) || ($fext=~/\.(page|sequence)$/);
  	if ($fnptr == 0 and $unpackline[3] ne "") {
 	    my $embstyle = &Apache::loncommon::fileembstyle($fext);
             push @trimlist,$line if (defined($embstyle) && 
@@ -617,7 +769,7 @@ sub match_ext {
 	    push @trimlist,$line;
 	}
     }
-    @trimlist = sort (@trimlist);
+    @trimlist = sort {uc($a) cmp uc($b)} (@trimlist);
     return @trimlist;
 }
 
@@ -625,6 +777,17 @@ sub match_ext {
 sub display_line {
     my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
     my (@pathfn, $fndir);
+# there could be relative paths (files actually belonging into this directory)
+# or absolute paths (for example, from sequences)
+    my $absolute;
+    my $pathprefix;
+    if ($line=~m|^/res/| && $startdir ne '') {
+	$absolute=1;
+	$pathprefix='';
+    } else {
+	$absolute=0;
+	$pathprefix=$startdir;
+    }
     my $dirptr=16384;
     my $fileclr="#ffffe6";
     my $iconpath= $r->dir_config('lonIconsURL') . '/';
@@ -633,99 +796,108 @@ sub display_line {
     my @pathcom = split (/\//,$filecom[0]);
     my $listname = $pathcom[scalar(@pathcom)-1];
     my $fnptr = $filecom[3]&$dirptr;
-    my $msg = 'View '.$filecom[0].' resources';
-    $msg = 'Close '.$filecom[0].' directory' if $diropen eq 'opened';
+    my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources');
+    $msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened';
 
     my $tabtag='</td>';
     my $i=0;
-
-    while ($i<=7) {
+    while ($i<=11) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
 	    if $hash{'display_attrs_'.$i} == 1;
 	$i++;
     }
-	
     my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
 
 # display uplink arrow
     if ($filecom[1] eq 'viewOneUp') {
-	$r->print("<tr bgcolor=$fileclr>$extrafield");
-	$r->print("<td valign=$valign>\n");
-	$r->print ('<form method="post" name="dirpathUP" action="'.$startdir.
+	my $updir=$startdir;
+# -------------- Filter out sequence containment in crumbs and "recent folders"
+	$updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
+	$updir=~s/\/+/\//g;
+
+	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
+	$r->print("<td>\n");
+	$r->print ('<form method="post" name="dirpathUP" action="'.$updir.
 		   '/" '.
 		   'onSubmit="return rep_dirpath(\'UP\','.
 		   'document.forms.fileattr.acts.value)" '.
 		   'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");
 	$r->print ('<input type=hidden name=openuri value="'.
-		   $startdir.'">'."\n");
-	$r->print ('<input type="hidden" name="acts" value="">'."\n");
+		   $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.'" height="22" type="image" border="0" />'.
 		   "\n");
-	$r->print("Up $tabtag</tr></form>\n");
+	$r->print(&mt("Up")."</form>$tabtag</tr>\n");
 	return OK;
     }
 # Do we have permission to look at this?
 
-    return OK if (!&Apache::lonnet::allowed('bre',$startdir.$filecom[0]));
+    if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); }
+
+# make absolute links appear on different background
+    if ($absolute) { $fileclr='#ccdd99'; }
 
 # display domain
     if ($filecom[1] eq 'domain') {
-	$r->print ('<input type="hidden" name="dirPointer" value="on">'."\n")
-	    if ($ENV{'form.dirPointer'} eq "on");
-	$r->print("<tr bgcolor=$fileclr>$extrafield");
-	$r->print("<td valign=$valign>");
-	&begin_form ($r,$filecom[0].'/');
-	my $anchor = $filecom[0].'/';
+ 	$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("<td>");
+	&begin_form ($r,$filecom[0]);
+	my $anchor = $filecom[0];
 	$anchor =~ s/\///g;
 	$r->print ('<a name="'.$anchor.'">');
-	$r->print ('<input type="hidden" name="acts" value="">');
+	$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.'" height="22" type="image" border="0" />'.
 		   "\n");
-	$r->print ('<a href="javascript:gothere(\''.$filecom[0].
-		   '/\')"><img src="'.$iconpath.'server.gif"');
+	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");
-	$r->print ("Domain - $listname ");
+	$r->print (&mt("Domain")." - $listname ");
 	if ($Apache::lonnet::domaindescription{$listname}) {
 	    $r->print("(".$Apache::lonnet::domaindescription{$listname}.
 		      ")");
 	}
-	$r->print (" $tabtag</tr></form>\n");
+	$r->print ("</form>$tabtag</tr>\n");
 	return OK;
 
 # display user directory
     }
     if ($filecom[1] eq 'user') {
-	$r->print("<tr bgcolor=$fileclr>$extrafield");
-	$r->print("<td valign=$valign nowrap>\n");
+	$r->print("<tr valign=$valign bgcolor=$fileclr>$extrafield");
+	$r->print("<td nowrap>\n");
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
 	&begin_form ($r,$curdir);
 	$r->print ('<a name="'.$anchor.'"><img src="'.$iconpath.
 		   'whitespace1.gif" border="0" />'."\n");
-	$r->print ('<input type="hidden" name="acts" value="">');
+	$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.'" height="22" type="image" border="0" />'.
 		   "\n");
-	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src='.
+	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>');
 	my $domain=(split(m|/|,$startdir))[2];
 	my $plainname=&Apache::loncommon::plainname($listname,$domain);
 	$r->print ($listname);
 	if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
-	$r->print ($tabtag.'</tr></form>'."\n");
+	$r->print ('</form>'.$tabtag.'</tr>'."\n");
 	return OK;
     }
 
 # display file
-    if ($fnptr == 0 and $filecom[3] ne '') {
-	my $filelink = $startdir.$filecom[0];
+    if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
+	my $filelink = $pathprefix.$filecom[0];
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
         if (@Omit) {
@@ -737,34 +909,17 @@ sub display_line {
             return OK if ($skip > 0);
         }
 	# Set the icon for the file
-	my $iconname = "unknown.gif";
-	my $embstyle = &Apache::loncommon::fileembstyle($curfext);
-	# The unless conditional that follows is a bit of overkill
-	$iconname = $curfext.".gif" unless
-	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
-	#
-	$r->print("<tr bgcolor=$fileclr><td nowrap valign='$valign'>");
-	my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list;
-	my $title;
-        if ($ENV{'form.catalogmode'} eq 'interactive') {
-	    $title=$listname;
-	    $title = &Apache::lonnet::metadata($filelink,'title')
-		if ($metafile == 1);
-	    $title=$listname unless $title;
-	    my $titleesc=HTML::Entities::encode($title);
-	    $titleesc=~s/\'/\\'/; #' (clean up this spare quote)
+	my $iconname = &Apache::loncommon::icon($listname);
+	$r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap='nowrap' valign='top'>");
+	
+        if ($env{'form.catalogmode'} eq 'interactive') {
+	    my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
             $r->print("<a href=\"javascript:select_data(\'",
-                      $titleesc,"','",$filelink,"')\">");
+                      $quotable_filelink,"')\">");
 	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
 		      "\n");
-	    $r->print("</td><td valign='$valign' nowrap>");
-	}
-        elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
-	    $title=$listname;
-	    $title = &Apache::lonnet::metadata($filelink,'title')
-		if ($metafile == 1);
-	    $title=$listname unless $title;
-	    my $titleesc=&HTML::Entities::encode($title);
+	    $r->print("</td><td nowrap>");
+	} elsif ($env{'form.catalogmode'} eq 'groupimport') {
 	    $r->print("<form name='form$fnum'>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
 		      "value='$filelink' onClick='".
@@ -772,16 +927,20 @@ sub display_line {
 	    if ($hash{'store_'.$filelink}) {
 		$r->print("checked");
 	    }
-	    $r->print(">\n");
-	    $r->print("<input type='hidden' name='title"."' ".
-		      "value='$titleesc'>\n");
-	    $r->print("</form>\n");
-	    $r->print("</td><td valign='$valign' nowrap>");
+	    $r->print(" />\n");
+	    $r->print("</form></td><td nowrap>");
 	    $hash{"pre_${fnum}_link"}=$filelink;
-	    $hash{"pre_${fnum}_title"}=$titleesc;
   	    $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");
@@ -797,59 +956,133 @@ sub display_line {
 	    $r->print("<img src=",$iconpath,"whitespace",$rem,
 		      ".gif border='0' />\n") if $rem > 0;
 	}
+# Sequence open/close icon
+	if ($filelink=~/\.(page|sequence)$/) {
+	    my $curdir = $startdir.$filecom[0].'/';
+	    my $anchor = $curdir;
+	    $anchor =~ s/\///g;
+	    $r->print ('<input type="hidden" name="acts" value="" />');
+	    $r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.
+		       'folder_pointer_'.$diropen.'.gif"');
+	    $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+		       "\n");
+	}
+# Filetype icons
+	$r->print("<img src='$iconname' border='0' />\n");
+	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
 
-	$r->print("<img src=$iconpath$iconname border='0' />\n");
-	$r->print (" <a href=\"javascript:openWindow('".$filelink.
-		   "', 'metadatafile', '450', '500', 'no', 'yes')\";".
-		   " TARGET=_self>$listname</a> ");
 
-	$r->print (" (<a href=\"javascript:openWindow('".$filelink.
-		   ".meta', 'metadatafile', '400', '450', 'no', 'yes')\"; ".
-		   "TARGET=_self>metadata</a>) ") if ($metafile == 1);
+	$r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
+		   "', 'previewfile', '450', '500', 'no', 'yes','yes')\";".
+		   " TARGET=_self>$listname</a> ");
 
+	$r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.
+		   ".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".
+		   "TARGET=_self>metadata</a>) ");
+# Close form to open/close sequence
+	if ($filelink=~/\.(page|sequence)$/) {
+	    $r->print('</form>');
+	}
 	$r->print("</td>\n");
 	if ($hash{'display_attrs_0'} == 1) {
-	    my $title = &Apache::lonnet::metadata($filelink,'title')
-		if ($metafile == 1);
-	    $r->print('<td valign=$valign> '.($title eq '' ? '&nbsp;' : $title).
+	    my $title = &Apache::lonnet::gettitle($filelink,'title');
+	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
-	$r->print('<td align=right valign=$valign> ',
+	$r->print('<td align=right> ',
 		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
-	$r->print('<td valign=$valign> '.
+	$r->print('<td> '.
 		  (localtime($filecom[9]))." </td>\n") 
 	    if $hash{'display_attrs_2'} == 1;
-	$r->print('<td valign=$valign> '.
+	$r->print('<td> '.
 		  (localtime($filecom[10]))." </td>\n") 
 	    if $hash{'display_attrs_3'} == 1;
 
 	if ($hash{'display_attrs_4'} == 1) {
-	    my $author = &Apache::lonnet::metadata($filelink,'author')
-		if ($metafile == 1);
-	    $r->print('<td valign=$valign> '.($author eq '' ? '&nbsp;' : $author).
+	    my $author = &Apache::lonnet::metadata($filelink,'author');
+	    $r->print('<td> '.($author eq '' ? '&nbsp;' : $author).
 		      " </td>\n");
 	}
 	if ($hash{'display_attrs_5'} == 1) {
-	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords')
-		if ($metafile == 1);
+	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords');
 	    # $keywords = '&nbsp;' if (!$keywords);
-	    $r->print('<td valign=$valign> '.($keywords eq '' ? '&nbsp;' : $keywords).
+	    $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).
 		      " </td>\n");
 	}
+#'
+
 	if ($hash{'display_attrs_6'} == 1) {
-	    my $lang = &Apache::lonnet::metadata($filelink,'language')
-		if ($metafile == 1);
+	    my $lang = &Apache::lonnet::metadata($filelink,'language');
 	    $lang = &Apache::loncommon::languagedescription($lang);
-	    $r->print('<td valign=$valign> '.($lang eq '' ? '&nbsp;' : $lang).
+	    $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).
 		      " </td>\n");
 	}
+	if ($hash{'display_attrs_8'} == 1) {
+# 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');
+	    $r->print("&nbsp;</td>\n");
+
+	}
+	if ($hash{'display_attrs_10'} == 1) {
+	    my $source = &Apache::lonnet::metadata($filelink,'sourceavail');
+	    if($source eq 'open') {
+		my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
+		my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);
+		$r->print('<td>'."<a href=\"javascript:openWindow('"
+			  .$quotable_sourcelink.
+			  "', 'previewsource', '700', '700', 'no', 'yes','yes')\";".
+			  " TARGET=_self>Yes</a> "."</td>\n");
+	    } else { #A cuddled else. :P
+		$r->print("<td>&nbsp;</td>\n");
+	    }
+	}
+	if ($hash{'display_attrs_11'} == 1) {
+# 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>');
+        }
         if ($hash{'display_attrs_7'} == 1) {
+# Show resource
             my $output='';
             my $embstyle=&Apache::loncommon::fileembstyle($curfext);
 	    if ($embstyle eq 'ssi') {
-	       $output=&Apache::lonnet::ssi_body($filelink);
-               $output='<font size="-2">'.$output.'</font>';
+		my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
+		    '.tmp';
+		if ((!$env{'form.updatedisplay'}) &&
+		    (-e $cache)) {
+		    open(FH,$cache);
+		    $output=join("\n",<FH>);
+		    close(FH);
+		} else {
+		    $output=&Apache::lonnet::ssi_body($filelink);
+		    if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/) {
+			$output='';
+		    } else {
+			open(FH,">$cache");
+			print FH $output;
+			close(FH);
+		    }
+		}
+		$output='<font size="-2">'.$output.'</font>';
 	   } elsif ($embstyle eq 'img') {
                $output='<img src="'.$filelink.'" />';
            } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {
@@ -857,7 +1090,7 @@ sub display_line {
 		 $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.
                  '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
            }
-	   $r->print('<td valign=$valign> '.($output eq '' ? '&nbsp;':$output).
+	   $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
 		      " </td>\n");
         }
 	$r->print("</tr>\n");
@@ -865,8 +1098,6 @@ sub display_line {
 
 # -- display directory
     if ($fnptr == $dirptr) {
-	my @file_ext = split (/\./,$listname);
-	my $curfext = $file_ext[scalar(@file_ext)-1];
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
@@ -888,19 +1119,81 @@ sub display_line {
 	    $r->print ("<img src=",$iconpath,"whitespace",$rem,
 		       ".gif border='0' />\n") if $rem > 0;
 	}
-	$r->print ('<input type="hidden" name="acts" value="">');
+	$r->print ('<input type="hidden" name="acts" value="" />');
 	$r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.
 		   'folder_pointer_'.$diropen.'.gif"');
-	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
 		   "\n");
-	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src="'.
+	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>'.
 		   "\n");
-	$r->print ("$listname$tabtag</tr></form>\n");
+	$r->print ("$listname</td>\n");
+# Attributes
+	my $filelink = $startdir.$filecom[0].'/default';
+
+	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> ',
+		  $filecom[8]," </td>\n") 
+	    if $hash{'display_attrs_1'} == 1;
+	$r->print('<td> '.
+		  (localtime($filecom[9]))." </td>\n") 
+	    if $hash{'display_attrs_2'} == 1;
+	$r->print('<td> '.
+		  (localtime($filecom[10]))." </td>\n") 
+	    if $hash{'display_attrs_3'} == 1;
+
+	if ($hash{'display_attrs_4'} == 1) {
+	    my $author = &Apache::lonnet::metadata($filelink,'author');
+	    $r->print('<td> '.($author eq '' ? '&nbsp;' : $author).
+		      " </td>\n");
+	}
+	if ($hash{'display_attrs_5'} == 1) {
+	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords');
+	    # $keywords = '&nbsp;' if (!$keywords);
+	    $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).
+		      " </td>\n");
+	}
+	if ($hash{'display_attrs_6'} == 1) {
+	    my $lang = &Apache::lonnet::metadata($filelink,'language');
+	    $lang = &Apache::loncommon::languagedescription($lang);
+	    $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).
+		      " </td>\n");
+	}
+	if ($hash{'display_attrs_8'} == 1) {
+	   $r->print('<td>&nbsp;</td>');
+	}
+ 	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>');
     }
 
 }
 
+sub dynmetaprint {
+    my ($r,$filelink,$item)=@_;
+    if ($dynhash{$filelink}->{$item}) {
+	$r->print("\n<br />".$fieldnames{$item}.': '.
+		  &Apache::lonmeta::prettyprint($item,
+						$dynhash{$filelink}->{$item},
+		  (($env{'form.catalogmode'} ne 'groupimport')?'preview':''),
+		  '',
+		  (($env{'form.catalogmode'} eq 'groupimport')?'document.forms.fileattr':''),1));
+    }
+}
+
 # ------------------- prints the beginning of a form for directory or file link
 sub begin_form {
     my ($r,$uri) = @_;
@@ -911,9 +1204,9 @@ sub begin_form {
 	       '" onSubmit="return rep_dirpath(\''.$dnum.'\''.
 	       ',document.forms.fileattr.acts.value)" '.
 	       'enctype="application/x-www-form-urlencoded">'."\n");
-    $r->print ('<input type="hidden" name="openuri" value="'.$uri.'">'.
+    $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.
 	       "\n");
-    $r->print ('<input type="hidden" name="dirPointer" value="on">'."\n");
+    $r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n");
     $dnum++;
 }
 
@@ -948,12 +1241,14 @@ sub setvalues {
 sub cleanup {
     if (tied(%hash)){
 	&Apache::lonnet::logthis('Cleanup indexer: hash');
-        unless (untie(%hash)) {
-	    &Apache::lonnet::logthis('Failed cleanup indexer: hash');
-        }
     }
+    return OK;
 }
 
+
+
+
+
 =head1 NAME
 
 Apache::lonindexer - mod_perl module for cross server filesystem browsing