fix sh/dx <call> with sql spot logging

diff --git a/Changes b/Changes
index b4a800f25ea1337bc83e827073f2894bb99ba22d..3a318dfcb2bda60843d4497ddaec10e6669a3bf0 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+13Feb14=======================================================================
+1. Fix problem with sh/dx <call> if people are logging spots to a SQL database
+2. My late father would have been 102 today.
 27Nov14=======================================================================
 1. Add CTY-2415 prefix list
 25Nov14=======================================================================

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index f2629bfff0e225ef7249e358a17b166f46d38708..171b5efd78e7fbc86471810007cad1ec0eb4ff5b 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -31,6 +31,8 @@ my $fromdxcc;
 my $exact;
 my ($doqsl, $doiota, $doqra, $dofilter);
 
+my $usesql = $main::dbh && $Spot::use_db_for_search;
+
 while ($f = shift @list) {             # next field
        #  print "f: $f list: ", join(',', @list), "\n";
        if (!$from && !$to) {
@@ -180,7 +182,7 @@ if ($pre) {
        unless (@ans) {
                $pre .= '*' unless $pre =~ /[\*\?\[]$/o;
                $pre = shellregex($pre);
-               if ($main::dbh) {
+               if ($usesql) {
                        $pre =~ s/\.\*/%/g;
                } else {
                        $pre =~ s/\.\*\$$//;
@@ -256,7 +258,7 @@ if ($spotter) {
                $expr .= ' && ' if $expr;
                $spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
                $spotter = shellregex($spotter);
-               if ($main::dbh) {
+               if ($usesql) {
                        $spotter =~ s/\.\*/%/g;
                } else {
                        $spotter =~ s/\.\*\$$//;
@@ -330,7 +332,7 @@ if ($state) {
                push @expr, "\$f12 eq '$_'";
                push @hint, "m{$_}";
        }
-       if ($main::dbh) {
+       if ($usesql) {
                $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
        } else {
                $expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
@@ -346,7 +348,7 @@ if ($bystate) {
                push @expr, "\$f13 eq '$_'";
                push @hint, "m{$_}";
        }
-       if ($main::dbh) {
+       if ($usesql) {
                $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
        } else {
                $expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";

diff --git a/perl/DXSql/SQLite.pm b/perl/DXSql/SQLite.pm
index 14eb0621f96e85bbc3805daecd1200850041e168..2330837f41cd4b2192dc2821f926ff917c00653b 100644 (file)
--- a/perl/DXSql/SQLite.pm
+++ b/perl/DXSql/SQLite.pm
@@ -36,7 +36,7 @@ sub has_ipaddr
        my $sth = $self->prepare($s);
        $sth->execute;
        while (my @t = $sth->fetchrow_array) {
-               if ($t[0] eq 'ipaddr') {
+               if ($t[1] eq 'ipaddr') {
                        $sth->finish;
                        return 1;
                }
@@ -48,7 +48,7 @@ sub has_ipaddr
 sub add_ipaddr
 {
        my $self = shift;
-       my $s = q(alter table spot add column ipaddr varchar(40));
+       my $s = q(alter table spot add column ipaddr text);
        $self->do($s);
 }
 

diff --git a/perl/SQLHash.pm b/perl/SQLHash.pm
index 807ea6351f04f93f91df93bbbe43c7853fccee07..56b629e83d05ebb40fa106ab7f7ee7d05621f2fb 100644 (file)
--- a/perl/SQLHash.pm
+++ b/perl/SQLHash.pm
@@ -44,7 +44,7 @@ sub file_exists
 
 sub del_file
 {
-       m
+       
 }
 
 sub new