From: minima Date: Wed, 23 Feb 2005 17:27:28 +0000 (+0000) Subject: fix date / time stamp decoding X-Git-Tag: R_1_52~150 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=319cdc6c2167b84d93ee1d9c6d219405f4272b82;p=spider.git fix date / time stamp decoding --- diff --git a/perl/Aranea.pm b/perl/Aranea.pm index 3a2190e7..5663b80a 100644 --- a/perl/Aranea.pm +++ b/perl/Aranea.pm @@ -286,7 +286,7 @@ sub genheader sub decode_dts { my $dts = shift; - my ($dt, $seqno) = map {hex} unpack "H6H4", $dts; + my ($dt, $seqno) = map {hex} unpack "A6 A4", $dts; my $secs = $dt & 0x3FFFF; $dt >>= 18; my $day = $dt >> 1; @@ -374,6 +374,7 @@ sub input my $class = 'Thingy::' . ucfirst(lc $cmd); my $thing; my ($t, $seqno, $ntp) = decode_dts($dts) unless $err; + dbg("dts: $dts = $ntp $t($main::systime) $seqno") if isdbg('dts'); $err .= "invalid date/seq," unless $t; if ($err) { diff --git a/perl/Thingy/Dx.pm b/perl/Thingy/Dx.pm index c94760c2..1311e8f1 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 = int($sd->[2] / 60); + my $t = $sd->[2]; $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]; @@ -45,7 +45,7 @@ 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 @spot = Spot::prepare( $thing->{f}, $thing->{c},