--- loncom/interface/groupsort.pm	2002/08/27 12:18:13	1.15
+++ loncom/interface/groupsort.pm	2003/06/14 00:15:01	1.21
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.15 2002/08/27 12:18:13 www Exp $
+# $Id: groupsort.pm,v 1.21 2003/06/14 00:15:01 albertel Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,9 +27,7 @@
 # http://www.lon-capa.org/
 #
 # YEAR=2001
-# 8/7,8/8,10/14,10/15,12/10 Scott Harrison
 # YEAR=2002
-# 1/17 Scott Harrison
 #
 ###
 
@@ -44,6 +42,15 @@ use Apache::loncommon;
 my %hash; # variable to tie to user specific database
 my $iconpath; # variable to be accessible to multiple subroutines
 
+sub cleanup {
+    if (tied(%hash)){
+	&Apache::lonnet::logthis('Cleanup groupsort: hash');
+        unless (untie(%hash)) {
+	    &Apache::lonnet::logthis('Failed cleanup groupsort: hash');
+        }
+    }
+}
+
 # ---------------------------------------------------------------- Main Handler
 sub handler {
     my $r = shift;
@@ -144,15 +151,15 @@ END
 # ------------------------------ 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";
+	    "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";
     }
     elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
 	$diropendb = 
-	    "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+	    "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db";
     }
     elsif ($ENV{'form.catalogmode'} eq 'groupsec') {
 	$diropendb = 
-	    "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_groupsec.db";
+	    "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_groupsec.db";
     }
 # --------------------- not explicitly given, choose the one most recently used
     else { # choose last accessed
@@ -160,19 +167,19 @@ END
         my @dbst;
 
 	$dbfn[0] =
-	    "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db";
+	    "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";
         $dbst[0]=-1;
 	if (-e $dbfn[0]) {
 	    $dbst[0]=(stat($dbfn[0]))[9];
 	}
 	$dbfn[1] =
-            "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+            "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db";
         $dbst[1]=-1;
 	if (-e $dbfn[1]) {
             $dbst[1]=(stat($dbfn[1]))[9];
         }
 	$dbfn[2] =
-            "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_groupsec.db";
+            "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_groupsec.db";
         $dbst[2]=-1;
 	if (-e $dbfn[2]) {
             $dbst[2]=(stat($dbfn[2]))[9];
@@ -302,10 +309,10 @@ END
     }
     if ($ENV{'form.catalogmode'} eq 'groupsearch') {
 	$r->print(<<END);
-<input type="button" name="alter" value="GO BACK"
- onClick="window.location='/adm/searchcat?catalogmode=groupsearch'" />&nbsp;
+<input type="button" name="alter" value="New Search"
+ onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />&nbsp;
 END
-}
+    }
 # ---
 
     $r->print(<<END);
@@ -324,13 +331,18 @@ END
 	$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');
 	$r->print("<tr><td bgcolor='$fileclr'>");
 	$r->print(&movers($clen,$ctr));
 	$r->print(&hidden($ctr-1,$thash{$key},$key));
 	$r->print("</td><td bgcolor='$fileclr'>");
 	$r->print(&select_box($clen,$ctr));
 	$r->print("</td><td bgcolor='$fileclr'>");
-	$r->print("<img src='$iconpath$curfext.gif'>");
+	$r->print("<img src='$iconpath$iconname'>");
 	$r->print("</td><td bgcolor='$fileclr'>");
 	$r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
 	$r->print("$key</td></tr>\n");