fix DL coords
[spider.git] / perl / Thingy / Dx.pm
index c94760c25378809e7959fabcca595e76fab408b8..ee06c978c3799f9cb8013e36d8e872a5b4c4ffd4 100644 (file)
@@ -45,15 +45,17 @@ sub from_Aranea
        my $thing = shift;
        return unless $thing;
        my $t = hex($thing->{t}) if exists $thing->{t};
-       $t ||= $thing->{time} / 60;     # if it is an aranea generated
+       $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} || ''),
-                                                        ($thing->{b} || $thing->{fromuser} || $thing->{user} || $thing->{origin}),
+                                                        $by,
                                                         ($thing->{o} || $thing->{origin}),
                                                        );
+       $spot[4] = $by;                         # don't modify the spotter SSID
        $thing->{spotdata} = \@spot;
        return $thing;
 }
@@ -108,7 +110,7 @@ sub handle
        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;
        }