--- loncom/interface/lonindexer.pm	2001/08/13 14:50:35	1.17
+++ loncom/interface/lonindexer.pm	2001/11/01 15:59:11	1.22
@@ -14,6 +14,8 @@
 # 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 Scott Harrison
 
 package Apache::lonindexer;
 
@@ -51,6 +53,7 @@ sub handler {
     return OK if $r->header_only;
     $fnum=0;
     $dnum=0;
+    untie %hash;
 
 # --------------------------------------------- machine configuration variables
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
@@ -128,7 +131,7 @@ function select_data(title,url) {
     self.close();
 }
 function select_group() {
-    window.location="/adm/groupsort?acts="+document.forms.fileattr.acts.value;
+    window.location="/adm/groupsort?catalogmode=groupimport&acts="+document.forms.fileattr.acts.value;
 }
 function changeTitle(val) {
     if (opener.inf.document.forms.resinfo.elements.t) {
@@ -169,7 +172,7 @@ END
 <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 + ",";
@@ -234,7 +237,7 @@ ENDHEADER
 		  '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";
@@ -242,7 +245,7 @@ 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;
 	    }
 	}
@@ -253,14 +256,14 @@ ENDHEADER
  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="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="" />
@@ -373,6 +376,16 @@ 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,"/");  # dom list has /res/<domain name>
 	    $curdir = $compuri;
