tidy up for running with 'showdx' a bit more.

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 17a17d27e3e23e4fa0ec19a0aa092ddbb3699862..0728c650dbd20918d580788d91f0bcd52fa9c537 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -86,7 +86,7 @@ while ($f = shift @list) {            # next field
                next;
        }
        if (lc $f =~ /^filt/) {
-               $dofilter = 1 if $self->spotsfilter;
+               $dofilter = 1 if $self && $self->spotsfilter;
                next;
        }
        if (lc $f eq 'qsl') {
@@ -372,7 +372,7 @@ foreach $ref (@res) {
        if ($self && $self->ve7cc) {
                push @out, VE7CC::dx_spot($self, @$ref);
        } else {
-               if ($real) {
+               if ($self && $real) {
                        push @out, DXCommandmode::format_dx_spot($self, @$ref);
                } else {
                        push @out, Spot::formatl(@$ref);

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 3df7fc20b218e42a2afb90da8fa03d0dec82cbf7..adddce0a4cef1f5701536e8d361530cc303f6244 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -212,17 +212,23 @@ sub finish
 # new - create a new user
 #
 
-sub new
+sub alloc
 {
        my $pkg = shift;
        my $call = uc shift;
+       my $self = bless {call => $call, 'sort'=>'U'}, $pkg;
+       return $self;
+}
+
+sub new
+{
+       my $pkg = shift;
+       my $call = shift;
        #  $call =~ s/-\d+$//o;
   
 #      confess "can't create existing call $call in User\n!" if $u{$call};
 
-       my $self = bless {}, $pkg;
-       $self->{call} = $call;
-       $self->{'sort'} = 'U';
+       my $self = $pkg->alloc($call);
        $self->put;
        return $self;
 }

diff --git a/perl/showdx b/perl/showdx
index 2ca142c316f3d01e1b80972de4aec7b58641b0f6..bd7696f8682ead963e4360d184e99d58cdff5a0c 100755 (executable)
--- a/perl/showdx
+++ b/perl/showdx
@@ -15,14 +15,13 @@ BEGIN {
        
        unshift @INC, "$root/perl";     # this IS the right way round!
        unshift @INC, "$root/local";
-
-       sub main::mkver {}
 }
 
 use IO::Handle;
 use DXUtil;
 use Bands;
 use Spot;
+use VE7CC;
 
 $dxdir = "/spider/cmd/show";
 $dxcmd = "dx.pl";
@@ -46,7 +45,7 @@ for (;;) {
                chomp $myexpr;
                last if $myexpr =~ /^q$/i;
        }
-       my @out = map {"$_\n"} &$dxproc({priv=>0,call=>'GDX'}, $myexpr);
+       my @out = map {"$_\n"} &$dxproc(undef, $myexpr);
        shift @out;   # remove return code
        print @out;
        last if $expr;