X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=2e8a528475ba9bcc75517512d36d5dc94440b6f4;hb=575db552c5a635ce2eb431de07f568113374735f;hp=2c05372c0f31b2d198a8959900ef8e2827b44817;hpb=c5e90df0d93d141f8687556a708068521b9b8f77;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 2c05372c..2e8a5284 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -16,7 +16,7 @@ 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
+             print_all_fields cltounix unpad is_callsign
 			 is_freq is_digits is_pctext is_pcflag insertitem deleteitem
             );
 
@@ -130,6 +130,12 @@ 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);
@@ -175,7 +181,21 @@ sub print_all_fields
 	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 > 79) {
+				my ($p, $a) = split /: /, $ans;
+				my $l = (length $p) + 2;
+				my $al = 79 - $l;
+				while (length $a > $al ) {
+					$a =~ s/^(.{$al})//;
+					push @tmp, "$p: $1";
+					$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 +210,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,7 +304,7 @@ 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-Z0-9\/\-]+$/;
 }
 
 # check that a PC protocol field is valid text