X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=b01c234b80bfeea0bf1f60b25cf1679f546b8af0;hb=d0b21f21559a63d84086b549bb7570e2e16b75cd;hp=6d115a7b6273540810e42bdb8ea6c1728951c153;hpb=e148ea6b5e9eb73af10a9ca4132bc257e4b9aac8;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 6d115a7b..b01c234b 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -15,6 +15,7 @@ use File::Copy;
 use Data::Dumper;
 use Time::HiRes qw(gettimeofday tv_interval);
 use Text::Wrap;
+use Socket qw(AF_INET6 AF_INET inet_pton);
 
 use strict;
 
@@ -29,6 +30,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 is_numeric
             );
 
 
@@ -221,7 +223,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;
@@ -379,8 +381,8 @@ sub filecopy
 sub unpad
 {
 	my $s = shift;
-	$s =~ s/\s+$//;
-	$s =~ s/^\s+//;
+	$s =~ s/^\s*//;
+	$s =~ s/\s*$//;
 	return $s;
 }
 
@@ -447,7 +449,18 @@ sub is_latlong
 # is it an ip address?
 sub is_ipaddr
 {
-    return $_[0] =~ /^\d+\.\d+\.\d+\.\d+$/ || $_[0] =~ /^[0-9a-f:,]+$/;
+
+	if ($_[0] =~ /:/) {
+		if (inet_pton(AF_INET6, $_[0])) {
+			return ($_[0] =~ /([:0-9a-f]+)/);
+		}
+#		use re 'debug';
+#		return ($1) if $_[0] =~ /^(\:?(?:\:?[0-9a-f]{1,4}){1,8}?)$/i;
+#		no re 'debug';
+	} else {
+		return ($_[0] =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/);
+	}
+	return undef;
 }
 
 # is it a zulu time hhmmZ
@@ -564,8 +577,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;
@@ -574,7 +590,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?' ':'');
@@ -598,6 +614,20 @@ sub parraydifft
 
 sub basecall
 {
-	my ($r) = $_[0] =~ m|^(?:[\w\d]+/)?([\w\d]+).*$|;
+	my ($r) = $_[0] =~ m{^((?:[\w\d]+/)?[\w\d]+(?:/[\w\d]+)*)(?:-\d+)?(?:-\#)?$};
 	return $r;
 }
+
+sub normalise_call
+{
+	my ($c, $ssid) = $_[0] =~ m|^((?:[\w\d]+/)?[\d\w]+(?:/[\w\d]+)*)(?:-(\d+))?(?:-\#)?$|;
+	my $ncall = $c;
+	$ssid += 0;
+	$ncall .= "-$ssid" if $ssid;
+	return $ncall;
+}
+
+sub is_numeric
+{
+	return $_[0] =~ /^[\.\d]+$/;
+}