--- loncom/interface/groupsort.pm	2006/03/26 19:44:45	1.41
+++ loncom/interface/groupsort.pm	2006/06/08 07:20:41	1.42
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.41 2006/03/26 19:44:45 banghart Exp $
+# $Id: groupsort.pm,v 1.42 2006/06/08 07:20:41 www Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,55 +45,9 @@ my %hash; # variable to tie to user spec
 sub readfromdb {
     my ($r,$shash,$thash)=@_;
 
-    my $diropendb;
-# ------------------------------ which file do we open? Easy if explictly given
-    if ($env{'form.catalogmode'} eq 'groupsearch') {
-	$diropendb = 
-	    "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_searchcat.db";
-    } elsif ($env{'form.catalogmode'} eq 'groupimport') {
-	$diropendb = 
-	    "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";
-    } elsif ($env{'form.catalogmode'} eq 'groupsec') {
-	$diropendb = 
-	    "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";
-    } else {
-# --------------------- not explicitly given, choose the one most recently used
-        my @dbfn;
-        my @dbst;
-
-	$dbfn[0] =
-	    "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_searchcat.db";
-        $dbst[0]=-1;
-	if (-e $dbfn[0]) {
-	    $dbst[0]=(stat($dbfn[0]))[9];
-	}
-	$dbfn[1] =
-            "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";
-        $dbst[1]=-1;
-	if (-e $dbfn[1]) {
-            $dbst[1]=(stat($dbfn[1]))[9];
-        }
-	$dbfn[2] =
-            "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";
-        $dbst[2]=-1;
-	if (-e $dbfn[2]) {
-            $dbst[2]=(stat($dbfn[2]))[9];
-        }
-# Expand here for more modes
-# ....
-
-# Okay, find most recent existing
+    my $diropendb = 
+       "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
 
-        my $newest=0;
-        $diropendb='';
-        for (my $i=0; $i<=$#dbfn; $i++) {
-	    if ($dbst[$i]>$newest) {
-		$newest=$dbst[$i];
-                $diropendb=$dbfn[$i];
-            }
-        }
-
-    }
 # ----------------------------- diropendb is now the filename of the db to open
     if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	my $acts = $env{'form.acts'};
@@ -110,8 +64,6 @@ sub readfromdb {
 	foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
 	    my $key = $_;
 	    if ($ahash{$key} eq '1') {
-#		my $keyz=join("<br />",keys %hash);
-#		print "<br />$key<br />$keyz".$hash{'pre_'.$key.'_link'}."<br />\n";
 		$hash{'store_'.$hash{'pre_'.$key.'_link'}} =
 		    $hash{'pre_'.$key.'_title'};
 		$hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =
@@ -244,7 +196,7 @@ sub handler {
     my $r = shift;
  
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                      ['acts','catalogmode','mode','readfile','recover']);
+				     ['acts','mode','readfile','recover']);
     # color scheme
     my $fileclr = '#ffffe6';
     my $titleclr = '#ddffff';
@@ -350,8 +302,8 @@ END
     if (($clen > 1) || ($env{'form.readfile'})) {
 	my %lt=&Apache::lonlocal::texthash(
 		'fin'=> 'Finalize order of resources',
-		'gb' => 'Go Back',
-		'ns' => 'New Search',
+		'ci' => 'Continue Import',
+		'cs' => 'Continue Search',
 		'fi' => 'Finish Import',
 		'ca' => 'Cancel',
 		'co' => 'Change Order',
@@ -373,20 +325,14 @@ END
 <input type="hidden" name="recover" value="$env{'form.recover'}" />
 END
 
-        # --- Expand here if "GO BACK" button desired
-        if ($env{'form.catalogmode'} eq 'groupimport') {
-            my $resurl = &Apache::loncommon::lastresurl();
-	    $r->print(<<END);
-<input type="button" name="alter" value="$lt{'gb'}"
- onClick="window.location='$resurl?catalogmode=groupimport'" />&nbsp;
+        # --- Continue Buttons
+        my $resurl = &Apache::loncommon::lastresurl();
+        $r->print(<<END);
+<input type="button" name="alter" value="$lt{'ci'}"
+ onClick="window.location='$resurl'" />&nbsp;
+<input type="button" name="altersearch" value="$lt{'cs'}"
+ onClick="window.location='/adm/searchcat'" />&nbsp;
 END
-        }
-	if ($env{'form.catalogmode'} eq 'groupsearch') {
-	    $r->print(<<END);
-<input type="button" name="alter" value="$lt{'ns'}"
- onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />&nbsp;
-END
-        }
         # ---
 
 	$r->print(<<END);