--- loncom/interface/groupsort.pm	2003/09/23 00:26:10	1.23
+++ loncom/interface/groupsort.pm	2004/07/12 20:42:31	1.29
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.23 2003/09/23 00:26:10 www Exp $
+# $Id: groupsort.pm,v 1.29 2004/07/12 20:42:31 matthew Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ use Apache::Constants qw(:common);
 use GDBM_File;
 use Apache::loncommon;
 use Apache::lonlocal;
+use Apache::lonnet;
 
 my %hash; # variable to tie to user specific database
 my $iconpath; # variable to be accessible to multiple subroutines
@@ -68,7 +69,7 @@ sub handler {
 
 # finish_import looks different for graphical or "simple" RAT
     my $finishimport='';
-    if ($ENV{'form.mode'} eq 'simple') {
+    if ($ENV{'form.mode'} eq 'simple' || $ENV{'form.mode'} eq '') {
         $finishimport=(<<ENDSMP);
 function finish_import() {
     opener.document.forms.simpleedit.importdetail.value='';
@@ -234,7 +235,11 @@ END
 		my $key = $_;
 		$key =~ s/^store_//;
 		$shash{$key} = $hash{'storectr_'.$key};
-		$thash{$key} = $hash{'store_'.$key};
+		if (&Apache::lonnet::gettitle($key) eq '') {
+		    $thash{$key} = $hash{'store_'.$key};
+		} else {
+		    $thash{$key} = &Apache::lonnet::gettitle($key);
+		}
 	    }
 	}
 	if ($ENV{'form.oldval'}) {
@@ -314,9 +319,10 @@ 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='/res/?catalogmode=groupimport'" />&nbsp;
+ onClick="window.location='$resurl?catalogmode=groupimport'" />&nbsp;
 END
         }
 	if ($ENV{'form.catalogmode'} eq 'groupsearch') {
@@ -351,13 +357,7 @@ END
     foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {
 	my $key=$_;
 	$ctr++;
-	my @file_ext = split(/\./,$key);
-	my $curfext = $file_ext[scalar(@file_ext)-1];
-	my $iconname="unknown.gif";
-	my $embstyle = &Apache::loncommon::fileembstyle($curfext);
-	# The unless conditional that follows is a bit of overkill
-	$iconname = $curfext.".gif" unless
-	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
+	my $iconname=&Apache::loncommon::icon($key);
 	if ($clen > 1) {
 	    $r->print("<tr><td bgcolor='$fileclr'>");
 	    $r->print(&movers($clen,$ctr));
@@ -367,7 +367,7 @@ END
 	    $r->print("</td><td bgcolor='$fileclr'>");
 	    $r->print(&select_box($clen,$ctr));
 	    $r->print("</td><td bgcolor='$fileclr'>");
-	    $r->print("<img src='$iconpath$iconname'>");
+	    $r->print("<img src='$iconname' />");
 	    $r->print("</td><td bgcolor='$fileclr'>");
 	    $r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
 	    $r->print("$key</td></tr>\n");