--- loncom/interface/groupsort.pm	2002/05/09 20:57:26	1.8
+++ loncom/interface/groupsort.pm	2002/05/24 13:53:43	1.11
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.8 2002/05/09 20:57:26 www Exp $
+# $Id: groupsort.pm,v 1.11 2002/05/24 13:53:43 www Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,6 +46,9 @@ my $iconpath; # variable to be accessibl
 # ---------------------------------------------------------------- Main Handler
 sub handler {
     my $r = shift;
+ 
+   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                           ['acts','catalogmode','mode']);
 
     # color scheme
     my $fileclr = '#ffffe6';
@@ -60,7 +63,14 @@ sub handler {
     if ($ENV{'form.mode'} eq 'simple') {
         $finishimport=(<<ENDSMP);
 function finish_import() {
-    alert("Finishing a simple import");
+    opener.document.forms.simpleedit.importdetail.value='';
+    for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
+	opener.document.forms.simpleedit.importdetail.value+='&'+
+              escape(eval("document.forms.groupsort.title"+num+".value"))+'='+
+	      escape(eval("document.forms.groupsort.filelink"+num+".value"));
+    }
+    opener.document.forms.simpleedit.submit();
+    self.close();
 }
 ENDSMP
     } else {
@@ -130,18 +140,9 @@ END
 
     my %shash; # sort order (key is resource location, value is sort order)
     my %thash; # title (key is resource location, value is title)
-    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 'acts') {
-           $ENV{'form.'.$name}=$value;
-       }
-       if ($name eq 'catalogmode') {
-           $ENV{'form.'.$name}=$value;
-       }
-    }
+
     my $diropendb;
+# ------------------------------ which file do we open? Easy if explictly given
     if ($ENV{'form.catalogmode'} eq 'groupsearch') {
 	$diropendb = 
 	    "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db";
@@ -150,29 +151,49 @@ END
 	$diropendb = 
 	    "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
     }
+    elsif ($ENV{'form.catalogmode'} eq 'groupsec') {
+	$diropendb = 
+	    "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_groupsec.db";
+    }
+# --------------------- not explicitly given, choose the one most recently used
     else { # choose last accessed
-	my $dsearch; my $dindex;
-	my $dsearcht; my $dindext;
-	$dsearch =
+        my @dbfn;
+        my @dbst;
+
+	$dbfn[0] =
 	    "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db";
-	if (-e $dsearch) {
-	    $dsearcht=(stat($dsearch))[9];
+        $dbst[0]=-1;
+	if (-e $dbfn[0]) {
+	    $dbst[0]=(stat($dbfn[0]))[9];
 	}
-	$dindex =
+	$dbfn[1] =
             "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
-	if (-e $dindex) {
-            $dindext=(stat($dindex))[9];
+        $dbst[1]=-1;
+	if (-e $dbfn[1]) {
+            $dbst[1]=(stat($dbfn[1]))[9];
         }
-	if (!$dsearcht and !$dindext) {
-	    $diropendb='';
-	}
-        elsif ($dsearcht>$dindext) {
-            $diropendb=$dsearch;
+	$dbfn[2] =
+            "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_groupsec.db";
+        $dbst[2]=-1;
+	if (-e $dbfn[2]) {
+            $dbst[2]=(stat($dbfn[2]))[9];
         }
-	else {
-            $diropendb=$dindex;
-	}
+# Expand here for more modes
+# ....
+
+# Okay, find most recent existing
+
+        my $newest=0;
+        my $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'};
 	my @Acts = split(/b/,$acts);
@@ -274,6 +295,8 @@ END
 <input type="hidden" name="oldval" value="" />
 <input type="hidden" name="newval" value="" />
 END
+
+# --- Expand here if "GO BACK" button desired
     if ($ENV{'form.catalogmode'} eq 'groupimport') {
 	$r->print(<<END);
 <input type="button" name="alter" value="GO BACK"
@@ -286,6 +309,8 @@ END
  onClick="window.location='/adm/searchcat?catalogmode=groupsearch'" />&nbsp;
 END
 }
+# ---
+
     $r->print(<<END);
 <input type="button" name="alter" value="FINISH IMPORT"
  onClick="finish_import()" />&nbsp;