remove $Id$ strings from everywhere that I can find

[spider.git] / cmd / show / prefix.pl

diff --git a/cmd/show/prefix.pl b/cmd/show/prefix.pl
index ed53d9277b302f072c9cb775f7c80f68024f927f..e8e939e6d02cabd9e52b79b568d280ce1f151da5 100644 (file)
--- a/cmd/show/prefix.pl
+++ b/cmd/show/prefix.pl
@@ -1,27 +1,28 @@
 #
 # 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;
 
 #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;
+       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);