add connect time/uptime for links cmd

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 4477a94bef90a3ef8e5abdc5ad5814fc53eb3bbb..91c636910bc5a0fcba3986a7bf84498829172d18 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
+                        diffms _diffms difft parraydifft
             );
 
 
@@ -182,7 +182,7 @@ sub ptimelist
        my $ref = shift;
        my $out;
        for (sort keys %$ref) {
-               $out .= "$_=$ref->{$_}, ";
+               $out .= "$_=" . atime($ref->{$_}) . ", ";
        }
        chop $out;
        chop $out;
@@ -477,9 +477,11 @@ sub localdata
        
        if (-e "$main::local_data") {
                $tfn = "$main::data/$ifn";
-               if (-e $tfn && -e $ofn) {
+               if ((-e $tfn) && (-e $ofn)) {
                        $ofn = $tfn if -M $ofn < -M $tfn;
-               } 
+               } else {
+                       $ofn = $tfn if -e $tfn;
+               }
        }
 
        return $ofn;
@@ -520,3 +522,53 @@ sub diffms
        $s .= " $no lines" if $no;
        DXDebug::dbg($s);
 }
+
+# expects either an array reference or two times (in the correct order [start, end])
+sub difft
+{
+       my $b = shift;
+       my $adds = shift;
+       
+       my $t;
+       if (ref $b eq 'ARRAY') {
+               $t = $b->[1] - $b->[0];
+       } else {
+               if ($adds >= $b) {
+                       $t = $adds - $b;
+                       $adds = shift;
+               } else {
+                       $t = $main::systime - $b;
+               }
+       }
+       return '-(ve)' if $t < 0;
+       my ($d,$h,$m,$s);
+       my $out = '';
+       $d = int $t / 86400;
+       $out .= sprintf ("%s${d}d", $adds?' ':'') if $d;
+       $t -= $d * 86400;
+       $h = int $t / 3600;
+       $out .= sprintf ("%s${h}h", $adds?' ':'') if $h;
+#      $out .= "${h}h" if $h || $d;
+       $t -= $h * 3600;
+       $m = int $t / 60;
+       $out .= sprintf ("%s${m}m", $adds?' ':'') if $m;
+#      $out .= "${m}m" if $m || $h || $d;
+       $s = int $t % 60;
+       $out .= sprintf ("%s${s}s", $adds?' ':'') if $s;
+       #       $out .= "${s}s";
+       $out ||= sprintf ("%s0s", $adds?' ':'');
+       return $out;
+}
+
+# print an array ref of difft refs
+sub parraydifft
+{
+       my $r = shift;
+       my $out = '';
+       for (@$r) {
+               my $s = $_->[2] ? "($_->[2])" : '';
+               $out .= sprintf "%s=%s$s, ", atime($_->[0]), difft($_->[0], $_->[1]);
+       }
+       $out =~ s/,\s*$//;
+       return $out;
+}