projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix sh/muf
[spider.git]
/
perl
/
Thingy
/
Dx.pm
diff --git
a/perl/Thingy/Dx.pm
b/perl/Thingy/Dx.pm
index 3621d2545c926d1aa53679ecbf104243d472cb35..feab1b94c83f93295d82b03beed5a9faf61ad445 100644
(file)
--- a/
perl/Thingy/Dx.pm
+++ b/
perl/Thingy/Dx.pm
@@
-46,14
+46,16
@@
sub from_Aranea
return unless $thing;
my $t = hex($thing->{t}) if exists $thing->{t};
$t ||= int($thing->{time} / 60); # if it is an aranea generated
return unless $thing;
my $t = hex($thing->{t}) if exists $thing->{t};
$t ||= int($thing->{time} / 60); # if it is an aranea generated
+ my $by = $thing->{b} || $thing->{fromuser} || $thing->{user} || $thing->{origin};
my @spot = Spot::prepare(
$thing->{f},
$thing->{c},
$t*60,
($thing->{i} || ''),
my @spot = Spot::prepare(
$thing->{f},
$thing->{c},
$t*60,
($thing->{i} || ''),
-
($thing->{b} || $thing->{fromuser} || $thing->{user} || $thing->{origin})
,
+
$by
,
($thing->{o} || $thing->{origin}),
);
($thing->{o} || $thing->{origin}),
);
+ $spot[4] = $by; # don't modify the spotter SSID
$thing->{spotdata} = \@spot;
return $thing;
}
$thing->{spotdata} = \@spot;
return $thing;
}
@@
-64,6
+66,7
@@
sub gen_DXProt
unless ($thing->{DXProt}) {
my $sd = $thing->{spotdata};
my $hops = $thing->{hops} || DXProt::get_hops(11);
unless ($thing->{DXProt}) {
my $sd = $thing->{spotdata};
my $hops = $thing->{hops} || DXProt::get_hops(11);
+ $hops = "H$hops" unless $hops =~ /^H/;
my $text = $sd->[3] || ' ';
$text =~ s/\^/\%5E/g;
my $t = $sd->[2];
my $text = $sd->[3] || ' ';
$text =~ s/\^/\%5E/g;
my $t = $sd->[2];
@@
-108,7
+111,7
@@
sub handle
my $dxchan = shift;
my $spot = $thing->{spotdata};
my $dxchan = shift;
my $spot = $thing->{spotdata};
- if (Spot::dup(@$spot[0..4])) {
+ if (Spot::dup(@$spot[0..4
,5
])) {
dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
return;
}
dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
return;
}