[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /interface groupsort.pm lonindexer.pm

[www]

www		Thu Jan  9 17:04:28 2003 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
    /loncom/interface	groupsort.pm lonindexer.pm 
  Log:
  Together with the cleanup hander on lonsearchcat.pm, we will hopefully never
  see "cannot tie hash" again during group search and group import
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.28 loncom/loncapa_apache.conf:1.29
--- loncom/loncapa_apache.conf:1.28	Mon Jan  6 08:54:25 2003
+++ loncom/loncapa_apache.conf	Thu Jan  9 17:04:28 2003
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.28 2003/01/06 13:54:25 www Exp $
+## $Id: loncapa_apache.conf,v 1.29 2003/01/09 22:04:28 www Exp $
 ##
 ## 1/11/2002 - Scott Harrison
 ## 2/19/2002 - Scott Harrison
@@ -156,6 +156,7 @@
 <LocationMatch "^/res.*/$">
 SetHandler perl-script
 PerlHandler Apache::lonindexer
+PerlCleanupHandler Apache::lonindexer::cleanup
 </LocationMatch>
 
 <LocationMatch "^/(res|\~).*\.tex$">
@@ -556,6 +557,7 @@
 PerlAccessHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::groupsort
+PerlCleanupHandler Apache::groupsort::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.16 loncom/interface/groupsort.pm:1.17
--- loncom/interface/groupsort.pm:1.16	Mon Sep 16 16:57:28 2002
+++ loncom/interface/groupsort.pm	Thu Jan  9 17:04:28 2003
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.16 2002/09/16 20:57:28 matthew Exp $
+# $Id: groupsort.pm,v 1.17 2003/01/09 22:04:28 www Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,6 +43,10 @@
 
 my %hash; # variable to tie to user specific database
 my $iconpath; # variable to be accessible to multiple subroutines
+
+sub cleanup {
+   untie(%hash) if (tied(%hash));
+}
 
 # ---------------------------------------------------------------- Main Handler
 sub handler {
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.53 loncom/interface/lonindexer.pm:1.54
--- loncom/interface/lonindexer.pm:1.53	Mon Dec  2 12:53:24 2002
+++ loncom/interface/lonindexer.pm	Thu Jan  9 17:04:28 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.53 2002/12/02 17:53:24 albertel Exp $
+# $Id: lonindexer.pm,v 1.54 2003/01/09 22:04:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -918,6 +918,10 @@
 }
 
 1;
+
+sub cleanup {
+    untie(%hash) if (tied(%hash));
+}
 
 =head1 NAME