only add the time to an Aranea DX if it going to be different to the

[spider.git] / perl / Thingy / Dx.pm

diff --git a/perl/Thingy/Dx.pm b/perl/Thingy/Dx.pm
index dd526ea53c9eb47519b9aeac219fc1a724bbb6ff..527d93539684cc59c9b14e38ab4fce93da2b7a8e 100644 (file)
--- a/perl/Thingy/Dx.pm
+++ b/perl/Thingy/Dx.pm
@@ -31,10 +31,9 @@ sub gen_Aranea
                $thing->{f} = $sd->[0];
                $thing->{c} = $sd->[1];
                $thing->{b} = $sd->[4] unless $thing->{user};
-               unless ($sd->[7] eq $main::mycall) {
-                       $thing->{t} = sprintf("%X", $sd->[2] / 60);
-                       $thing->{o} =  $sd->[7]; 
-               }
+               my $t = $sd->[2] / 60;
+               $thing->{t} = sprintf("%X", $t) unless $t eq $main::systime / 60;
+               $thing->{o} =  $sd->[7] unless $sd->[7] eq $main::mycall; 
                $thing->{i} = $sd->[3] if $sd->[3];
                $thing->{Aranea} = Aranea::genmsg($thing, [qw(f c b t o i)]);
        }
@@ -66,9 +65,9 @@ sub gen_DXProt
                my $sd = $thing->{spotdata};
                my $hops = $thing->{hops} || DXProt::get_hops(11);
                my $text = $sd->[3] || ' ';
-               $text =~ s/\^/%5E/g;
+               $text =~ s/\^/\%5E/g;
                my $t = $sd->[2];
-               $thing->{DXProt} = sprintf "PC11^%.1f^$sd->[1]^%s^%s^$text^$sd->[4]^$sd->[7]^$hops^~", $sd->[0], cldate($t), ztime($t);
+               $thing->{DXProt} = sprintf "PC11^%.1f^$sd->[1]^%s^%s^%s^$sd->[4]^$sd->[7]^$hops^~", $sd->[0], cldate($t), ztime($t), $text;
        }
        return $thing->{DXProt};
 }