--- loncom/interface/lonindexer.pm	2001/08/08 03:00:11	1.16
+++ loncom/interface/lonindexer.pm	2001/10/16 17:03:45	1.20
@@ -1,22 +1,21 @@
 # The LearningOnline Network with CAPA
 #
 # Directory Indexer
-# (Login Screen
 #
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer)
+# 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
-# 05/31/2001 Scott Harrison
-# 06/01/2001 Scott Harrison
-# 06/02/2001 Scott Harrison
-# 06/15/2001 Scott Harrison
-# 06/26/2001 H. K. Ng
-# 07/08/2001 H. K. Ng
-# 8/6,8/7 Scott Harrison
+# 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 Scott Harrison
 
 package Apache::lonindexer;
 
@@ -26,13 +25,17 @@ use Apache::Constants qw(:common);
 use Apache::File;
 use GDBM_File;
 
-my %hash;
-my %dirs;
-my %language;
-my $hidden;
-my $extrafield;
-my $fnum;
-my $dnum;
+my %hash; # tied to a 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
+
+# ----- Values which are set by the handler subroutine and are accessible to
+# -----     other methods.
+my $extrafield; # default extra table cell
+my $fnum; # file counter
+my $dnum; # directory counter
+
+# ---------------------------------------------------------------------- BEGIN
 sub BEGIN {
     my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
 			     '/language.tab');
@@ -42,6 +45,7 @@ sub BEGIN {
     } <$fh>;
 }
 
+# ---------------------------------------------------------------- Main Handler
 sub handler {
     my $r = shift;
     $r->content_type('text/html');
@@ -49,6 +53,8 @@ sub handler {
     return OK if $r->header_only;
     $fnum=0;
     $dnum=0;
+
+# --------------------------------------------- machine configuration variables
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $domain  = $r->dir_config('lonDefDomain');
     my $role    = $r->dir_config('lonRole');
@@ -64,44 +70,22 @@ sub handler {
     my $uri=$r->uri;
 
 # -------------------------------------- see if called from an interactive mode
-#    foreach my $key (sort(keys(%ENV))) {
-#	$r->print("$key is $ENV{$key}<br />");
-#    }
-#    $r->print("END ENV");
-    map {
-       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') {
-           $ENV{'form.'.$name}=$value;
-       }
-       if ($name eq 'launch') {
-           $ENV{'form.'.$name}=$value;
-       }
-       if ($name eq 'acts') {
-           $ENV{'form.'.$name}=$value;
-       }
-    } (split(/&/,$ENV{'QUERY_STRING'}));
+    &get_unprocessed_cgi();
 
-    $hidden=''; my $closebutton='';
+    my $closebutton='';
     my $groupimportbutton='';
     my $colspan=''; 
 
     $extrafield='';
-    my $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+    my $diropendb = 
+	"/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
 
     if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
 	if ($ENV{'form.launch'} eq '1') {
-	    delete $hash{'mode_catalog'};
-	    map {
-		if ($_ =~ /^pre_/) {
-		    delete $hash{$_};
-		}
-		if ($_ =~ /^store/) {
-		    delete $hash{$_};
-		}
-	    } keys %hash;    
+	    &start_fresh_session();
 	}
+
+# -------------------- refresh environment with user database values (in %hash)
 	if ($hash{'mode_catalog'} eq 'interactive') {
 	    $ENV{'form.catalogmode'}='interactive';
 	}
@@ -109,15 +93,13 @@ sub handler {
 	    $ENV{'form.catalogmode'}='groupimport';
 	}
 
+# --------------------- 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>';
+		' border="0" /></td>';
 	    $colspan=" colspan='2' ";
-	    $hidden=<<END;
-<input type='hidden' name='catalogmode' value='interactive'>
-END
             $closebutton=<<END;
 <input type="button" name="close" value='CLOSE' onClick="self.close()">
 END
@@ -126,19 +108,18 @@ END
 	    $hash{'mode_catalog'}='groupimport';
 	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
 		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
-		' border="0"></td>';
+		' border="0" /></td>';
 	    $colspan=" colspan='2' ";
-	    $hidden=<<END;
-<input type='hidden' name='catalogmode' value='groupimport'>
-END
             $closebutton=<<END;
 <input type="button" name="close" value='CLOSE' onClick="self.close()">
 END
             $groupimportbutton=<<END;
-<input type="button" name="groupimport" value='GROUP IMPORT' onClick="javascript:select_group()">
+<input type="button" name="groupimport" value='GROUP IMPORT'
+onClick="javascript:select_group()">
 END
         }
 
+# ------ set catalogmodefunctions to have extra needed javascript functionality
 	my $catalogmodefunctions='';
 	if ($ENV{'form.catalogmode'} eq 'interactive' or
 	    $ENV{'form.catalogmode'} eq 'groupimport') {
@@ -148,52 +129,8 @@ function select_data(title,url) {
     changeURL(url);
     self.close();
 }
-function save_group() {
-    for (var num=0; num<document.forms.fnum.fnum.value; num++) {
-	if (eval("document.forms.form"+num+".filelink.checked")) {
-	    alert(eval("document.forms.form"+num+".title.value")+
-		       eval("document.forms.form"+num+".filelink.value"));
-	}
-    }
-}
 function select_group() {
-//    window.location="http://"+window.location.hostname+"/adm/groupsort?acts="+document.forms.fileattr.acts.value;
-    window.location="/adm/groupsort?acts="+document.forms.fileattr.acts.value;
-}
-function select_group2() {
-    var linkflag=false;
-    for (var num=0; num<document.forms.fnum.fnum.value; num++) {
-	if (eval("document.forms.form"+num+".filelink.checked")) {
-//	    alert(eval("document.forms.form"+num+".title.value")+
-//		       eval("document.forms.form"+num+".filelink.value"));
-	    insertRowInLastRow();
-	    placeResourceInLastRow(
-		   eval("document.forms.form"+num+".title.value"),
-		   eval("document.forms.form"+num+".filelink.value"),
-		   linkflag
-				   );
-	    linkflag=true;
-	}
-    }
-    opener.editmode=0;
-    opener.notclear=0;
-    opener.linkmode=0;
-    opener.infoclear();
-    opener.draw();
-    self.close();
-}
-function insertRowInLastRow() {
-    opener.insertrow(opener.maxrow);
-    opener.addobj(opener.maxrow,'e&2');
-}
-function placeResourceInLastRow (title,url,linkflag) {
-    opener.newresource(opener.maxrow,2,opener.escape(title),opener.escape(url),'false','normal');
-    opener.save();
-    opener.mostrecent=opener.obj.length-1;
-    if (linkflag) {
-	opener.joinres(opener.linkmode,opener.mostrecent,0);
-    }
-    opener.linkmode=opener.mostrecent;
+    window.location="/adm/groupsort?catalogmode=groupimport&acts="+document.forms.fileattr.acts.value;
 }
 function changeTitle(val) {
     if (opener.inf.document.forms.resinfo.elements.t) {
@@ -215,33 +152,26 @@ function queue(val) {
 	var l=val.length;
 	var v=val.substring(4,l);
 	document.forms.fileattr.acts.value+='1a'+v+'b';
-//	alert(document.forms.fileattr.acts.value);
     }
     else {
 	var l=val.length;
 	var v=val.substring(4,l);
 	document.forms.fileattr.acts.value+='0a'+v+'b';
-//	alert(document.forms.fileattr.acts.value);
-    }
-    if (typeof(document.forms.dirpathUP)!="undefined") {
-//	document.forms.dirpathUP.acts.value=document.forms.fileattr.acts.value;
-//	alert(document.forms.dirpathUP.acts.value);
     }
 }
 function rep_dirpath(suffix,val) {
     eval("document.forms.dirpath"+suffix+".acts.value=val");
-//    eval("alert(document.forms.dirpath"+suffix+".acts.value)");
-//    return false;
 }
 END
 	}
+
 # ---------------------------------------------------------------- Print Header
 	$r->print(<<ENDHEADER);
 <html>
 <head>
 <title>The LearningOnline Network With CAPA Directory Browser</title>
 
-<script language="javascript">
+<script type="text/javascript">
 $catalogmodefunctions
 function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
     var options = "width=" + w + ",height=" + h + ",";
@@ -258,27 +188,25 @@ function gothere(val) {
 </head>
 <body bgcolor="#FFFFFF">
 ENDHEADER
+
+# - Evaluate actions from previous page (both cumulatively and chronologically)
         if ($ENV{'form.catalogmode'} eq 'groupimport') {
-#	    $r->print($ENV{'form.acts'}."<br />");
 	    my $acts=$ENV{'form.acts'};
 	    my @Acts=split(/b/,$acts);
 	    my %ahash;
 	    my %achash;
 	    my $ac=0;
+	    # some initial hashes for working with data
 	    map {
 		my ($state,$ref)=split(/a/);
 		$ahash{$ref}=$state;
 		$achash{$ref}=$ac;
 		$ac++;
 	    } (@Acts);
+	    # sorting through the actions and changing the tied database hash
 	    map {
 		my $key=$_;
 		if ($ahash{$key} eq '1') {
-#		    $r->print("<b>NEW: ");
-#		    $r->print($hash{'pre_'.$key.'_title'});
-#		    $r->print(" : ");
-#		    $r->print($hash{'pre_'.$key.'_link'});
-#		    $r->print("</b><br />");
 		    $hash{'store_'.$hash{'pre_'.$key.'_link'}}=
 			$hash{'pre_'.$key.'_title'};
 		    $hash{'storectr_'.$hash{'pre_'.$key.'_link'}}=
@@ -291,46 +219,24 @@ ENDHEADER
 		    }
 		}
 	    } sort {$achash{$a}<=>$achash{$b}} (keys %ahash);
-	    map {
-		if ($_ =~ /^store_/) {
-		    my $key=$_;
-		    $key=~s/^store_//;
-#		    $r->print("<b>STORE: ");
-#		    $r->print($hash{'storectr_'.$key});
-#		    $r->print(':');
-#		    $r->print($hash{'store_'.$key});
-#		    $r->print(':');
-#		    $r->print($key);
-#		    $r->print("</b><br />");
-		}
-	    } keys %hash;
+	    # deleting the previously cached listing
 	    map {
 		if ($_ =~ /^pre_/ && $_ =~/link$/) {
 		    my $key = $_;
 		    $key =~ s/^pre_//;
 		    $key =~ s/_[^_]*$//;
-#		    $r->print($key);
-#		    $r->print(':');
-#		    $r->print($hash{'pre_'.$key.'_title'});
-#		    $r->print(':');
-#		    $r->print($hash{'pre_'.$key.'_link'});
-#		    $r->print('<br />');
 		    delete $hash{'pre_'.$key.'_title'};
 		    delete $hash{'pre_'.$key.'_link'};
 		}
 	    } keys %hash;
 	}
 	
-	$r->print('<h2><font color="#888888">The LearningOnline With CAPA Network Directory Browser</font></h2>'."\n");
-    } else {
-	$r->print('<html><head></head><body>Unable to tie hash to db file</body></html>');
-	return OK;
-    }
-    untie %hash;
-    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
-
+# 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<=5; $i++) {
+	    for (my $i=0; $i<=6; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($ENV{'form.attr'.$i} == 1) {
 		    $attrchk[$i] = "checked";
@@ -338,44 +244,55 @@ ENDHEADER
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=5; $i++) {
+	    for (my $i=0; $i<=6; $i++) {
 		$attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
+# output state of file attributes to be showing
 	$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">Display file attributes</font></b><br />
+<form method="post" name="fileattr" action="$uri"
+ enctype="application/x-www-form-urlencoded">
 <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>
 </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>&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" />
-$hidden
 $closebutton
 $groupimportbutton
 </form>
 END
 
+    # 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") if ($hash{'display_attrs_2'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n") if ($hash{'display_attrs_3'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n") if ($hash{'display_attrs_4'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Language</b></td>\n") if ($hash{'display_attrs_5'} == 1);
+	$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")
+	    if ($hash{'display_attrs_2'} == 1);
+	$r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n")
+	    if ($hash{'display_attrs_3'} == 1);
+	$r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n")
+	    if ($hash{'display_attrs_4'} == 1);
+	$r->print("<td bgcolor=$titleclr><b>Language</b></td>\n")
+	    if ($hash{'display_attrs_5'} == 1);
 	$r->print("</tr>");
 
+	# read in what directories have previously been set to "open"
 	map {
 	    if ($_ =~ /^diropen_status_/) {
 		my $key = $_;
@@ -404,6 +321,7 @@ END
 	my $toplevel;
 	my $indent = 0;
 	$uri = $uri.'/' if $uri !~ /.*\/$/;
+
 	if ($bredir ne "on") {
 	    $hash{'top.level'} = $uri;
 	    $toplevel = $uri;
@@ -411,6 +329,8 @@ END
 	} else {
 	    $toplevel = $hash{'top.level'};
 	}
+
+	# if not at top level, provide an uplink arrow
 	if ($toplevel ne "/res/"){
 	    my (@uri_com) = split(/\//,$uri);
 	    pop @uri_com;
@@ -419,22 +339,31 @@ END
 	    &display_line ($r,'opened',$upone.'&viewOneUp',0,$upone,@list);
 	    $indent = 1;
 	}
+
+	# recursively go through all the directories and output as appropriate
 	&scanDir ($r,$toplevel,$indent,\%hash);
 	
+	# 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>");
 	$r->print("</td></tr></table>");
+
+	# end the output and return
 	$r->print("</body></html>\n");
 	untie(%hash);
     } else {
-	$r->print("Unable to tie hash to db file");
+	$r->print('<html><head></head><body>Unable to tie hash to db '.
+		  'file</body></html>');
+	return OK;
     }
     return OK;
 }
 
 
-# --------------------recursive scan of a directory
+# ----------------------------------------------- recursive scan of a directory
 sub scanDir {
     my ($r,$startdir,$indent,$hashref)=@_;
     my ($compuri,$curdir);
@@ -446,11 +375,22 @@ sub scanDir {
     foreach my $line (@list) {
 	my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); 
 	next if $strip =~ /.*\.meta$/;
+	my (@fileparts) = split(/\./,$strip);
+	if ($hash{'display_attrs_6'} != 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+/);
+	    }
+	}
+
 	if ($dom eq "domain") {
-	    $compuri = join('',$strip,"/");  # domain list has /res/<domain name>
+	    $compuri = join('',$strip,"/");  # dom list has /res/<domain name>
 	    $curdir = $compuri;
 	} else {
-	    $compuri = join('',$startdir,$strip,"/"); # user, dir & file have name only, i.e., w/o path
+	    # user, dir & file have name only, i.e., w/o path
+	    $compuri = join('',$startdir,$strip,"/");
 	    $curdir = $startdir;
 	}
 	my $diropen = "closed";
@@ -468,7 +408,7 @@ sub scanDir {
     $indent--;
 }
 
-# ----------------- get complete matched list based on the uri ------
+# --------------- get complete matched list based on the uri (returns an array)
 sub get_list {
     my ($r,$uri)=@_;
     my @list;
@@ -490,7 +430,7 @@ sub get_list {
     return @list=&match_ext($r,@list);
 }
 
-#-------------------------- filters out files based on extensions
+# -------------------- filters out files based on extensions (returns an array)
 sub match_ext {
     my ($r,@packlist)=@_;
     my @trimlist;
@@ -529,7 +469,7 @@ sub match_ext {
     return @trimlist;
 }
 
-#------------------- displays one line in appropriate table format
+# ------------------------------- displays one line in appropriate table format
 sub display_line{
     my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
     my (@pathfn, $fndir, $fnptr);
@@ -548,26 +488,35 @@ sub display_line{
     my $i=0;
 
     while ($i<=5) {
-	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>") if $hash{'display_attrs_'.$i} == 1;
+	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>")
+	    if $hash{'display_attrs_'.$i} == 1;
 	$i++;
     }
+
+# display uplink arrow
     if ($filecom[1] eq "viewOneUp") {
 	$r->print("<tr>$extrafield");
 	$r->print("<td bgcolor=$fileclr valign=bottom>\n");
 	$r->print ('<form method="post" name="dirpathUP" action="'.$startdir.
 		   '/" '.
-		   'onSubmit="return rep_dirpath(\'UP\',document.forms.fileattr.acts.value)" '.
+		   'onSubmit="return rep_dirpath(\'UP\','.
+		   'document.forms.fileattr.acts.value)" '.
 		   'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");
-	$r->print ($hidden.'<input type=hidden name=openuri value="'.$startdir.'">'."\n");
+	$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">'."\n");
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
+		   "\n");
 	$r->print("Up $tabtag</tr></form>\n");
 	return OK;
     }
+
+# 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 ('<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].'/');
@@ -575,12 +524,17 @@ sub display_line{
 	$anchor =~ s/\///g;
 	$r->print ('<a name="'.$anchor.'">');
 	$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">'."\n");
-	$r->print ('<a href="javascript:gothere(\''.$filecom[0].'/\')"><img src="'.$iconpath.'server.gif"');
-	$r->print (' border="0"></a>'."\n");
+	$r->print ('<input src="'.$iconpath.'folder_pointer_'.
+		   $diropen.'.gif"'); 
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
+		   "\n");
+	$r->print ('<a href="javascript:gothere(\''.$filecom[0].
+		   '/\')"><img src="'.$iconpath.'server.gif"');
+	$r->print (' border="0" /></a>'."\n");
 	$r->print("Domain - $listname $tabtag</tr></form>\n");
 	return OK;
+
+# display user directory
     }
     if ($filecom[1] eq "user") {
 	$r->print("<tr>$extrafield");
@@ -589,14 +543,20 @@ sub display_line{
 	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 ('<a name="'.$anchor.'"><img src="'.$iconpath.
+		   'whitespace1.gif" border="0" />'."\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">'."\n");
-	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src='.$iconpath.'quill.gif border=0 name="'.$msg.'" height="22"></a>');
+	$r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.
+		   '.gif"'); 
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
+		   "\n");
+	$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");
 	return OK;
     }
+
 # display file
     if ($fnptr == 0 and $filecom[3] ne "") {
 	my @file_ext = split (/\./,$listname);
@@ -612,7 +572,8 @@ sub display_line{
 	    $title=$listname unless $title;
 	    $r->print("<a href='javascript:select_data(\"",
 	              $title,'","',$filelink,"\")'>");
-	    $r->print("<img src='",$iconpath,"select.gif' border=0></a>\n");
+	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
+		      "\n");
 	    $r->print("</td><td valign='bottom' nowrap bgcolor=$fileclr>");
 	}
         elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
@@ -638,49 +599,66 @@ sub display_line{
 	}
 
 	if ($indent > 0 and $indent < 11) {
-	    $r->print("<img src=",$iconpath,"whitespace",$indent,".gif border=0>\n");
+	    $r->print("<img src=",$iconpath,"whitespace",$indent,
+		      ".gif border='0' />\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 src=",$iconpath,
+			  "whitespace10.gif border='0' />\n");
 	    $count++;
 	    }
-	    $r->print("<img src=",$iconpath,"whitespace",$rem,".gif border=0>\n") if $rem > 0;
+	    $r->print("<img src=",$iconpath,"whitespace",$rem,
+		      ".gif border='0' />\n") if $rem > 0;
 	}
 
-	$r->print("<img src=$iconpath$curfext.gif 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("<img src=$iconpath$curfext.gif 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("</td>\n");
-	$r->print("<td bgcolor=$fileclr align=right valign=bottom> ",$filecom[8]," </td>\n") 
+	$r->print("<td bgcolor=$fileclr align=right valign=bottom> ",
+		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_0'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[9]))." </td>\n") 
+	$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 bgcolor=$fileclr valign=bottom> ".
+		  (localtime($filecom[10]))." </td>\n") 
 	    if $hash{'display_attrs_2'} == 1;
 
 	if ($hash{'display_attrs_3'} == 1) {
-	    my $author = &Apache::lonnet::metadata($filelink,'author') if ($metafile == 1);
+	    my $author = &Apache::lonnet::metadata($filelink,'author')
+		if ($metafile == 1);
 	    $author = '&nbsp;' if (!$author);
-	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$author." </td>\n");
+	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$author.
+		      " </td>\n");
 	}
 	if ($hash{'display_attrs_4'} == 1) {
-	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords') if ($metafile == 1);
+	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords')
+		if ($metafile == 1);
 	    $keywords = '&nbsp;' if (!$keywords);
-	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$keywords." </td>\n");
+	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$keywords.
+		      " </td>\n");
 	}
 	if ($hash{'display_attrs_5'} == 1) {
-	    my $lang = &Apache::lonnet::metadata($filelink,'language') if ($metafile == 1);
+	    my $lang = &Apache::lonnet::metadata($filelink,'language')
+		if ($metafile == 1);
 	    $lang = $language{$lang};
 	    $lang = '&nbsp;' if (!$lang);
-	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$lang." </td>\n");
+	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$lang.
+		      " </td>\n");
 	}
 	$r->print("</tr>\n");
     }
+
 # -- display directory
     if ($fnptr == $dirptr) {
 	my @file_ext = split (/\./,$listname);
@@ -692,21 +670,28 @@ sub display_line{
 	&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");
+	    $r->print("<img src=",$iconpath,"whitespace",$indentm1,
+		      ".gif border='0' />\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 src=",$iconpath
+			   ,"whitespace10.gif border='0' />\n");
 		$count++;
 	    }
-	    $r->print ("<img src=",$iconpath,"whitespace",$rem,".gif border=0>\n") if $rem > 0;
+	    $r->print ("<img src=",$iconpath,"whitespace",$rem,
+		       ".gif border='0' />\n") if $rem > 0;
 	}
 	$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");
-	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src="'.$iconpath.'folder_'.$diropen.'.gif" border=0></a>'."\n");
+	$r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.
+		   'folder_pointer_'.$diropen.'.gif"');
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
+		   "\n");
+	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src="'.
+		   $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.
+		   "\n");
 	$r->print ("$listname$tabtag</tr></form>\n");
     }
 
@@ -717,13 +702,41 @@ sub begin_form {
     my ($r,$uri) = @_;
     my $anchor = $uri;
     $anchor =~ s/\///g;
-    $r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.'#'.$anchor.
-	       '" onSubmit="return rep_dirpath(\''.$dnum.'\',document.forms.fileattr.acts.value)" '.
+    $r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.
+	       '#'.$anchor.
+	       '" onSubmit="return rep_dirpath(\''.$dnum.'\''.
+	       ',document.forms.fileattr.acts.value)" '.
 	       'enctype="application/x-www-form-urlencoded">'."\n");
-    $r->print ($hidden.'<input type=hidden name=openuri value="'.$uri.'">'."\n");
-    $r->print ('<input type=hidden name=dirPointer value="on">'."\n");
+    $r->print ('<input type="hidden" name="openuri" value="'.$uri.'">'.
+	       "\n");
+    $r->print ('<input type="hidden" name="dirPointer" value="on">'."\n");
     $dnum++;
 }
 
+# ----------- grab unprocessed CGI variables that may have been appended to URL
+sub get_unprocessed_cgi {
+    map {
+       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;
+       }
+    } (split(/&/,$ENV{'QUERY_STRING'}));
+}
+
+# --------- settings whenever the user causes the indexer window to be launched
+sub start_fresh_session {
+    delete $hash{'mode_catalog'};
+    map {
+	if ($_ =~ /^pre_/) {
+	    delete $hash{$_};
+	}
+	if ($_ =~ /^store/) {
+	    delete $hash{$_};
+	}
+    } keys %hash;    
+}
+
 1;
 __END__