--- loncom/interface/lonsearchcat.pm	2003/01/06 13:54:25	1.162
+++ loncom/interface/lonsearchcat.pm	2003/02/10 21:25:43	1.166
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.162 2003/01/06 13:54:25 www Exp $
+# $Id: lonsearchcat.pm,v 1.166 2003/02/10 21:25:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,7 +79,6 @@ use Apache::lonnet();
 use Apache::File();
 use CGI qw(:standard);
 use Text::Query;
-use DBI;
 use GDBM_File;
 use Apache::loncommon();
 use Apache::lonmysql();
@@ -571,7 +570,7 @@ ENDHEADER
     my @domains =&Apache::loncommon::get_domains();
     # adjust the size of the select box
     my $size = 4;
-    my $size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);
+    $size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);
     $scrout.="\n".'<font color="#800000" face="helvetica"><b>'.
         'DOMAINS</b></font><br />'.
             '<select name="domains" size="'.$size.'" multiple>'."\n".
@@ -586,7 +585,7 @@ ENDHEADER
     #----------------------------------------------------------------
     $scrout.=&selectbox('Limit by language','language',
 			$ENV{'form.language'},'any','Any Language',
-			\&{Apache::loncommon::languagedescription},
+			\&Apache::loncommon::languagedescription,
 			(&Apache::loncommon::languageids),
 			);
 # ------------------------------------------------ Compute date selection boxes
@@ -633,7 +632,7 @@ LASTREVISIONDATEEND
     $scrout.=&selectbox('Limit by copyright/distribution','copyright',
 			 $ENV{'form.copyright'},
 			 'any','Any copyright/distribution',
-			 \&{Apache::loncommon::copyrightdescription},
+			 \&Apache::loncommon::copyrightdescription,
 			 (&Apache::loncommon::copyrightids),
 			 );
 # ------------------------------------------- Compute customized metadata field
@@ -2963,7 +2962,12 @@ sub start_fresh_session {
 1;
 
 sub cleanup {
-    untie %groupsearch_db if (tied(%groupsearch_db));
+    if (tied(%groupsearch_db)) {
+	&Apache::lonnet::logthis('Cleanup searchcat: groupsearch_db');
+        unless (untie(%groupsearch_db)) {
+	  &Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db');
+        }
+    }
     &Apache::lonmysql::disconnect_from_db();
 }