add first part of json users file change

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index b669b3b3f8c78715b891e146f12e172d266f803e..9c44fa057528e1ce0b57bc5e92670fb947b286a3 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
             );
 
 
@@ -141,6 +141,7 @@ sub dd
 {
        my $value = shift;
        my $dd = new Data::Dumper([$value]);
+       $dd->Sortkeys(1);
        $dd->Indent(0);
        $dd->Terse(1);
     $dd->Quotekeys($] < 5.005 ? 1 : 0);
@@ -182,7 +183,7 @@ sub ptimelist
        my $ref = shift;
        my $out;
        for (sort keys %$ref) {
-               $out .= "$_=$ref->{$_}, ";
+               $out .= "$_=" . atime($ref->{$_}) . ", ";
        }
        chop $out;
        chop $out;
@@ -477,10 +478,10 @@ 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;
-               } elsif (-e tfn) {
-                       $ofn = $tfn;
+               } else {
+                       $ofn = $tfn if -e $tfn;
                }
        }
 
@@ -522,3 +523,42 @@ 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 $t;
+       if (ref $b eq 'ARRAY') {
+               $t = $b->[1] - $b->[0];
+       } else {
+               $t = shift() - $b;
+       }
+       return '-(ve)' if $t < 0;
+       my ($d,$h,$m,$s);
+       my $out = '';
+       $d = int $t / 86400;
+       $out .= "${d}d" if $d;
+       $t -= $d * 86400;
+       $h = int $t / 3600;
+       $out .= "${h}h" if $h || $d;
+       $t -= $h * 3600;
+       $m = int $t / 60;
+       $out .= "${m}m" if $m || $h || $d;
+       $s = int $t % 60;
+       $out .= "${s}s";
+       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;
+}