X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=512c30efcc0e35609c3d931f0c20bf172af517ef;hb=c1540ccd7990ec4bd151604dd63583d19fe4d0f6;hp=fc7cd024d7737a96326f8a4a69316069b8c696f4;hpb=d0dd6927b76507d8c2b1c6d32d6fdd34515e4a82;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index fc7cd024..512c30ef 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXUtil;
@@ -15,21 +15,16 @@ 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 phex shellregex readfilestr writefilestr
-			 filecopy
+			 parray parraypairs phex phash 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
             );
 
 
@@ -133,6 +128,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
 {
@@ -144,11 +155,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);
@@ -161,6 +168,19 @@ 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
 {
@@ -174,7 +194,7 @@ sub parraypairs
 	my $ref = shift;
 	my $i;
 	my $out;
-  
+
 	for ($i = 0; $i < @$ref; $i += 2) {
 		my $r1 = @$ref[$i];
 		my $r2 = @$ref[$i+1];
@@ -185,6 +205,20 @@ sub parraypairs
 	return $out;
 }
 
+# take the arg as a hash reference and print it out as such
+sub phash
+{
+	my $ref = shift;
+	my $out;
+
+	while (my ($k,$v) = each %$ref) {
+		$out .= "${k}=>$v, ";
+	}
+	chop $out;					# remove last space
+	chop $out;					# remove last comma
+	return $out;
+}
+
 sub _sort_fields
 {
 	my $ref = shift;
@@ -340,14 +374,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]{1,2}\d+)[A-Z]{1,3}(?:-\d{1,2}|\/(?:[A-Z]{1,2}\d{0,2}|\d[A-Z]\d{0,2}))?$/;
+	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 undef unless length $_[0];
 	return undef if $_[0] =~ /[\x00-\x08\x0a-\x1f\x80-\x9f]/;
-	return $_[0];
+	return 1;
 }
 
 # check that a PC prot flag is fairly valid (doesn't check the difference between 1/0 and */-)
@@ -377,7 +424,7 @@ sub is_qra
 # 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
@@ -401,3 +448,4 @@ sub deleteitem
 	@$list = grep {$_ ne $item } @$list;
 	return $n - @$list;
 }
+