X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fprefix.pl;h=1689d63a9d213ad01916f8063cf66b5e4704b7f6;hb=refs%2Fheads%2Fnewdisc;hp=310ee6b858650972a2a2841c32fe52ab033d6232;hpb=84505457c5b3757715d97a63acd792b28fc1841a;p=spider.git

diff --git a/cmd/show/prefix.pl b/cmd/show/prefix.pl
index 310ee6b8..1689d63a 100644
--- a/cmd/show/prefix.pl
+++ b/cmd/show/prefix.pl
@@ -1,25 +1,31 @@
 #
-# show the dxcc number for each callsign or prefix entered
+# 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);
-  #print "ans:", @ans, "\n";
-  next if !@ans;
-  my $pre = shift @ans;
-  my $a;
-  foreach $a (@ans) {
-    push @out, sprintf "%s   DXCC: %3d ITU: %3d CQ: %3d (%s, %s)", uc $l, $a->dxcc(), $a->itu(), $a->cq(), $pre, $a->name();
-  }
+	my @ans = Prefix::extract($l);
+	next if !@ans;
+#	dbg(join(', ', @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;
+	}
+	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);