simply the RBN skimmer scoring system

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 20837f2f6494f1f5d7645e3d96c41c4a5d46eb8d..b04cf4905d87435c37e50568c99d48014450264c 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -27,7 +27,7 @@ require Exporter;
              print_all_fields cltounix unpad is_callsign is_latlong
                         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 difft parraydifft is_ztime
+                        diffms _diffms _diffus difft parraydifft is_ztime
             );
 
 
@@ -384,8 +384,8 @@ sub is_callsign
 {
        return $_[0] =~ m!^
                                          (?:\d?[A-Z]{1,2}\d{0,2}/)?    # out of area prefix /  
-                                         (?:\d?[A-Z]{1,2}\d{1,2})      # main prefix one (required) 
-                                         [A-Z]{1,5}                # callsign letters (required)
+                                         (?:\d?[A-Z]{1,2}\d{1,5})      # main prefix one (required) - lengthened for special calls 
+                                         [A-Z]{1,8}                # callsign letters (required)
                                          (?:-(?:\d{1,2}))?         # - nn possibly (eg G8BPQ-8)
                                          (?:/[0-9A-Z]{1,7})?       # / another prefix, callsign or special label (including /MM, /P as well as /EURO or /LGT) possibly
                                          $!x;
@@ -514,6 +514,16 @@ sub _diffms
        return $b - $a;
 }
 
+# and in microseconds
+sub _diffus
+{
+       my $ta = shift;
+       my $tb = shift || [gettimeofday];
+       my $a = int($ta->[0] * 1000000) + int($ta->[1]); 
+       my $b = int($tb->[0] * 1000000) + int($tb->[1]);
+       return $b - $a;
+}
+
 sub diffms
 {
        my $call = shift;
@@ -539,7 +549,7 @@ sub difft
        if (ref $b eq 'ARRAY') {
                $t = $b->[1] - $b->[0];
        } else {
-               if ($adds >= $b) {
+               if ($adds && $adds >= $b) {
                        $t = $adds - $b;
                        $adds = shift;
                } else {
@@ -562,6 +572,7 @@ sub difft
                $out .= sprintf ("%s${s}s", $adds?' ':'') if $s;
                $out ||= sprintf ("%s0s", $adds?' ':'');
        }
+       $out = '0s' unless length $out;
        return $out;
 }