add more routing code together with associated commands

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 2c05372c0f31b2d198a8959900ef8e2827b44817..b635e9816360f1dab46605eea7ed0b0d34c1c017 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -15,8 +15,8 @@ use Data::Dumper;
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf 
-                        parray parraypairs shellregex readfilestr writefilestr
-             print_all_fields cltounix iscallsign unpad is_callsign
+                        parray parraypairs phex shellregex readfilestr writefilestr
+             print_all_fields cltounix unpad is_callsign
                         is_freq is_digits is_pctext is_pcflag insertitem deleteitem
             );
 
@@ -130,11 +130,24 @@ sub promptf
        if ($action) {
                my $q = qq{\$value = $action(\$value)};
                eval $q;
+       } elsif (ref $value) {
+               my $dd = new Data::Dumper([$value]);
+               $dd->Indent(0);
+               $dd->Terse(1);
+               $dd->Quotekeys(0);
+               $value = $dd->Dumpxs;
        }
        $prompt = sprintf "%15s: %s", $prompt, $value;
        return ($priv, $prompt);
 }
 
+# turn a hex field into printed hex
+sub phex
+{
+       my $val = shift;
+       return sprintf '%X', $val;
+}
+
 # take an arg as an array list and print it
 sub parray
 {
@@ -175,7 +188,22 @@ sub print_all_fields
        foreach $field (sort {$ref->field_prompt($a) cmp $ref->field_prompt($b)} @fields) {
                if (defined $ref->{$field}) {
                        my ($priv, $ans) = promptf($ref->field_prompt($field), $ref->{$field});
-                       push @out, $ans if ($self->priv >= $priv);
+                       my @tmp;
+                       if (length $ans > 79) {
+                               my ($p, $a) = split /: /, $ans, 2;
+                               my $l = (length $p) + 2;
+                               my $al = 79 - $l;
+                               my $bit;
+                               while (length $a > $al ) {
+                                       ($bit, $a) = unpack "A$al A*", $a;
+                                       push @tmp, "$p: $bit";
+                                       $p = ' ' x ($l - 2);
+                               }
+                               push @tmp, "$p: $a" if length $a;
+                       } else {
+                               push @tmp, $ans;
+                       }
+                       push @out, @tmp if ($self->priv >= $priv);
                }
        }
        return @out;
@@ -190,15 +218,6 @@ sub shellregex
        return '^' . $in . "\$";
 }
 
-# start an attempt at determining whether this string might be a callsign
-sub iscallsign
-{
-       my $call = uc shift;
-       return 1 if $call =~ /^[A-Z]+\d+[A-Z]+/;
-       return 1 if $call =~ /^\d+[A-Z]\d+[A-Z]+/;
-       return undef;
-}
-
 # read in a file into a string and return it. 
 # the filename can be split into a dir and file and the 
 # file can be in upper or lower case.
@@ -293,7 +312,7 @@ sub unpad
 # check that a field only has callsign characters in it
 sub is_callsign
 {
-       return $_[0] =~ /^[A-Z0-9\-]+$/;
+       return $_[0] =~ /^(?:[A-Z]{1,2}\d+|\d[A-Z]\d+)[A-Z0-9\/\-]+$/;
 }
 
 # check that a PC protocol field is valid text