--- loncom/interface/groupsort.pm	2003/01/09 22:04:28	1.17
+++ loncom/interface/groupsort.pm	2003/08/26 05:44:11	1.22
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.17 2003/01/09 22:04:28 www Exp $
+# $Id: groupsort.pm,v 1.22 2003/08/26 05:44:11 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
 #
 ###
 
@@ -45,7 +43,12 @@ my %hash; # variable to tie to user spec
 my $iconpath; # variable to be accessible to multiple subroutines
 
 sub cleanup {
-   untie(%hash) if (tied(%hash));
+    if (tied(%hash)){
+	&Apache::lonnet::logthis('Cleanup groupsort: hash');
+        unless (untie(%hash)) {
+	    &Apache::lonnet::logthis('Failed cleanup groupsort: hash');
+        }
+    }
 }
 
 # ---------------------------------------------------------------- Main Handler
@@ -136,7 +139,6 @@ function orderchange(val,newval) {
 </script>
 </head>
 END
-    $r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
     # read pertinent machine configuration
     my $domain  = $r->dir_config('lonDefDomain');
     $iconpath = $r->dir_config('lonIconsURL') . "/";
@@ -148,15 +150,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
@@ -164,19 +166,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];
@@ -287,7 +289,9 @@ END
     untie %hash;
     my $ctr = 0;
     my $clen = scalar(keys %shash);
-   $r->print(<<END);
+    if ($clen > 1) {
+	$r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
+	$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'>
@@ -297,53 +301,81 @@ END
 <input type="hidden" name="mode" value="$ENV{'form.mode'}" />
 END
 
-# --- Expand here if "GO BACK" button desired
-    if ($ENV{'form.catalogmode'} eq 'groupimport') {
-	$r->print(<<END);
+        # --- Expand here if "GO BACK" button desired
+        if ($ENV{'form.catalogmode'} eq 'groupimport') {
+	    $r->print(<<END);
 <input type="button" name="alter" value="GO BACK"
  onClick="window.location='/res/?catalogmode=groupimport'" />&nbsp;
 END
-    }
-    if ($ENV{'form.catalogmode'} eq 'groupsearch') {
-	$r->print(<<END);
+        }
+	if ($ENV{'form.catalogmode'} eq 'groupsearch') {
+	    $r->print(<<END);
 <input type="button" name="alter" value="New Search"
  onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />&nbsp;
 END
-    }
-# ---
+        }
+        # ---
 
-    $r->print(<<END);
+	$r->print(<<END);
 <input type="button" name="alter" value="FINISH IMPORT"
  onClick="finish_import()" />&nbsp;
 <input type="button" name="alter" value="CANCEL" onClick="self.close()" />
 END
-    $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
-    $r->print("<table border=0><tr>\n");
-    $r->print("<td colspan='2' bgcolor='$titleclr'><b>Change order</b></td>".
-	      "\n");
-    $r->print("<td colspan='2' bgcolor='$titleclr'><b>Title</b></td>\n");
-    $r->print("<td bgcolor='$titleclr'><b>Path</b></td></tr>\n");
+        $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
+	$r->print("<table border=0><tr>\n");
+	$r->print("<td colspan='2' bgcolor='$titleclr'><b>Change order</b></td>\n");
+	$r->print("<td colspan='2' bgcolor='$titleclr'><b>Title</b></td>\n");
+	$r->print("<td bgcolor='$titleclr'><b>Path</b></td></tr>\n");
+    } else {
+	$r->print(<<END);
+<body>
+<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
+    }
     foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {
 	my $key=$_;
 	$ctr++;
 	my @file_ext = split(/\./,$key);
 	my $curfext = $file_ext[scalar(@file_ext)-1];
-	$r->print("<tr><td bgcolor='$fileclr'>");
-	$r->print(&movers($clen,$ctr));
+	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');
+	if ($clen > 1) {
+	    $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("</td><td bgcolor='$fileclr'>");
-	$r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
-	$r->print("$key</td></tr>\n");
-    } 
-    $r->print("</table></td></tr></table></form>");
+	if ($clen > 1) {
+	    $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("</td><td bgcolor='$fileclr'>");
+	    $r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
+	    $r->print("$key</td></tr>\n");
+	} 
+    }
+    if ($clen > 1) {
+	$r->print("</table></td></tr></table></form>");
+    } else {
+	$r->print(<<END);
+<script type="text/javascript">
+    finish_import();
+</script>
+END
+    }
     $r->print(<<END);
 </body>
 </html>
 END
+
     return OK;
 }