X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=10b3538767822ef46735fb4cc2a8b267e7a8c024;hb=412fb1b9e4070d7791f4e986b55bbc0c06f612ea;hp=42ba922bae1b888e72f2851fd01144636330c8f7;hpb=1f2757c4c57b6b4492923ed4edd7f0f912a31157;p=spider.git diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm index 42ba922b..10b35387 100644 --- a/perl/DXUtil.pm +++ b/perl/DXUtil.pm @@ -12,14 +12,25 @@ use Date::Parse; use IO::File; use Data::Dumper; +use strict; + +use vars qw($VERSION $BRANCH); +$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0; +$main::build += $VERSION; +$main::branch += $BRANCH; + +use vars qw(@month %patmap @ISA @EXPORT); + 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 - is_freq is_digits is_pctext is_pcflag + parray parraypairs phex shellregex readfilestr writefilestr + print_all_fields cltounix unpad is_callsign is_latlong + is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem ); + @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); %patmap = ( '*' => '.*', @@ -130,11 +141,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 { @@ -171,11 +195,28 @@ sub print_all_fields my @out; my @fields = $ref->fields; my $field; + my $width = $self->width - 1; + $width ||= 80; 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 > $width) { + my ($p, $a) = split /: /, $ans, 2; + my $l = (length $p) + 2; + my $al = ($width - 1) - $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 +231,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,13 +325,13 @@ 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-Z]+(?:-\d{1,2}|\/[A-Z0-9]+)?$/; } # check that a PC protocol field is valid text sub is_pctext { - return $_[0] =~ /^[\x09\x20-\xA8\xE0-\xEF]+$/; + return $_[0] =~ /^[\x09\x20-\xFF]+$/; } # check that a PC prot flag is fairly valid (doesn't check the difference between 1/0 and */-) @@ -319,3 +351,37 @@ sub is_digits { return $_[0] =~ /^[\d]+$/; } + +# does it look like a qra locator? +sub is_qra +{ + return $_[0] =~ /^[A-Za-z][A-Za-z]\d\d[A-Za-z][A-Za-z]$/o; +} + +# does it look like a valid lat/long +sub is_latlong +{ + return $_[0] =~ /^\s*\d{1,2}\s+\d{1,2}\s*[NnSs]\s+\d{1,2}\s+\d{1,2}\s*[EeWw]\s*$/; +} + +# insert an item into a list if it isn't already there returns 1 if there 0 if not +sub insertitem +{ + my $list = shift; + my $item = shift; + + return 1 if grep {$_ eq $item } @$list; + push @$list, $item; + return 0; +} + +# delete an item from a list if it is there returns no deleted +sub deleteitem +{ + my $list = shift; + my $item = shift; + my $n = @$list; + + @$list = grep {$_ ne $item } @$list; + return $n - @$list; +}