X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fprefix.pl;h=0d46bb6a2cb4bccf4c5aa8d0c5000c00c926358f;hb=140683d04c00f7932b7e3ee7f7bde4513915f0c9;hp=8177e1e563de4d229e7d5c7ab2d823e23a457b1e;hpb=20b0335845c002b6c958a405d61bfa3ae4136f4d;p=spider.git

diff --git a/cmd/show/prefix.pl b/cmd/show/prefix.pl
index 8177e1e5..0d46bb6a 100644
--- a/cmd/show/prefix.pl
+++ b/cmd/show/prefix.pl
@@ -1,27 +1,32 @@
 #
 # show the prefix info for each callsign or prefix entered
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
-my @list = split /\s+/, $line;		      # generate a list of callsigns
+my @list = split /\s+/, $line;	# generate a list of callsigns
 
 my $l;
 my @out;
 
+#$DB::single = 1;
+
 #print "line: $line\n";
 foreach $l (@list) {
-  my @ans = Prefix::extract($l);
-#  my $dd = new Data::Dumper([ \@ans ]);
-#  print "ans:", $dd->Dumpxs;
-  next if !@ans;
-  my $pre = shift @ans;
-  my $a;
-  foreach $a (@ans) {
-    push @out, sprintf "%s DXCC: %d ITU: %d CQ: %d LL: %s %s (%s, %s)", uc $l, $a->dxcc, $a->itu, $a->cq, slat($a->lat), slong($a->long), $pre, $a->name;
-	$l = " " x length $l;
-  }
+	my @ans = Prefix::extract($l);
+	next if !@ans;
+#	dbg(join(', ', @ans));
+	my $pre = shift @ans;
+	my $a;
+	foreach $a (@ans) {
+		push @out, substr(sprintf("%s CC: %d IZ: %d CZ: %d LL: %s %s %4.4s (%s, %s", uc $l, $a->dxcc, $a->itu, $a->cq, slat($a->lat), slong($a->long), $a->qra, $pre, $a->name), 0, 78) . ')';
+		$l = " " x length $l;
+	}
+	if ($USDB::present && $ans[0]->state) {
+		push @out, sprintf "%s City: %s State: %s", $l, join (' ', map {ucfirst} split(/\s+/, lc $ans[0]->city)), $ans[0]->state;
+	}
+	
 }
 
 return (1, @out);