X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=9d475ed89c8f2f17713b3aabdc9aa6c79d93d4df;hb=dbc63738d8b497c03bfb81c84e61161bb5c7931a;hp=2e8a528475ba9bcc75517512d36d5dc94440b6f4;hpb=1f1ba20386876b3d2a74e5e4d77bf7119a04610b;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 2e8a5284..9d475ed8 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 unpad is_callsign
-			 is_freq is_digits is_pctext is_pcflag insertitem deleteitem
+			 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 = (
 		   '*' => '.*',
@@ -141,6 +152,13 @@ sub promptf
 	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
 {
@@ -165,6 +183,14 @@ sub parraypairs
 	return $out;
 }
 
+sub _sort_fields
+{
+	my $ref = shift;
+	my @a = split /,/, $ref->field_prompt(shift); 
+	my @b = split /,/, $ref->field_prompt(shift); 
+	return lc $a[1] cmp lc $b[1];
+}
+
 # print all the fields for a record according to privilege
 #
 # The prompt record is of the format '<priv>,<prompt>[,<action>'
@@ -177,18 +203,21 @@ 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) {
+	foreach $field (sort {_sort_fields($ref, $a, $b)} @fields) {
 		if (defined $ref->{$field}) {
 			my ($priv, $ans) = promptf($ref->field_prompt($field), $ref->{$field});
 			my @tmp;
-			if (length $ans > 79) {
-				my ($p, $a) = split /: /, $ans;
+			if (length $ans > $width) {
+				my ($p, $a) = split /: /, $ans, 2;
 				my $l = (length $p) + 2;
-				my $al = 79 - $l;
+				my $al = ($width - 1) - $l;
+				my $bit;
 				while (length $a > $al ) {
-					$a =~ s/^(.{$al})//;
-					push @tmp, "$p: $1";
+					($bit, $a) = unpack "A$al A*", $a;
+					push @tmp, "$p: $bit";
 					$p = ' ' x ($l - 2);
 				}
 				push @tmp, "$p: $a" if length $a;
@@ -304,7 +333,7 @@ sub unpad
 # check that a field only has callsign characters in it
 sub is_callsign
 {
-	return $_[0] =~ /^(?:[A-Z]{1,2}\d+|\d[A-Z]\d+)[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
@@ -322,7 +351,7 @@ sub is_pcflag
 # check that a thing is a frequency
 sub is_freq
 {
-	return $_[0] =~ /^[\d\.]+$/;
+	return $_[0] =~ /^\d+(?:\.\d+)?$/;
 }
 
 # check that a thing is just digits
@@ -331,6 +360,18 @@ 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
 {