--- loncom/interface/groupsort.pm	2006/07/21 00:21:28	1.45
+++ loncom/interface/groupsort.pm	2006/12/05 02:55:51	1.50
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.45 2006/07/21 00:21:28 www Exp $
+# $Id: groupsort.pm,v 1.50 2006/12/05 02:55:51 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).', '.
@@ -211,14 +212,6 @@ sub readfrombookmarks {
     return ($shash,$thash);
 }
 
-# ---------------------------------------------------------- Clear the database
-
-sub clear_basket {
-    my $diropendb =
-       "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
-    unlink ($diropendb);
-}                                                                                                         
-
 # ---------------------------------------------------------------- Main Handler
 sub handler {
     my $r = shift;
@@ -357,7 +350,8 @@ END
 END
 
         # --- Continue Buttons
-        my $resurl = &Apache::loncommon::lastresurl();
+        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;
@@ -439,6 +433,7 @@ sub hidden {
     my ($sel,$title,$filelink) = @_;
     my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.
 	'" />';
+    $filelink=~s|^/ext/|http://|;
     $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.
 	$filelink.'" />';
     return $string;