X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=deb17c752dc172adebbdd80c60e81af3d4e31d88;hb=f45892a3eac7dcc74e47c1ffb919f9b4915f92cd;hp=2c8b5f65128fa53c4c17599d5f0aa29488fff14e;hpb=cbda6153fad2adddb58ee5a87f3981aa2ad754ad;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 2c8b5f65..deb17c75 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -107,35 +107,30 @@ use Data::Dumper;
 use IO::File;
 use Fcntl ':flock'; 
 use POSIX ":sys_wait_h";
+use Version;
 
 use Local;
 
 package main;
 
 use strict;
-use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects 
+use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects 
 			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
 			$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
 			$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
+			$can_encode
 		   );
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.53";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
-#@outstanding_connects = ();     # list of outstanding connects
+@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
 $reqreg = 0;					# 1 = registration required, 2 = deregister people
 $bumpexisting = 1;				# 1 = allow new connection to disconnect old, 0 - don't allow it
 $allowdxby = 0;					# 1 = allow "dx by <othercall>", 0 - don't allow it
 
 
-use vars qw($VERSION $BRANCH $build $branch);
-($VERSION, $BRANCH) = dxver( q$Revision$);
-$main::build -= 2;				# fudge (put back for now)
-
-
-      
 # send a message to call on conn and disconnect
 sub already_conn
 {
@@ -344,16 +339,25 @@ foreach (@debug) {
 }
 STDOUT->autoflush(1);
 
-# calculate build number
-$build += $main::version;
-$build = "$build.$branch" if $branch;
-
 # try to load the database
 if (DXSql::init($dsn)) {
 	$dbh = DXSql->new($dsn);
 	$dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
 }
 
+# try to load Encode
+{
+	local $^W = 0;
+	my $w = $SIG{__DIE__};
+	$SIG{__DIE__} = 'IGNORE';
+	eval { require Encode; };
+	unless ($@) {
+		import Encode;
+		$can_encode = 1;
+	}
+	$SIG{__DIE__} = $w;
+}
+
 # try to load XML::Simple
 DXXml::init();