X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=99322ff3f2c452ab49e9d31578cfec845a572672;hb=4f444f8dd0c7a7bf53a8d40e4e0fbadf57d32ffb;hp=1ecbc094a704487fd96c3998a560eb493d02f976;hpb=4e5b3de7a26563d94678fb790b8a1e2c4daaac8d;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1ecbc094..99322ff3 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -61,6 +61,8 @@ use Filter;
 use DXDb;
 use AnnTalk;
 use WCY;
+use DXDupe;
+use BadWords;
 
 use Data::Dumper;
 use Fcntl ':flock'; 
@@ -71,7 +73,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.44";				# the version no of the software
+$version = "1.45";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
 @outstanding_connects = ();     # list of outstanding connects
@@ -219,6 +221,7 @@ sub cease
 	Msg->event_loop(1, 0.05);
 	Msg->event_loop(1, 0.05);
 	DXUser::finish();
+	DXDupe::finish();
 
 	# close all databases
 	DXDb::closeall;
@@ -253,11 +256,6 @@ sub process_inqueue
 	my ($sort, $call, $line) = DXChannel::decode_input($dxchan, $data);
 	return unless defined $sort;
 	
-	# translate any crappy characters into hex characters 
-	if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
-		$line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-	}
-
 	# do the really sexy console interface bit! (Who is going to do the TK interface then?)
 	dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
 
@@ -326,6 +324,9 @@ DXUser->init($userfn, 1);
 dbg('err', "starting listener ...");
 Msg->new_server("$clusteraddr", $clusterport, \&login);
 
+# load bad words
+dbg('err', "load badwords: " . (BadWords::load or "Ok"));
+
 # prime some signals
 $SIG{INT} = \&cease;
 $SIG{TERM} = \&cease;
@@ -345,6 +346,9 @@ for (keys %SIG) {
 	}
 }
 
+# start dupe system
+DXDupe::init();
+
 # read in system messages
 DXM->init();
 
@@ -415,6 +419,8 @@ for (;;) {
 		DXMsg::process();
 		DXDb::process();
 		DXUser::process();
+		DXDupe::process();
+		
 		eval { 
 			Local::process();       # do any localised processing
 		};