X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=3d3a46bc1c01a46bb1ae3561dafd3d2cc242c888;hb=1c5b4284c88ad06c4674198ddf5eb6590ba6cd17;hp=a1dca22391ace8c49b762d942b645bafbb1fe8f1;hpb=9a55af9586711ecdea8dc9b0da38509119fa8090;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index a1dca223..3d3a46bc 100644
--- 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^";
 }
 
 #
@@ -153,6 +153,23 @@ sub pc24
 	return "PC24^$call^$flag^$hops^";
 }
 
+
+# create a merged dx message (freq, dxcall, t, text, spotter, orig-node) 
+sub pc26
+{
+	my ($freq, $dxcall, $t, $text, $spotter, $orignode) = @_;
+	$text = ' ' unless $text;
+	$orignode = $main::mycall unless $orignode;
+	return sprintf "PC26^%.1f^$dxcall^%s^%s^$text^$spotter^$orignode^ ^~", $freq, cldate($t), ztime($t);
+}
+
+# create a merged WWV spot (logger, t, sfi, a, k, forecast, orig-node)
+sub pc27
+{
+	my ($logger, $t, $sfi, $a, $k, $forecast, $orignode) = @_;
+	return sprintf "PC27^%s^%-2.2s^$sfi^$a^$k^$forecast^$logger^$orignode^ ^~", cldate($t), ztime($t);
+}
+
 # message start (fromnode, tonode, to, from, t, private, subject, origin)
 sub pc28
 {
@@ -168,7 +185,8 @@ sub pc28
 sub pc29 
 {
 	my ($fromnode, $tonode, $stream, $text) = @_;
-	$text =~ s/\^//og;			# remove ^
+	$text =~ s/\^/:/og;			# remove ^
+#	$text =~ s/\~/S/og;
 	return "PC29^$fromnode^$tonode^$stream^$text^~";
 }
 
@@ -217,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) . "^~";
 }
 
@@ -260,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
 {
@@ -271,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^";
 }
 
@@ -282,5 +316,22 @@ sub pc51
 	my ($to, $from, $val) = @_;
 	return "PC51^$to^$from^$val^";
 }
+
+# clx remote cmd send
+sub pc84
+{
+	my($fromnode, $tonode, $call, $msg) = @_;
+	return "PC84^$tonode^$fromnode^$call^$msg^~";
+}
+
+# clx remote cmd reply
+sub pc85
+{
+	my($fromnode, $tonode, $call, $msg) = @_;
+	return "PC85^$tonode^$fromnode^$call^$msg^~";
+}
 1;
 __END__
+
+
+