merge in various changes onto dirk2

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index ce26c291c7919a1b0874c709b09f1f53ddc918f2..ff45336f30b6732d765004e1de513c3f6b8ff76f 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -83,6 +83,8 @@ sub AUTOLOAD
        return $self->{$name};
 }
 
+use strict;
+
 #
 # initialise the system
 #
@@ -110,8 +112,6 @@ sub del_file
        unlink $fn;
 }
 
-use strict;
-
 #
 # periodic processing
 #
@@ -319,20 +319,20 @@ sub export
 # Input file: $filename
 #       Time: $t
 #
-
+                       
 package main;
-
+                       
 # search local then perl directories
 BEGIN {
        umask 002;
-       
+                               
        # root of directory tree for this system
        $root = "/spider"; 
        $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
        
        unshift @INC, "$root/perl";     # this IS the right way round!
        unshift @INC, "$root/local";
-
+       
        # try to detect a lockfile (this isn't atomic but 
        # should do for now
        $lockfn = "$root/perl/cluster.lock";       # lock file name
@@ -351,25 +351,25 @@ use DXVars;
 use DXUser;
 
 if (@ARGV) {
-        $main::userfn = shift @ARGV;
-        print "user filename now $userfn\n";
+       $main::userfn = shift @ARGV;
+       print "user filename now $userfn\n";
 }
 
 DXUser->del_file($main::userfn);
 DXUser->init($main::userfn, 1);
 
 %u = (
-   };
-         
-for ($action = R_FIRST; !$dbm->seq($key, $ref, $action); $action = R_NEXT) {
-       print $fh "'$key' => q{$ref},\n";
-       ++$count;
-} 
-print $fh ");\n#\nprint \"there were $count records\\n\";\n#\n";
-print $fh "DXUser->sync; DXUser->finish;\n#\n";
-$fh->close;
-} 
-               return $count;
+  };
+
+        for ($action = R_FIRST; !$dbm->seq($key, $ref, $action); $action = R_NEXT) {
+                       print $fh "'$key' => q{$ref},\n";
+                       ++$count;
+               } 
+        print $fh ");\n#\nprint \"there were $count records\\n\";\n#\n";
+        print $fh "DXUser->sync; DXUser->finish;\n#\n";
+        $fh->close;
+    } 
+       return $count;
 }
 
 #