get all the debugging finally into the debug files when things go wrong

[spider.git] / perl / DXProtout.pm

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 7afb0e92af1241c134908c04348bbfb857a581d7..da2d5fffb2e28b63b138e0ad1f8e4a3d2b5cbeb7 100644 (file)
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -15,7 +15,7 @@ package DXProt;
 
 use DXUtil;
 use DXM;
-use Carp;
+use DXDebug;
 
 use strict;
 
@@ -94,7 +94,7 @@ sub pc17
 sub pc18
 {
        my $info = DXCluster::cluster;
-       return "PC18^$info^$DXProt::myprot_version^~";
+       return "PC18^$info^$DXProt::myprot_version^";
 }
 
 #
@@ -186,7 +186,7 @@ sub pc29
 {
        my ($fromnode, $tonode, $stream, $text) = @_;
        $text =~ s/\^/:/og;                     # remove ^
-       $text =~ s/\~/S/og;
+#      $text =~ s/\~/S/og;
        return "PC29^$fromnode^$tonode^$stream^$text^~";
 }
 
@@ -235,13 +235,7 @@ sub pc35
 # send all the DX clusters I reckon are connected
 sub pc38
 {
-       my @list = DXNode->get_all();
-       my $list;
-       my @nodes;
-  
-       foreach $list (@list) {
-               push @nodes, $list->call;
-       }
+       my @nodes = map { ($_->dxchan && $_->dxchan->isolate) ? () : $_->call } DXNode->get_all();
        return "PC38^" . join(',', @nodes) . "^~";
 }
 
@@ -278,6 +272,28 @@ sub pc42
        return "PC42^$fromnode^$tonode^$stream^";
 }
 
+# remote db request
+sub pc44
+{
+       my ($fromnode, $tonode, $stream, $db, $req, $call) = @_;
+       $db = uc $db;
+       return "PC44^$tonode^$fromnode^$stream^$db^$req^$call^";
+}
+
+# remote db data
+sub pc45
+{
+       my ($fromnode, $tonode, $stream, $data) = @_;
+       return "PC45^$tonode^$fromnode^$stream^$data^";
+}
+
+# remote db data complete
+sub pc46
+{
+       my ($fromnode, $tonode, $stream) = @_;
+       return "PC46^$tonode^$fromnode^$stream^";
+}
+
 # bull delete
 sub pc49
 {
@@ -289,8 +305,8 @@ sub pc49
 # periodic update of users, plus keep link alive device (always H99)
 sub pc50
 {
-       my $me = DXCluster->get_exact($main::mycall);
-       my $n = $me->users ? $me->users : '0';
+       my $n = shift;
+       $n = 0 unless $n >= 0;
        return "PC50^$main::mycall^$n^H99^";
 }