X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FDx.pm;h=aa7322ed12c1a6a4e9e2bc03b6bd2176372f833b;hb=decf4e82a66a51f03216dd7531422868cd03611b;hp=1311e8f15fa6e99fd776d276703781f5f1a5818f;hpb=319cdc6c2167b84d93ee1d9c6d219405f4272b82;p=spider.git diff --git a/perl/Thingy/Dx.pm b/perl/Thingy/Dx.pm index 1311e8f1..aa7322ed 100644 --- a/perl/Thingy/Dx.pm +++ b/perl/Thingy/Dx.pm @@ -31,7 +31,7 @@ sub gen_Aranea $thing->{f} = $sd->[0]; $thing->{c} = $sd->[1]; $thing->{b} = $sd->[4] unless $thing->{user}; - my $t = $sd->[2]; + my $t = int($sd->[2] / 60); $thing->{t} = sprintf("%X", $t) unless $t eq int($main::systime / 60); $thing->{o} = $sd->[7] unless $sd->[7] eq $main::mycall; $thing->{i} = $sd->[3] if $sd->[3]; @@ -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 + 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; }