X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=b329f51bd7d62e1b3c2de5c4c5b6f6831153a6c1;hb=0791dd94e297b6c14167f4252b91f06e84fbcf6f;hp=9a911b70e4f6dccc2c7968bc9e4523d0ce4734f1;hpb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 9a911b70..b329f51b 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -10,13 +10,14 @@ package DXUtil;
 
 use Date::Parse;
 use IO::File;
+use File::Copy;
 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;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -26,8 +27,10 @@ require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf 
 			 parray parraypairs phex shellregex readfilestr writefilestr
+			 filecopy ptimelist
              print_all_fields cltounix unpad is_callsign is_latlong
 			 is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem
+			 is_prefix dd
             );
 
 
@@ -131,6 +134,22 @@ sub yesno
 	return $n ? $main::yes : $main::no;
 }
 
+# provide a data dumpered version of the object passed
+sub dd
+{
+	my $value = shift;
+	my $dd = new Data::Dumper([$value]);
+	$dd->Indent(0);
+	$dd->Terse(1);
+    $dd->Quotekeys($] < 5.005 ? 1 : 0);
+	$value = $dd->Dumpxs;
+	$value =~ s/([\r\n\t])/sprintf("%%%02X", ord($1))/eg;
+	$value =~ s/^\s*\[//;
+    $value =~ s/\]\s*$//;
+	
+	return $value;
+}
+
 # format a prompt with its current value and return it with its privilege
 sub promptf
 {
@@ -142,11 +161,7 @@ sub promptf
 		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;
+		$value = dd($value);
 	}
 	$prompt = sprintf "%15s: %s", $prompt, $value;
 	return ($priv, $prompt);
@@ -159,11 +174,24 @@ sub phex
 	return sprintf '%X', $val;
 }
 
+# take an arg as a hash of call=>time pairs and print it
+sub ptimelist
+{
+	my $ref = shift;
+	my $out;
+	for (sort keys %$ref) {
+		$out .= "$_=$ref->{$_}, ";
+	}
+	chop $out;
+	chop $out;
+	return $out;	
+}
+
 # take an arg as an array list and print it
 sub parray
 {
 	my $ref = shift;
-	return join(', ', @{$ref});
+	return ref $ref ? join(', ', @{$ref}) : $ref;
 }
 
 # take the arg as an array reference and print as a list of pairs
@@ -183,6 +211,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>'
@@ -195,15 +231,17 @@ 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) {
+			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 ) {
 					($bit, $a) = unpack "A$al A*", $a;
@@ -311,6 +349,11 @@ sub writefilestr
 	}
 }
 
+sub filecopy
+{
+	copy(@_) or return $!;
+}
+
 # remove leading and trailing spaces from an input string
 sub unpad
 {
@@ -323,13 +366,27 @@ 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-Z]+(?:-\d{1,2}|\/[A-Z0-9]+)?$/;
+	return $_[0] =~ m!^(?:[A-Z]{1,2}\d+ | \d[A-Z]{1,2}\d+)        # basic prefix
+                       (?:/(?:[A-Z]{1,2}\d+ | \d[A-Z]{1,2}\d+))?  # / another one (possibly)
+					   [A-Z]{1,3}                                 # callsign letters
+					   (?:/(?:[A-Z]{1,2}\d+ | \d[A-Z]{1,2}\d+))?  # / another prefix possibly
+                       (?:/[0-9A-Z]{1,2})?                        # /0-9A-Z+ possibly
+					   (?:-\d{1,2})?                              # - nn possibly
+					 $!x;
 }
 
+sub is_prefix
+{
+	return $_[0] =~ m!^(?:[A-Z]{1,2}\d+ | \d[A-Z]{1,2}\d+)!x        # basic prefix
+}
+	
+
 # check that a PC protocol field is valid text
 sub is_pctext
 {
-	return $_[0] =~ /^[\x09\x20-\xFF]+$/;
+	return undef unless length $_[0];
+	return undef if $_[0] =~ /[\x00-\x08\x0a-\x1f\x80-\x9f]/;
+	return 1;
 }
 
 # check that a PC prot flag is fairly valid (doesn't check the difference between 1/0 and */-)
@@ -341,7 +398,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
@@ -353,13 +410,13 @@ sub is_digits
 # 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;
+	return $_[0] =~ /^[A-Ra-r][A-Ra-r]\d\d[A-Xa-x][A-Xa-x]$/;
 }
 
 # 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*$/;
+	return $_[0] =~ /^\s*\d{1,2}\s+\d{1,2}\s*[NnSs]\s+1?\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