projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. Upped the version no !!!!
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 8bd96984b3278837974d71d6600c91859cf0cd2f..01b64372b8d4d1cf55847b76d229fea3b65e984c 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-22,6
+22,8
@@
use DXLog;
use Spot;
use DXProtout;
use DXDebug;
use Spot;
use DXProtout;
use DXDebug;
+use Local;
+
use Carp;
use strict;
use Carp;
use strict;
@@
-118,8
+120,11
@@
sub start
sub normal
{
my ($self, $line) = @_;
sub normal
{
my ($self, $line) = @_;
- my @field = split /[\^\~]/, $line;
+ my @field = split /\^/, $line;
+ pop @field if $field[-1] eq '~';
+# print join(',', @field), "\n";
+
# ignore any lines that don't start with PC
return if !$field[0] =~ /^PC/;
# ignore any lines that don't start with PC
return if !$field[0] =~ /^PC/;
@@
-128,6
+133,14
@@
sub normal
return unless $pcno;
return if $pcno < 10 || $pcno > 51;
return unless $pcno;
return if $pcno < 10 || $pcno > 51;
+ # local processing 1
+ my $pcr;
+ eval {
+ $pcr = Local::pcprot($self, $pcno, @field);
+ };
+ dbg('local', "Local::pcprot error $@") if $@;
+ return if $pcr;
+
SWITCH: {
if ($pcno == 10) { # incoming talk
SWITCH: {
if ($pcno == 10) { # incoming talk
@@
-179,6
+192,14
@@
sub normal
my $spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
my $spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
+ # local processing
+ my $r;
+ eval {
+ $r = Local::spot1($self, $freq, $field[2], $d, $text, $spotter, $field[7]);
+ };
+ dbg('local', "Local::spot1 error $@") if $@;
+ return if $r;
+
# send orf to the users
if ($spot && $pcno == 11) {
my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter);
# send orf to the users
if ($spot && $pcno == 11) {
my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter);
@@
-368,6
+389,13
@@
sub normal
$wwvdup{$dupkey} = $d;
Geomag::update($field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
$wwvdup{$dupkey} = $d;
Geomag::update($field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+ my $r;
+ eval {
+ $r = Local::wwv2($self, $field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+ };
+ dbg('local', "Local::wwv2 error $@") if $@;
+ return if $r;
+
# DON'T be silly and send on PC27s!
return if $pcno == 27;
# DON'T be silly and send on PC27s!
return if $pcno == 27;