X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FThingy%2FDx.pm;h=1311e8f15fa6e99fd776d276703781f5f1a5818f;hb=319cdc6c2167b84d93ee1d9c6d219405f4272b82;hp=35ff5214985bfecf0b7d69bf2de787fe4a573cb2;hpb=fa89a50f5bba3c7d0710fa62a342d87dafc8cc21;p=spider.git

diff --git a/perl/Thingy/Dx.pm b/perl/Thingy/Dx.pm
index 35ff5214..1311e8f1 100644
--- 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];
+		$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];
 	 	$thing->{Aranea} = Aranea::genmsg($thing, [qw(f c b t o i)]);
 	}
@@ -46,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},
@@ -68,7 +67,7 @@ sub gen_DXProt
 		my $text = $sd->[3] || ' ';
 		$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};
 }