Merge branch 'master' into anyevent

Conflicts:
	perl/DXUser.pm
	perl/Version.pm

Add database handling changes from master

diff --git a/Changes b/Changes
index 32a1306a904be8a6c888d715f61f104305827c7f..26a4bd0ec78971a7b2f5e2482ae8eb6fedc28dcb 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+12Mar12=======================================================================
+1. Check database operations on MySQL/SQlite3.
+2. Add ipaddr field to spot table if not present.
+3. Add ipaddr field from PC61 to database stored spots.
 09Mar12=======================================================================
 1. Try to trap unblessed references on receipt of PC34s
 15Feb12=======================================================================

diff --git a/perl/DXSql.pm b/perl/DXSql.pm
index 437f3bbf5e22a34eba9022a115bb805eaf5bc245..d125cc59ca37ac4ba436a0438f8c1cb8ab0656fd 100644 (file)
--- a/perl/DXSql.pm
+++ b/perl/DXSql.pm
@@ -62,7 +62,7 @@ sub connect
        my $dbh;
        eval {
                no strict 'refs';
-               $dbh = DBI->connect($dsn, $user, $passwd, {AutoCommit => 0}); 
+               $dbh = DBI->connect($dsn, $user, $passwd); 
        };
        unless ($dbh) {
                $active = 0;
@@ -86,16 +86,19 @@ sub do
        eval { $self->{dbh}->do($s); }; 
 }
 
+sub begin_work
+{
+       $_[0]->{dbh}->begin_work;
+}
+
 sub commit
 {
        $_[0]->{dbh}->commit;
-       $_[0]->{dbh}->{AutoCommit} = 0;
 }
 
 sub rollback
 {
        $_[0]->{dbh}->rollback;
-       $_[0]->{dbh}->{AutoCommit} = 0;
 }
 
 sub quote
@@ -111,7 +114,7 @@ sub prepare
 sub spot_insert_prepare
 {
        my $self = shift;
-       return $self->prepare('insert into spot values(?' . ',?' x 14 . ')');
+       return $self->prepare('insert into spot values(?' . ',?' x 15 . ')');
 }
 
 sub spot_insert
@@ -121,6 +124,8 @@ sub spot_insert
        my $sth = shift;
        
        if ($sth) {
+               push @$spot, undef while  @$spot < 15;
+               pop @$spot while @$spot > 15;
                eval {$sth->execute(undef, @$spot)};
        } else {
                my $s = "insert into spot values(NULL,";
@@ -137,7 +142,8 @@ sub spot_insert
                $s .= $spot->[10] . ',';
                $s .= $spot->[11] . ',';
                $s .= (length $spot->[12] ? $self->quote($spot->[12]) : 'NULL') . ',';
-               $s .= (length $spot->[13] ? $self->quote($spot->[13]) : 'NULL') . ')';
+               $s .= (length $spot->[13] ? $self->quote($spot->[13]) : 'NULL') . ',';
+               $s .= (length $spot->[14] ? $self->quote($spot->[14]) : 'NULL') . ')';
                eval {$self->do($s)};
        }
 }

diff --git a/perl/DXSql/SQLite.pm b/perl/DXSql/SQLite.pm
index d151f82e31ac314adae64d4982e13aa93e1b7084..14eb0621f96e85bbc3805daecd1200850041e168 100644 (file)
--- a/perl/DXSql/SQLite.pm
+++ b/perl/DXSql/SQLite.pm
@@ -22,11 +22,36 @@ sub show_tables
        my $sth = $self->prepare($s);
        $sth->execute;
        my @out;
-       push @out, $sth->fetchrow_array;
+       while (my @t = $sth->fetchrow_array) {
+               push @out, @t;
+       }
        $sth->finish;
        return @out;
 }
 
+sub has_ipaddr
+{
+       my $self = shift;
+       my $s = q(PRAGMA table_info(spot));
+       my $sth = $self->prepare($s);
+       $sth->execute;
+       while (my @t = $sth->fetchrow_array) {
+               if ($t[0] eq 'ipaddr') {
+                       $sth->finish;
+                       return 1;
+               }
+       }
+       $sth->finish;
+       return undef;
+}
+
+sub add_ipaddr
+{
+       my $self = shift;
+       my $s = q(alter table spot add column ipaddr varchar(40));
+       $self->do($s);
+}
+
 sub spot_create_table
 {
        my $self = shift;
@@ -45,7 +70,8 @@ spotcq int,
 spotteritu int,
 spottercq int,
 spotstate text,
-spotterstate text
+spotterstate text,
+ipaddr text
 )};
        $self->do($s);
 }
@@ -53,10 +79,10 @@ spotterstate text
 sub spot_add_indexes
 {
        my $self = shift;
-       $self->do('create index spot_ix1 on spot(time desc)');
        dbg('adding spot index ix1');
-       $self->do('create index spot_ix2 on spot(spotcall asc)');
+       $self->do('create index spot_ix1 on spot(time desc)');
        dbg('adding spot index ix2');
+       $self->do('create index spot_ix2 on spot(spotcall asc)');
 }
 
 

diff --git a/perl/DXSql/mysql.pm b/perl/DXSql/mysql.pm
index ff708da61f038ba76f6d4b6d16288672a388131e..f5a27a0791b30e31e40ef27bfec05e3a2737dc97 100644 (file)
--- a/perl/DXSql/mysql.pm
+++ b/perl/DXSql/mysql.pm
@@ -29,6 +29,29 @@ sub show_tables
        return @out;
 }
 
+sub has_ipaddr
+{
+       my $self = shift;
+       my $s = q(describe spot);
+       my $sth = $self->prepare($s);
+       $sth->execute;
+       while (my @t = $sth->fetchrow_array) {
+               if ($t[0] eq 'ipaddr') {
+                       $sth->finish;
+                       return 1;
+               }
+       }
+       $sth->finish;
+       return undef;
+}
+
+sub add_ipaddr
+{
+       my $self = shift;
+       my $s = q(alter table spot add column ipaddr varchar(40));
+       $self->do($s);
+}
+
 sub spot_create_table
 {
        my $self = shift;
@@ -47,7 +70,8 @@ spotcq tinyint,
 spotteritu tinyint,
 spottercq tinyint,
 spotstate char(2),
-spotterstate char(2)
+spotterstate char(2),
+ipaddr varchar(40)
 )};
        $self->do($s);
 }
@@ -55,10 +79,10 @@ spotterstate char(2)
 sub spot_add_indexes
 {
        my $self = shift;
-       $self->do('create index spot_ix1 on spot(time desc)');
        dbg('adding spot index ix1');
-       $self->do('create index spot_ix2 on spot(spotcall asc)');
+       $self->do('create index spot_ix1 on spot(time desc)');
        dbg('adding spot index ix2');
+       $self->do('create index spot_ix2 on spot(spotcall asc)');
 }
 
 

diff --git a/perl/Spot.pm b/perl/Spot.pm
index b8efd3d17c7af576ef387c908e41acfbb3eef8d5..7fcba6d1d045a005d0693306a72b0d3a2307b9f3 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -111,10 +111,11 @@ sub init
                        my $now = Julian::Day->alloc(1995, 0);
                        my $today = Julian::Day->new(time);
                        my $sth = $main::dbh->spot_insert_prepare;
-                       $main::dbh->{RaiseError} = 0;
                        while ($now->cmp($today) <= 0) {
                                my $fh = $fp->open($now);
                                if ($fh) {
+#                                      $main::dbh->{RaiseError} = 0;
+                                       $main::dbh->begin_work;
                                        my $count = 0;
                                        while (<$fh>) {
                                                chomp;
@@ -125,31 +126,32 @@ sub init
                                                        push @s, $b[1] if @s < 7;
                                                        push @s, '' if @s < 8;
                                                        push @s, @a[0,1], @b[0,1] if @s < 12;
-                                                       push @s,  $a[2], $a[2] if @s < 14;  
+                                                       push @s,  $a[2], $a[2] if @s < 14;
                                                } 
                                                
-                                               push @s, undef while @s < 14;
-                                               pop @s while @s > 14;
-
                                                $main::dbh->spot_insert(\@s, $sth);
                                                $count++;
                                        }
-                                       $main::dbh->commit if $count;
-                                       $main::dbh->{RaiseError} = 0;
+                                       $main::dbh->commit;
                                        dbg("inserted $count spots from $now->[0] $now->[1]");
                                        $fh->close;
                                        $total += $count;
                                }
                                $now = $now->add(1);
                        }
+                       $main::dbh->begin_work;
                        $main::dbh->spot_add_indexes;
                        $main::dbh->commit;
-                       $main::dbh->{RaiseError} = 1;
+#                      $main::dbh->{RaiseError} = 1;
                        $t = time - $t;
                        my $min = int($t / 60);
                        my $sec = $t % 60;
                        dbg("$total spots converted in $min:$sec");
                }
+               unless ($main::dbh->has_ipaddr) {
+                       $main::dbh->add_ipaddr;
+                       dbg("added ipaddr field to spot table");
+               }
        }
 }
 
@@ -190,6 +192,7 @@ sub add
        my $buf = join('^', @_);
        $fp->writeunix($_[2], $buf);
        if ($main::dbh) {
+               $main::dbh->begin_work;
                $main::dbh->spot_insert(\@_);
                $main::dbh->commit;
        }

diff --git a/perl/Version.pm b/perl/Version.pm
index 8942c46c43d5ca88d786bd2ef44f4f3ca95fbd0b..527a4f05a47261000f1643f3db5e0b150cfbe98f 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,7 +11,7 @@ use vars qw($version $subversion $build $gitversion);
 
 $version = '1.56';
 $subversion = '0';
-$build = '30';
-$gitversion = '899ab26';
+$build = '31';
+$gitversion = '4e42369';
 
 1;