--- loncom/interface/groupsort.pm	2001/10/16 17:07:25	1.3
+++ loncom/interface/groupsort.pm	2002/01/17 12:17:50	1.6
@@ -1,11 +1,37 @@
 # The LearningOnline Network with CAPA
-#
 # The LON-CAPA group sort handler
-#
 # Allows for sorting prior to import into RAT.
 #
+# $Id: groupsort.pm,v 1.6 2002/01/17 12:17:50 harris41 Exp $
+# 
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # YEAR=2001
-# 8/7,8/8,10/14,10/15 Scott Harrison
+# 8/7,8/8,10/14,10/15,12/10 Scott Harrison
+# YEAR=2002
+# 1/17 Scott Harrison
+#
+###
 
 package Apache::groupsort;
 
@@ -87,12 +113,10 @@ END
     # read pertinent machine configuration
     my $domain  = $r->dir_config('lonDefDomain');
     $iconpath = $r->dir_config('lonIconsURL') . "/";
-    my $diropendb = 
-	"/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
 
     my %shash; # sort order (key is resource location, value is sort order)
     my %thash; # title (key is resource location, value is title)
-    map {
+    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;
@@ -102,20 +126,52 @@ END
        if ($name eq 'catalogmode') {
            $ENV{'form.'.$name}=$value;
        }
-    } (split(/&/,$ENV{'QUERY_STRING'}));
+    }
+    my $diropendb;
+    if ($ENV{'form.catalogmode'} eq 'groupsearch') {
+	$diropendb = 
+	    "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db";
+    }
+    elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
+	$diropendb = 
+	    "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+    }
+    else { # choose last accessed
+	my $dsearch; my $dindex;
+	my $dsearcht; my $dindext;
+	$dsearch =
+	    "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db";
+	if (-e $dsearch) {
+	    $dsearcht=(stat($dsearch))[9];
+	}
+	$dindex =
+            "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+	if (-e $dindex) {
+            $dindext=(stat($dindex))[9];
+        }
+	if (!$dsearcht and !$dindext) {
+	    $diropendb='';
+	}
+        elsif ($dsearcht>$dindext) {
+            $diropendb=$dsearch;
+        }
+	else {
+            $diropendb=$dindex;
+	}
+    }
     if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
 	my $acts = $ENV{'form.acts'};
 	my @Acts = split(/b/,$acts);
 	my %ahash;
 	my %achash;
 	my $ac = 0;
-	map {
+	foreach (@Acts) {
 	    my ($state,$ref) = split(/a/);
 	    $ahash{$ref} = $state;
 	    $achash{$ref} = $ac;
 	    $ac++;
-	} (@Acts);
-	map {
+	}
+	foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
 	    my $key = $_;
 	    if ($ahash{$key} eq '1') {
 #		my $keyz=join("<br />",keys %hash);
@@ -131,25 +187,25 @@ END
 		    delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
 		}
 	    }
-	} sort {$achash{$a} <=> $achash{$b}} (keys %ahash);
-	map {
+	}
+	foreach (keys %hash) {
 	    if ($_ =~ /^store_/) {
 		my $key = $_;
 		$key =~ s/^store_//;
 		$shash{$key} = $hash{'storectr_'.$key};
 		$thash{$key} = $hash{'store_'.$key};
 	    }
-	} keys %hash;	
+	}
 	if ($ENV{'form.oldval'}) {
 	    my $newctr = 0;
 	    my %chash;
-	    map {
+	    foreach (sort {$shash{$a} <=> $shash{$b}} (keys %shash)) {
 		my $key = $_;
 		$newctr++;
 		$shash{$key} = $newctr;
 		$hash{'storectr_'.$key} = $newctr;
 		$chash{$newctr} = $key;
-	    } sort {$shash{$a} <=> $shash{$b}} (keys %shash);
+	    }
 	    my $oldval = $ENV{'form.oldval'};
 	    my $newval = $ENV{'form.newval'};
 	    if ($oldval != $newval) {
@@ -227,7 +283,7 @@ END
 	      "\n");
     $r->print("<td colspan='2' bgcolor='$titleclr'><b>Title</b></td>\n");
     $r->print("<td bgcolor='$titleclr'><b>Path</b></td></tr>\n");
-    map {
+    foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {
 	my $key=$_;
 	$ctr++;
 	my @file_ext = split(/\./,$key);
@@ -242,7 +298,7 @@ END
 	$r->print("</td><td bgcolor='$fileclr'>");
 	$r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
 	$r->print("$key</td></tr>\n");
-    } sort {$shash{$a}<=>$shash{$b}} (keys %shash);
+    } 
     $r->print("</table></td></tr></table></form>");
     $r->print(<<END);
 </body>