--- loncom/interface/lonindexer.pm	2002/01/17 13:53:45	1.32
+++ loncom/interface/lonindexer.pm	2004/01/05 15:02:43	1.86
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.32 2002/01/17 13:53:45 harris41 Exp $
+# $Id: lonindexer.pm,v 1.86 2004/01/05 15:02:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,25 +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
-# 5/31,6/1,6/2,6/15 Scott Harrison
-# 6/26,7/8 H. K. Ng
-# 8/6,8/7,8/10 Scott Harrison
-# 8/14 H. K. Ng
-# 8/28,10/15,11/28,11/29 Scott Harrison
-# 11/30 Matthew Hall
-# 12/11,12/13 Scott Harrison
-# YEAR=2002
-# 1/17 Scott Harrison
-#
 ###
 
 ###############################################################################
@@ -65,8 +46,11 @@ package Apache::lonindexer;
 use strict;
 use Apache::lonnet();
 use Apache::loncommon();
+use Apache::lonhtmlcommon();
 use Apache::Constants qw(:common);
+use Apache::lonmeta;
 use Apache::File;
+use Apache::lonlocal;
 use GDBM_File;
 
 # ---------------------------------------- variables used throughout the module
@@ -80,15 +64,26 @@ my $extrafield; # default extra table ce
 my $fnum; # file counter
 my $dnum; # directory counter
 
+# ----- Used to include or exclude files with certain extensions.
+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);
 
 # ------------------------------------- read in machine configuration variables
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
@@ -106,83 +101,207 @@ sub handler {
     my $uri=$r->uri;
 
 # -------------------------------------- see if called from an interactive mode
-    &get_unprocessed_cgi();
-
+    # Get the parameters from the query string
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+	     ['catalogmode','launch','acts','mode','form','element',
+              'only','omit','titleelement']);
+    #-------------------------------------------------------------------
     my $closebutton='';
     my $groupimportbutton='';
     my $colspan=''; 
 
     $extrafield='';
     my $diropendb = 
-	"/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
-
-    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+	"/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db";
+    %hash = ();
+    {
+	my %dbfile;
+	if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
+	    while(my($key,$value)=each(%dbfile)) {
+		$hash{$key}=$value;
+	    }
+	    untie(%dbfile);
+	}
+    }
+    {
 	if ($ENV{'form.launch'} eq '1') {
 	    &start_fresh_session();
-	}
-
+        }
 # -------------------- refresh environment with user database values (in %hash)
-	if ($hash{'mode_catalog'} eq 'interactive') {
-	    $ENV{'form.catalogmode'}='interactive';
-	}
-	if ($hash{'mode_catalog'} eq 'groupimport') {
-	    $ENV{'form.catalogmode'}='groupimport';
-	}
+	&setvalues(\%hash,'form.catalogmode',\%ENV,'form.catalogmode'   );
 
 # --------------------- define extra fields and buttons in case of special mode
 	if ($ENV{'form.catalogmode'} eq 'interactive') {
-	    $hash{'mode_catalog'}='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') {
-	    $hash{'mode_catalog'}='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('Group 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'
+<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
+	# with in the future.
+	#
+	# $mode (at this time) indicates if we are in edit mode.
+	# $form is the name of the form that the URL is placed when the
+	#       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.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.only'}) {
+            @Only = split(',',$ENV{'form.only'});
+        }
+        
+	my $mode = $ENV{'form.mode'};
+	my ($form,$element,$titleelement);
+	if ($mode eq 'edit' || $mode eq 'parmset') {
+	    $form         = $ENV{'form.form'};
+	    $element      = $ENV{'form.element'};
+	    $titleelement = $ENV{'form.titleelement'};
+	}
+	&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') {
-	    $catalogmodefunctions=<<END;
+	    # 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 
+	    # the calls dealt with in a more comprehensive manner.
+
+#
+# There is now also mode "simple", which is for the simple version of the rat
+#
+#
+	    if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {
+                my $location = "/adm/groupsort?catalogmode=groupimport&";
+                $location .= "mode=".$mode."&";
+                $location .= "acts=";
+		$catalogmodefunctions=<<"END";
 function select_data(title,url) {
     changeTitle(title);
     changeURL(url);
     self.close();
 }
 function select_group() {
-    window.location="/adm/groupsort?catalogmode=groupimport&acts="+document.forms.fileattr.acts.value;
+    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) {
+	    opener.inf.document.forms.resinfo.elements.u.value=val;
+        }
+    }
+}
+END
+            } elsif ($mode eq 'edit') { # we are in 'edit' mode
+                my $location = "/adm/groupsort?catalogmode=interactive&";
+                $location .= "form=$form&element=$element&mode=edit&acts=";
+		$catalogmodefunctions=<<END;
+// mode = $mode
+function select_data(title,url) {
+    changeURL(url);
+    changeTitle(title);
+    self.close();
+}
+
+function select_group() {
+    window.location="$location"+document.forms.fileattr.acts.value;
 }
+
+function changeURL(val) {
+    if (window.opener.document) {
+	window.opener.document.forms["$form"].elements["$element"].value=val;
+    } else {
+	    alert("The file you selected is: "+val);
+    }
+}
+END
+                if (!$titleelement) {
+		    $catalogmodefunctions.='function changeTitle(val) {}';
+		} else {
+		    $catalogmodefunctions.=<<END;
 function changeTitle(val) {
-    if (opener.inf.document.forms.resinfo.elements.t) {
-        opener.inf.document.forms.resinfo.elements.t.value=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) {
+    changeURL(url);
+    self.close();
+}
+
+function select_group() {
+    window.location="$location"+document.forms.fileattr.acts.value;
+}
+
 function changeURL(val) {
-    if (opener.inf.document.forms.resinfo.elements.u) {
-	opener.inf.document.forms.resinfo.elements.u.value=val;
+    if (window.opener.document) {
+        var elementname  = "$element"+"_value";
+        var checkboxname = "$element"+"_setparmval";
+	window.opener.document.forms["$form"].elements[elementname].value=val;
+        window.opener.document.forms["$form"].elements[checkboxname].checked=true;
+    } else {
+	    alert("The file you selected is: "+val);
     }
 }
+
 END
+            }
         }
-	if ($ENV{'form.catalogmode'} eq 'groupimport') {
-	    $catalogmodefunctions.=<<END;
+        $catalogmodefunctions.=<<END;
 var acts='';
+function rep_dirpath(suffix,val) {
+    eval("document.forms.dirpath"+suffix+".acts.value=val");
+}
+END
+	if ($ENV{'form.catalogmode'} eq 'groupimport') {
+            $catalogmodefunctions.=<<END;
 function queue(val) {
     if (eval("document.forms."+val+".filelink.checked")) {
 	var l=val.length;
@@ -195,9 +314,6 @@ function queue(val) {
 	document.forms.fileattr.acts.value+='0a'+v+'b';
     }
 }
-function rep_dirpath(suffix,val) {
-    eval("document.forms.dirpath"+suffix+".acts.value=val");
-}
 END
 	}
 
@@ -209,10 +325,14 @@ END
 
 <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();
 }
@@ -222,9 +342,10 @@ function gothere(val) {
 </script>
 
 </head>
-<body bgcolor="#FFFFFF">
 ENDHEADER
-
+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'};
@@ -267,66 +388,94 @@ ENDHEADER
 	    }
 	}
 	
-# ---------------------------------------------------------------- output title
-	$r->print('<h2><font color="#888888">The LearningOnline With CAPA '.
-		  'Network Directory Browser</font></h2>'."\n");
 # ---------------------------------- get state of file attributes to be showing
-	if ($ENV{'form.attrs'} ne "") {
-	    for (my $i=0; $i<=6; $i++) {
+	if ($ENV{'form.attrs'} ne '') {
+	    for (my $i=0; $i<=9; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($ENV{'form.attr'.$i} == 1) {
-		    $attrchk[$i] = "checked";
+		    $attrchk[$i] = 'checked';
 		    $hash{'display_attrs_'.$i} = 1;
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=6; $i++) {
-		$attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1;
+	    for (my $i=0; $i<=9; $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',
+					   'sr' => 'Show resource',
+					   'av' => 'All versions',
+					   'ud' => 'Update Display'
+					   );
+        my $Displayfileattributes=&mt('Display file attributes');
 	$r->print(<<END);
-<b><font color="#666666">Display file attributes</font></b><br />
 <form method="post" name="fileattr" action="$uri"
  enctype="application/x-www-form-urlencoded">
+<b><font color="#666666">$Displayfileattributes</font></b><br />
 <table border=0><tr>
-<td><input type="checkbox" name="attr0" value="1" $attrchk[0] /> Size</td>
-<td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> Last access</td>
-<td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> Last modified</td>
-<td><input type="checkbox" name="attr6" value="1" $attrchk[6] /> All versions</td>
+<td><input type="checkbox" name="attr0" value="1" $attrchk[0] /> $lt{'ti'}</td>
+<td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> $lt{'si'}</td>
+<td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> $lt{'la'}</td>
+<td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> $lt{'lm'}</td>
+<td><input type="checkbox" name="attr8" value="1" $attrchk[8] /> $lt{'st'}</td>
 </tr><tr>
-<td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> Author</td>
-<td><input type="checkbox" name="attr4" value="1" $attrchk[4] /> Keywords</td>
-<td><input type="checkbox" name="attr5" value="1" $attrchk[5] /> Language</td>
+<td><input type="checkbox" name="attr4" value="1" $attrchk[4] /> $lt{'au'}</td>
+<td><input type="checkbox" name="attr5" value="1" $attrchk[5] /> $lt{'kw'}</td>
+<td><input type="checkbox" name="attr6" value="1" $attrchk[6] /> $lt{'ln'}</td>
+<td><input type="checkbox" name="attr7" value="1" $attrchk[7] /> $lt{'sr'}</td>
+<td><input type="checkbox" name="attr9" value="1" $attrchk[9] /> $lt{'av'}</td>
 <td>&nbsp;</td>
 </tr></table>
 <input type="hidden" name="dirPointer" value="on" />
 <input type="hidden" name="acts" value="" />
-<input type="submit" name="attrs" value="Review" />&nbsp;
-<input type="submit" name="attrs" value="Refresh" />
+<input type="submit" name="attrs" value="$lt{'ud'}" />
 $closebutton
 $groupimportbutton
 </form>
 END
-
+# ---------------------------------------------------------------- Bread crumbs
+        $r->print(&Apache::lonhtmlcommon::crumbs($uri));
+# ------------------------------------------------------ Remember where we were
+	&Apache::loncommon::storeresurl($uri);
 # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";
-        $r->print("<table border=0><tr><td bgcolor=#eeeeee>\n");
-	$r->print("<table border=0><tr>\n");
-	$r->print("<td $colspan bgcolor=$titleclr><b>Name</b></td>\n");
-	$r->print("<td bgcolor=$titleclr align=right><b>Size (bytes) ".
-		  "</b></td>\n") if ($hash{'display_attrs_0'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Last accessed</b></td>\n") 
-	    if ($hash{'display_attrs_1'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Last modified</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>".&mt("Size")." (".&mt("bytes").") ".
+		  "</b></td>\n") if ($hash{'display_attrs_1'} == 1);
+	$r->print("<td><b>".&mt("Last accessed")."</b></td>\n") 
 	    if ($hash{'display_attrs_2'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n")
+	$r->print("<td><b>".&mt("Last modified")."</b></td>\n")
 	    if ($hash{'display_attrs_3'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n")
+	$r->print("<td><b>".&mt("Author(s)")."</b></td>\n")
 	    if ($hash{'display_attrs_4'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Language</b></td>\n")
+	$r->print("<td><b>".&mt("Keywords")."</b></td>\n")
 	    if ($hash{'display_attrs_5'} == 1);
-	$r->print("</tr>");
+	$r->print("<td><b>".&mt("Language")."</b></td>\n")
+	    if ($hash{'display_attrs_6'} == 1);
+	$r->print("<td><b>".&mt("Resource")."</b></td>\n")
+	    if ($hash{'display_attrs_7'} == 1);
+	$r->print("<td><b>".&mt("Usage Statistics")." <br />(".
+		  &mt("Courses/Network Hits").")</b></td>\n")
+	    if ($hash{'display_attrs_8'} == 1);
+	$r->print('</tr>');
 
 # ----------------- read in what directories have previously been set to "open"
 	foreach (keys %hash) {
@@ -358,7 +507,7 @@ END
 	my $indent = 0;
 	$uri = $uri.'/' if $uri !~ /.*\/$/;
 
-	if ($bredir ne "on") {
+	if ($bredir ne 'on') {
 	    $hash{'top.level'} = $uri;
 	    $toplevel = $uri;
 
@@ -367,7 +516,7 @@ END
 	}
 
 # -------------------------------- if not at top level, provide an uplink arrow
-	if ($toplevel ne "/res/"){
+	if ($toplevel ne '/res/'){
 	    my (@uri_com) = split(/\//,$uri);
 	    pop @uri_com;
 	    my $upone = join('/',@uri_com);
@@ -384,23 +533,33 @@ END
 	$r->print("<input type='hidden' name='fnum' value='$fnum'></form>");
 
 # -------------------------------------------------------------- end the tables
-	$r->print("</table>");
-	$r->print("</td></tr></table>");
+	$r->print('</table>');
+	$r->print('</td></tr></table>');
 
 # --------------------------------------------------- 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;
+	$r->print('</body></html>'."\n");
+#    } else {
+#	$r->print('<html><head></head><body>Unable to tie hash to db '.
+#		  'file</body></html>');
+#	return OK;
+    }
+    if(! $c->aborted()) {
+	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;
     $indent++;
@@ -408,37 +567,40 @@ sub scanDir {
     my %dupdirs = %dirs;
     my @list=&get_list($r,$startdir);
     foreach my $line (@list) {
-	my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); 
+        return if ($c->aborted());
+	my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5); 
 	next if $strip =~ /.*\.meta$/;
 	my (@fileparts) = split(/\./,$strip);
-	if ($hash{'display_attrs_6'} != 1) {
+	if ($hash{'display_attrs_9'} != 1) {
 	    if (scalar(@fileparts) >= 3) {
 		my $fext = pop @fileparts;
 		my $ov = pop @fileparts;
 		my $fname = join ('.',@fileparts,$fext);
-		next if (grep /$fname/,@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;
+	if ($dom eq 'domain') {
+	    # 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,"/");
+	    $compuri = join('',$startdir,$strip,'/');
 	    $curdir = $startdir;
 	}
-	my $diropen = "closed";
+	my $diropen = 'closed';
 	if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) {
 	    while (my ($key,$val)= each %dupdirs) {
 		if ($key eq $compuri and $val eq "open") {
 		    $diropen = "opened";
-		    delete $dupdirs{key},$dirs{$key};
+		    delete($dupdirs{$key});
+		    delete($dirs{$key});
 		}
 	    }
 	}
 	&display_line($r,$diropen,$line,$indent,$curdir,$hashref,@list);
-	&scanDir ($r,$compuri,$indent) if $diropen eq "opened";
+	&scanDir ($r,$compuri,$indent) if $diropen eq 'opened';
     }
     $indent--;
 }
@@ -447,10 +609,9 @@ sub scanDir {
 sub get_list {
     my ($r,$uri)=@_;
     my @list;
-    my $luri = $uri;
-    $luri =~ s/\//_/g;
+    (my $luri = $uri) =~ s/\//_/g;
 
-    if ($ENV{'form.attrs'} eq "Refresh") {
+    if ($ENV{'form.attrs'} eq &mt('Update Display')) {
 	foreach (keys %hash) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
 	    }
@@ -465,6 +626,29 @@ sub get_list {
     return @list=&match_ext($r,@list);
 }
 
+sub initdebug {
+    return <<ENDJS;
+<script>
+var debugging = true;
+if (debugging) {
+    var debuggingWindow = window.open('','Debug','width=400,height=300',true);
+} 
+
+function output(text) {
+    if (debugging) {
+        debuggingWindow.document.writeln(text);
+    }
+}
+output("<html><head><title>Debugging Window</title></head><body><pre>");   
+</script>
+ENDJS
+}
+
+sub writedebug {
+    my $text = shift;
+    return "<script>output('$text');</script>";
+}
+
 # -------------------- filters out files based on extensions (returns an array)
 sub match_ext {
     my ($r,@packlist)=@_;
@@ -477,8 +661,8 @@ sub match_ext {
 	chomp $line;
 	$line =~ s/^\/home\/httpd\/html//;
 	my @unpackline = split (/\&/,$line);
-	next if ($unpackline[0] eq ".");
-	next if ($unpackline[0] eq "..");
+	next if ($unpackline[0] eq '.');
+	next if ($unpackline[0] eq '..');
 	my @filecom = split (/\./,$unpackline[0]);
 	my $fext = pop(@filecom);
 	my $fnptr = $unpackline[3]&$dirptr;
@@ -490,38 +674,40 @@ sub match_ext {
 	    push @trimlist,$line;
 	}
     }
-    @trimlist = sort (@trimlist);
+    @trimlist = sort {uc($a) cmp uc($b)} (@trimlist);
     return @trimlist;
 }
 
 # ------------------------------- displays one line in appropriate table format
 sub display_line {
     my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
-    my (@pathfn, $fndir, $fnptr);
+    my (@pathfn, $fndir);
     my $dirptr=16384;
     my $fileclr="#ffffe6";
-    my $iconpath= $r->dir_config('lonIconsURL') . "/";
+    my $iconpath= $r->dir_config('lonIconsURL') . '/';
 
     my @filecom = split (/\&/,$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 $tabtag='</td>';
     my $i=0;
 
-    while ($i<=5) {
-	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>")
+    while ($i<=8) {
+	$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>$extrafield");
-	$r->print("<td bgcolor=$fileclr valign=bottom>\n");
+    if ($filecom[1] eq 'viewOneUp') {
+	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
+	$r->print("<td>\n");
 	$r->print ('<form method="post" name="dirpathUP" action="'.$startdir.
 		   '/" '.
 		   'onSubmit="return rep_dirpath(\'UP\','.
@@ -534,18 +720,21 @@ sub display_line {
 	$r->print ('<input src="'.$iconpath.'arrow_up.gif"');
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
-	$r->print("Up $tabtag</tr></form>\n");
+	$r->print(&mt("Up")." $tabtag</tr></form>\n");
 	return OK;
     }
+# Do we have permission to look at this?
+
+    return OK if (!&Apache::lonnet::allowed('bre',$startdir.$filecom[0]));
 
 # display domain
-    if ($filecom[1] eq "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>$extrafield");
-	$r->print("<td bgcolor=$fileclr valign=bottom>");
-	&begin_form ($r,$filecom[0].'/');
-	my $anchor = $filecom[0].'/';
+	$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="">');
@@ -554,16 +743,21 @@ sub display_line {
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
 	$r->print ('<a href="javascript:gothere(\''.$filecom[0].
-		   '/\')"><img src="'.$iconpath.'server.gif"');
+		   '\')"><img src="'.$iconpath.'server.gif"');
 	$r->print (' border="0" /></a>'."\n");
-	$r->print("Domain - $listname $tabtag</tr></form>\n");
+	$r->print (&mt("Domain")." - $listname ");
+	if ($Apache::lonnet::domaindescription{$listname}) {
+	    $r->print("(".$Apache::lonnet::domaindescription{$listname}.
+		      ")");
+	}
+	$r->print (" $tabtag</tr></form>\n");
 	return OK;
 
 # display user directory
     }
-    if ($filecom[1] eq "user") {
-	$r->print("<tr>$extrafield");
-	$r->print("<td bgcolor=$fileclr valign=bottom nowrap>\n");
+    if ($filecom[1] eq 'user') {
+	$r->print("<tr valign=$valign bgcolor=$fileclr>$extrafield");
+	$r->print("<td nowrap>\n");
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
@@ -578,41 +772,52 @@ sub display_line {
 	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src='.
 		   $iconpath.'quill.gif border="0" name="'.$msg.
 		   '" height="22" /></a>');
-	$r->print ($listname.$tabtag.'</tr></form>'."\n");
+	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");
 	return OK;
     }
 
 # display file
-    if ($fnptr == 0 and $filecom[3] ne "") {
+    if ($fnptr == 0 and $filecom[3] ne '') {
+	my $filelink = $startdir.$filecom[0];
+	next if &Apache::lonnet::metadata($filelink,'obsolete');
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
+        if (@Omit) {
+            foreach (@Omit) { return OK if ($curfext eq $_); }
+        }
+        if (@Only) {
+            my $skip = 1;
+            foreach (@Only) { $skip = 0 if ($curfext eq $_); }
+            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');
-	#
-	my $filelink = $startdir.$filecom[0];
-	$r->print("<tr><td nowrap valign='bottom' bgcolor=$fileclr>");
-	my $metafile = grep /^$filecom[0]\.meta\&/, @list;
+	my $iconname = &Apache::loncommon::icon($listname);
+	$r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap>");
+	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;
-	    $r->print("<a href='javascript:select_data(\"",
-	              $title,'","',$filelink,"\")'>");
+	    my $titleesc=HTML::Entities::encode($title);
+	    $titleesc=~s/\'/\\'/; #' (clean up this spare quote)
+            $r->print("<a href=\"javascript:select_data(\'",
+                      $titleesc,"','",$filelink,"')\">");
 	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
 		      "\n");
-	    $r->print("</td><td valign='bottom' nowrap bgcolor=$fileclr>");
+	    $r->print("</td><td 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("<form name='form$fnum'>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
 		      "value='$filelink' onClick='".
@@ -622,11 +827,11 @@ sub display_line {
 	    }
 	    $r->print(">\n");
 	    $r->print("<input type='hidden' name='title"."' ".
-		      "value='$title'>\n");
+		      "value='$titleesc'>\n");
 	    $r->print("</form>\n");
-	    $r->print("</td><td valign='bottom' nowrap bgcolor=$fileclr>");
+	    $r->print("</td><td nowrap>");
 	    $hash{"pre_${fnum}_link"}=$filelink;
-	    $hash{"pre_${fnum}_title"}=$title;
+	    $hash{"pre_${fnum}_title"}=$titleesc;
   	    $fnum++;
 	}
 
@@ -646,59 +851,86 @@ sub display_line {
 		      ".gif border='0' />\n") if $rem > 0;
 	}
 
-	$r->print("<img src=$iconpath$iconname border='0' />\n");
+	$r->print("<img src='$iconname' border='0' />\n");
 	$r->print (" <a href=\"javascript:openWindow('".$filelink.
-		   "', 'metadatafile', '450', '500', 'no', 'yes')\";".
+		   "', 'previewfile', '450', '500', 'no', 'yes','yes')\";".
 		   " TARGET=_self>$listname</a> ");
 
 	$r->print (" (<a href=\"javascript:openWindow('".$filelink.
-		   ".meta', 'metadatafile', '400', '450', 'no', 'yes')\"; ".
+		   ".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".
 		   "TARGET=_self>metadata</a>) ") if ($metafile == 1);
 
 	$r->print("</td>\n");
-	$r->print("<td bgcolor=$fileclr align=right valign=bottom> ",
+	if ($hash{'display_attrs_0'} == 1) {
+	    my $title = &Apache::lonnet::gettitle($filelink,'title')
+		if ($metafile == 1);
+	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
+		      ' </td>'."\n");
+	}
+	$r->print('<td align=right> ',
 		  $filecom[8]," </td>\n") 
-	    if $hash{'display_attrs_0'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".
-		  (localtime($filecom[9]))." </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".
-		  (localtime($filecom[10]))." </td>\n") 
+	$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_3'} == 1) {
+	if ($hash{'display_attrs_4'} == 1) {
 	    my $author = &Apache::lonnet::metadata($filelink,'author')
 		if ($metafile == 1);
-	    $author = '&nbsp;' if (!$author);
-	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$author.
+	    $r->print('<td> '.($author eq '' ? '&nbsp;' : $author).
 		      " </td>\n");
 	}
-	if ($hash{'display_attrs_4'} == 1) {
+	if ($hash{'display_attrs_5'} == 1) {
 	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords')
 		if ($metafile == 1);
-	    $keywords = '&nbsp;' if (!$keywords);
-	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$keywords.
+	    # $keywords = '&nbsp;' if (!$keywords);
+	    $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).
 		      " </td>\n");
 	}
-	if ($hash{'display_attrs_5'} == 1) {
+	if ($hash{'display_attrs_6'} == 1) {
 	    my $lang = &Apache::lonnet::metadata($filelink,'language')
 		if ($metafile == 1);
 	    $lang = &Apache::loncommon::languagedescription($lang);
-	    $lang = '&nbsp;' if (!$lang);
-	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$lang.
+	    $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).
+		      " </td>\n");
+	}
+        if ($hash{'display_attrs_7'} == 1) {
+            my $output='';
+            my $embstyle=&Apache::loncommon::fileembstyle($curfext);
+	    if ($embstyle eq 'ssi') {
+	       $output=&Apache::lonnet::ssi_body($filelink);
+               $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)}.
+                 '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
+           }
+	   $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
 		      " </td>\n");
+        }
+	if ($hash{'display_attrs_8'} == 1) {
+	    my (%stat) = &Apache::lonmeta::dynamicmeta($filelink) if ($metafile == 1);
+	    my $stat = (exists($stat{'course'}) ? $stat{'course'} : '').
+		((exists($stat{'course'}) || exists($stat{'count'})) ? '/' : '').
+		(exists($stat{'count'}) ? $stat{'count'} : '');
+	    $r->print('<td align=center> '.($stat eq '' ? '&nbsp;' : $stat).
+		      ' </td>'."\n");
 	}
+
 	$r->print("</tr>\n");
     }
 
 # -- 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;
-	$r->print("<tr>$extrafield<td bgcolor=$fileclr valign=bottom>");
+	$r->print("<tr bgcolor=$fileclr>$extrafield<td valign=$valign>");
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
 	if ($indentm1 < 11 and $indentm1 > 0) {
@@ -724,7 +956,49 @@ sub display_line {
 	$r->print ('<a href="javascript:gothere(\''.$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_7'} == 1) {
+	   $r->print('<td>&nbsp;</td>');
+        }
+	if ($hash{'display_attrs_8'} == 1) {
+	   $r->print('<td>&nbsp;</td>');
+	}
+	$r->print('</form></tr>');
     }
 
 }
@@ -745,33 +1019,40 @@ sub begin_form {
     $dnum++;
 }
 
-# ----------- grab unprocessed CGI variables that may have been appended to URL
-sub get_unprocessed_cgi {
-    foreach (split(/&/,$ENV{'QUERY_STRING'})) {
-       my ($name, $value) = split(/=/,$_);
-       $value =~ tr/+/ /;
-       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-       if ($name eq 'catalogmode' or $name eq 'launch' or $name eq 'acts') {
-           $ENV{'form.'.$name}=$value;
-       }
-    }
-}
-
 # --------- settings whenever the user causes the indexer window to be launched
 sub start_fresh_session {
-    delete $hash{'mode_catalog'};
+    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) {
-	if ($_ =~ /^pre_/) {
-	    delete $hash{$_};
-	}
-	if ($_ =~ /^store/) {
-	    delete $hash{$_};
-	}
+        delete $hash{$_} if (/^(pre_|store)/);
     }
 }
 
+# ------------------------------------------------------------------- setvalues
+sub setvalues {
+    # setvalues is used in registerurl to synchronize the database
+    # hash and environment hashes
+    my ($H1,$h1key,$H2,$h2key) =@_;
+    #
+    if (exists $H2->{$h2key}) {
+	$H1->{$h1key} = $H2->{$h2key};
+    } elsif (exists $H1->{$h1key}) {
+	$H2->{$h2key} = $H1->{$h1key};
+    } 
+}
+
 1;
 
+sub cleanup {
+    if (tied(%hash)){
+	&Apache::lonnet::logthis('Cleanup indexer: hash');
+    }
+}
+
 =head1 NAME
 
 Apache::lonindexer - mod_perl module for cross server filesystem browsing
@@ -906,11 +1187,6 @@ begin_form - prints the beginning of a f
 
 =item *
 
-get_unprocessed_cgi - grab unprocessed CGI variables that may have been
-appended to URL
-
-=item *
-
 start_fresh_session - settings whenever the user causes the indexer window
 to be launched