X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=b89d88ea9a89def800ffdfcba3ba39d1cc4e26aa;hb=56b93915d65c299a5f2d2e555ee361c056773843;hp=b8ff16d1b3ba50605316a2f645f85e9929e6d5a2;hpb=78fcd88c563bc8f05c9f590cdfc0739129c7efda;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index b8ff16d1..b89d88ea 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -29,7 +29,7 @@ require Exporter;
 			 is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem
 			 is_prefix dd is_ipaddr $pi $d2r $r2d localdata localdata_mv
 			 diffms _diffms _diffus difft parraydifft is_ztime basecall
-			 normalise_call
+			 normalise_call is_numeric
             );
 
 
@@ -222,7 +222,7 @@ sub phash
 	my $ref = shift;
 	my $out;
 
-	while (my $k = sort keys %$ref) {
+	foreach my $k (sort keys %$ref) {
 		$out .= "${k}=>$ref->{$k}, ";
 	}
 	$out =~ s/, $// if $out;
@@ -380,8 +380,8 @@ sub filecopy
 sub unpad
 {
 	my $s = shift;
-	$s =~ s/\s+$//;
-	$s =~ s/^\s+//;
+	$s =~ s/^\s*//;
+	$s =~ s/\s*$//;
 	return $s;
 }
 
@@ -448,7 +448,7 @@ sub is_latlong
 # is it an ip address?
 sub is_ipaddr
 {
-    return $_[0] =~ /^\d+\.\d+\.\d+\.\d+$/ || $_[0] =~ /^[0-9a-f:,]+$/;
+    return $_[0] =~ /^(?:(?:\:\:)?\d+\.\d+\.\d+\.\d+)|(?:[0-9a-f]{1,4}\:)?(?:\:[0-9a-f]{1,4}(?:\:\:)?){1,6}$/i;
 }
 
 # is it a zulu time hhmmZ
@@ -565,8 +565,11 @@ sub difft
 		}
 	}
 	return '-(ve)' if $t < 0;
-	my ($d,$h,$m,$s);
+	my ($y,$d,$h,$m,$s);
 	my $out = '';
+	$y = int $t / (86400*365);
+	$out .= sprintf ("%s${y}y", $adds?' ':'') if $y;
+	$t -= $y * 86400 * 365;
 	$d = int $t / 86400;
 	$out .= sprintf ("%s${d}d", $adds?' ':'') if $d;
 	$t -= $d * 86400;
@@ -575,7 +578,7 @@ sub difft
 	$t -= $h * 3600;
 	$m = int $t / 60;
 	$out .= sprintf ("%s${m}m", $adds?' ':'') if $m;
-	if ($d == 0 && $adds || $adds == 2) {
+	if (($d == 0 && $adds) || (int $adds && $adds == 2)) {
 		$s = int $t % 60;
 		$out .= sprintf ("%s${s}s", $adds?' ':'') if $s;
 		$out ||= sprintf ("%s0s", $adds?' ':'');
@@ -611,3 +614,8 @@ sub normalise_call
 	$ncall .= "-$ssid" if $ssid;
 	return $ncall;
 }
+
+sub is_numeric
+{
+	return $_[0] =~ /^[\.\d]+$/;
+}