X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=b329f51bd7d62e1b3c2de5c4c5b6f6831153a6c1;hb=d00a3a8b5a5cf48f21652e48b4ecbff12bc02165;hp=8a5cffe4334a2b4e7c7d3cccd4ace2975bddf784;hpb=5fc468a5ca08ec51a9b6994605db183b273b9184;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 8a5cffe4..b329f51b 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -16,8 +16,10 @@ use Data::Dumper;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-
-main::mkver($VERSION = q$Revision$);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
 
 use vars qw(@month %patmap @ISA @EXPORT);
 
@@ -28,7 +30,7 @@ require Exporter;
 			 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
+			 is_prefix dd
             );
 
 
@@ -132,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
 {
@@ -143,12 +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 =~ s/([\r\n\t])/sprintf("%%%02X", ord($1))/eg;
+		$value = dd($value);
 	}
 	$prompt = sprintf "%15s: %s", $prompt, $value;
 	return ($priv, $prompt);
@@ -366,6 +379,7 @@ 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