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

[albertel]

albertel		Fri Jun 13 20:15:01 2003 EDT

  Modified files:              
    /loncom/interface	groupsort.pm lonindexer.pm lonsearchcat.pm 
  Log:
  - should be using the _users_ domain not the servers domain, (lonsequence.pm was already doing this, only by luck was this not blowing up.)
  
  
  
Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.20 loncom/interface/groupsort.pm:1.21
--- loncom/interface/groupsort.pm:1.20	Fri Jun 13 19:33:38 2003
+++ loncom/interface/groupsort.pm	Fri Jun 13 20:15:01 2003
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.20 2003/06/13 23:33:38 albertel Exp $
+# $Id: groupsort.pm,v 1.21 2003/06/14 00:15:01 albertel Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -151,15 +151,15 @@
 # ------------------------------ 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
@@ -167,19 +167,19 @@
         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];
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.65 loncom/interface/lonindexer.pm:1.66
--- loncom/interface/lonindexer.pm:1.65	Fri Jun 13 19:42:45 2003
+++ loncom/interface/lonindexer.pm	Fri Jun 13 20:15:01 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.65 2003/06/13 23:42:45 albertel Exp $
+# $Id: lonindexer.pm,v 1.66 2003/06/14 00:15:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -124,7 +124,7 @@
 
     $extrafield='';
     my $diropendb = 
-	"/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_$ENV{'user.domain'}_indexer.db";
+	"/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db";
 
     if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	if ($ENV{'form.launch'} eq '1') {
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.176 loncom/interface/lonsearchcat.pm:1.177
--- loncom/interface/lonsearchcat.pm:1.176	Thu Jun  5 22:24:49 2003
+++ loncom/interface/lonsearchcat.pm	Fri Jun 13 20:15:01 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.176 2003/06/06 02:24:49 www Exp $
+# $Id: lonsearchcat.pm,v 1.177 2003/06/14 00:15:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -214,8 +214,7 @@
     ## Initialize global variables
     ##
     my $domain  = $r->dir_config('lonDefDomain');
-    $diropendb= "/home/httpd/perl/tmp/".&Apache::lonnet::escape($domain).
-            "\_".&Apache::lonnet::escape($ENV{'user.name'})."_searchcat.db";
+    $diropendb= "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";
     #
     # set the name of the persistent database
     #          $ENV{'form.persistent_db_id'} can only have digits in it.