projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add #9000 as a default group and tidy up send_chats calls
[spider.git]
/
perl
/
VE7CC.pm
diff --git
a/perl/VE7CC.pm
b/perl/VE7CC.pm
index e6634b6209c7d80ef8c76f5e879e75f9b0734e30..c0138cd73bb31eac30d811594160a7d2737d1aff 100644
(file)
--- a/
perl/VE7CC.pm
+++ b/
perl/VE7CC.pm
@@
-15,21
+15,23
@@
use DXDebug;
use DXUtil;
use Julian;
use Prefix;
use DXUtil;
use Julian;
use Prefix;
+use DXUser;
use strict;
use strict;
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
sub dx_spot
{
my $self = shift; # this may be useful some day
my $freq = shift;
my $spotted = shift;
my $t = shift;
sub dx_spot
{
my $self = shift; # this may be useful some day
my $freq = shift;
my $spotted = shift;
my $t = shift;
+ my $loc_spotted = '';
+ my $loc_spotter = '';
+ my $ref = DXUser->get_current($spotted);
+ if ($ref) {
+ my $loc = $ref->qra || '';
+ $loc_spotted =substr($loc, 0, 4) if $loc;
+ }
# remove any items above the top of the max spot data
pop while @_ > 11;
# remove any items above the top of the max spot data
pop while @_ > 11;
@@
-38,10
+40,15
@@
sub dx_spot
$_[9] ||= '';
$_[10] ||= '';
$_[9] ||= '';
$_[10] ||= '';
- my $spotter_cc = (Prefix::cty_data($spotted))[5];
- my $spotted_cc = (Prefix::cty_data($_[1]))[5];
+ my $spotted_cc = (Prefix::cty_data($spotted))[5];
+ my $spotter_cc = (Prefix::cty_data($_[1]))[5];
+ $ref = DXUser->get_current($_[1]);
+ if ($ref) {
+ my $loc = $ref->qra || '';
+ $loc_spotter = substr($loc, 0, 4) if $loc;
+ }
- return sprintf("CC11^%0.1f^%s^", $freq, $spotted) . join('^', cldate($t), ztime($t), @_, $spotte
r_cc, $spotted_cc
);
+ return sprintf("CC11^%0.1f^%s^", $freq, $spotted) . join('^', cldate($t), ztime($t), @_, $spotte
d_cc, $spotter_cc, $loc_spotted, $loc_spotter
);
}
1;
}
1;