X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=db1c4c7da9c952c2a8b6482dfc0c1a41669b8ea5;hb=0ee845aaebeeb0f5a7232021d9c633a0ef2fff80;hp=286f6f223eb645cdd02f8fa835704a98d5deaaf2;hpb=fc093a9c5781403e0eb71140169fd7063d38844a;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 286f6f22..db1c4c7d 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -17,7 +17,7 @@ require Exporter;
 @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf 
 			 parray parraypairs shellregex readfilestr writefilestr
              print_all_fields cltounix iscallsign unpad is_callsign
-			 is_freq is_digits is_pctext is_pcflag
+			 is_freq is_digits is_pctext is_pcflag insertitem deleteitem
             );
 
 @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
@@ -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;
@@ -293,7 +313,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
@@ -319,3 +339,25 @@ sub is_digits
 {
 	return $_[0] =~ /^[\d]+$/;
 }
+
+# insert an item into a list if it isn't already there returns 1 if there 0 if not
+sub insertitem
+{
+	my $list = shift;
+	my $item = shift;
+	
+	return 1 if grep {$_ eq $item } @$list;
+	push @$list, $item;
+	return 0;
+}
+
+# delete an item from a list if it is there returns no deleted 
+sub deleteitem
+{
+	my $list = shift;
+	my $item = shift;
+	my $n = @$list;
+	
+	@$list = grep {$_ ne $item } @$list;
+	return $n - @$list;
+}