--- loncom/interface/groupsort.pm	2006/09/12 22:13:05	1.49
+++ loncom/interface/groupsort.pm	2007/06/15 19:18:45	1.51
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.49 2006/09/12 22:13:05 albertel Exp $
+# $Id: groupsort.pm,v 1.51 2007/06/15 19:18:45 albertel Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use GDBM_File;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
+use LONCAPA();
 
 my $iconpath; # variable to be accessible to multiple subroutines
 my %hash; # variable to tie to user specific database
@@ -174,7 +175,7 @@ sub readfromfile {
 
 		    my $url=$token->[2]->{'src'};
                     my $name=$token->[2]->{'title'};
-		    $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;
+		    $name=~s/ \[\((\d+)\,($LONCAPA::username_re)\,($LONCAPA::domain_re)\)\]$//;
 		    if ($1) {
 			$$nhash{$url}='<br />'.&mt('Removed by ').
 			    &Apache::loncommon::plainname($2,$3).', '.
@@ -327,6 +328,7 @@ END
 		'ci' => 'Continue Import',
 		'cs' => 'Continue Search',
 		'fi' => 'Finish Import',
+		're' => 'Recover Checked',
 		'ca' => 'Cancel',
 		'co' => 'Change Order',
 		'ti' => 'Title',
@@ -348,22 +350,29 @@ END
 <input type="hidden" name="recover" value="$env{'form.recover'}" />
 END
 
+
+        # ---
+    
+        if ($env{'form.recover'}) {
+	    $r->print(<<END);
+<input type="button" name="alter" value="$lt{'re'}"
+ onClick="finish_import()" />&nbsp;
+<input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
+END
+	} else {
         # --- Continue Buttons
-        my $resurl = 
-	   &Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
-        $r->print(<<END);
+	    my $resurl = 
+		&Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
+	    $r->print(<<END);
 <input type="button" name="alter" value="$lt{'ci'}"
  onClick="window.location='$resurl?catalogmode=import'" />&nbsp;
 <input type="button" name="altersearch" value="$lt{'cs'}"
  onClick="window.location='/adm/searchcat?catalogmode=import'" />&nbsp;
-END
-        # ---
-
-	$r->print(<<END);
 <input type="button" name="alter" value="$lt{'fi'}"
  onClick="finish_import()" />&nbsp;
 <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
 END
+        }
         $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
 	$r->print("<table border=0><tr>\n");
 	if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {