--- loncom/interface/groupsort.pm	2002/05/09 20:57:26	1.8
+++ loncom/interface/groupsort.pm	2002/05/13 16:00:53	1.10
@@ -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.10 2002/05/13 16:00:53 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,17 +140,7 @@ 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;
     if ($ENV{'form.catalogmode'} eq 'groupsearch') {
 	$diropendb =