--- loncom/interface/groupsort.pm	2002/08/12 18:21:42	1.13
+++ loncom/interface/groupsort.pm	2003/06/13 23:33:38	1.20
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.13 2002/08/12 18:21:42 albertel Exp $
+# $Id: groupsort.pm,v 1.20 2003/06/13 23:33:38 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
 #
 ###
 
@@ -39,17 +37,26 @@ use strict;
 
 use Apache::Constants qw(:common);
 use GDBM_File;
+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;
  
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                            ['acts','catalogmode','mode']);
-
     # color scheme
     my $fileclr = '#ffffe6';
     my $titleclr = '#ddffff';
@@ -131,9 +138,8 @@ function orderchange(val,newval) {
 }
 </script>
 </head>
-<body bgcolor="#FFFFFF">
 END
-
+    $r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
     # read pertinent machine configuration
     my $domain  = $r->dir_config('lonDefDomain');
     $iconpath = $r->dir_config('lonIconsURL') . "/";
@@ -284,16 +290,14 @@ END
     untie %hash;
     my $ctr = 0;
     my $clen = scalar(keys %shash);
-   $r->print('<h2><font color="#888888">The LearningOnline Network With CAPA '.
-	      'Group Sorter</font></h2>'."\n");
-    $r->print('<b><font color="#888888">Finalize order of resources</font>'.
-	      '</b>'."\n");
-    $r->print("<form method='post' action='/adm/groupsort' name='groupsort' ".
-	      "enctype='application/x-www-form-urlencoded'>");
-    $r->print(<<END);
+   $r->print(<<END);
+<b><font color="#888888">Finalize order of resources</font></b>
+<form method='post' action='/adm/groupsort' name='groupsort'
+      enctype='application/x-www-form-urlencoded'>
 <input type="hidden" name="fnum" value="$clen" />
 <input type="hidden" name="oldval" value="" />
 <input type="hidden" name="newval" value="" />
+<input type="hidden" name="mode" value="$ENV{'form.mode'}" />
 END
 
 # --- Expand here if "GO BACK" button desired
@@ -305,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);
@@ -327,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");
