Update to new database structure

[NDIRC.git] / Commands / Intel.pm

diff --git a/Commands/Intel.pm b/Commands/Intel.pm
index 9643333461973995da6bb958cc78b31d1978bfc9..b9c00e91d20ebe6085208caca59c53321ea59f66 100644 (file)
--- a/Commands/Intel.pm
+++ b/Commands/Intel.pm
@@ -37,7 +37,7 @@ sub sethostile
        my $findid = $dbh->prepare(q{SELECT planetid(?,?,?,tick())});
        my ($id) = $dbh->selectrow_array($findid,undef,$x,$y,$z);
        $dbh->begin_work;
-       my $rv = $dbh->do(q{UPDATE planets SET planet_status = 'Hostile' WHERE id = $1}
+       my $rv = $dbh->do(q{UPDATE planets SET planet_status = 'Hostile' WHERE pid = $1}
                ,undef,$id);
        if ($rv == 1){
                $c->reply("$x:$y:$z is now marked s hostile");
@@ -55,23 +55,23 @@ sub setnick
        my $dbh = $c->model;
 
        my $findid = $dbh->prepare(q{
-SELECT nick, id, alliance_id FROM planets WHERE id = planetid(?,?,?,tick())
+SELECT nick, pid, alliance FROM planets WHERE pid = planetid(?,?,?,tick())
                });
        my $planet = $dbh->selectrow_hashref($findid,undef,$x,$y,$z);
-       unless($planet->{id}){
+       unless($planet->{pid}){
                $c->reply("Couldn't find any planet with coords $x:$y:$z");
-       }elsif($planet->{alliance_id} ~~ 1){
+       }elsif($planet->{alliance} ~~ 'NewDawn'){
                $c->reply("This is an ND planet.");
        }else{
                $dbh->begin_work;
-               $dbh->do(q{UPDATE planets SET nick = $1 WHERE id = $2}
-                       ,undef,$nick,$planet->{id});
+               $dbh->do(q{UPDATE planets SET nick = $1 WHERE pid = $2}
+                       ,undef,$nick,$planet->{pid});
                if ($planet->{nick}){
                        $c->reply("$x:$y:$z nick has been changed from <b>$planet->{nick}</b> to <b>$nick</b>");
                }else{
                        $c->reply("$x:$y:$z nick has been set to $nick");
                }
-               $c->intel_log($planet->{id},"Set nick to: $nick");
+               $c->intel_log($planet->{pid},"Set nick to: $nick");
                $dbh->commit;
        }
 }
@@ -87,14 +87,14 @@ sub setally
        my $aid;
        if ($ally ne 'unknown'){
                ($aid,$ally) = $dbh->selectrow_array(q{
-SELECT id,name FROM alliances WHERE name ILIKE ?
+SELECT aid,alliance FROM alliances WHERE alliance ILIKE ?
                },undef,$ally);
        }
        if ($aid ~~ 1){
                $c->reply("Don't set ND planets manually.");
        }elsif ($ally){
                my $findid = $dbh->prepare(q{
-SELECT id,alliance,alliance_id FROM current_planet_stats WHERE x = ? AND y = ? and z = ?
+SELECT pid,alliance,aid FROM current_planet_stats WHERE x = ? AND y = ? and z = ?
                });
                my ($id,$alliance,$alliance_id) = $dbh->selectrow_array($findid,undef,$x,$y,$z);
                unless ($id){
@@ -105,8 +105,8 @@ SELECT id,alliance,alliance_id FROM current_planet_stats WHERE x = ? AND y = ? a
                        $c->reply("$x:$y:$z is already set to $ally");
                }else{
                        $dbh->begin_work;
-                       $dbh->do(q{UPDATE planets SET alliance_id = $1 WHERE id = $2}
-                               ,undef,$aid,$id);
+                       $dbh->do(q{UPDATE planets SET alliance = $1 WHERE pid = $2}
+                               ,undef,$ally,$id);
                        if (defined $alliance){
                                $c->reply("Changed $x:$y:$z from <b>$alliance</b> to <b>$ally</b>");
                        }else{
@@ -128,14 +128,14 @@ sub setchannel
        my ($x,$y,$z,$channel) = $msg =~ /^(\d+)\D(\d+)\D(\d+) (\S+)$/ or die 'ARGS';
        my $dbh = $c->model;
 
-       my $findid = $dbh->prepare_cached(q{SELECT id,channel FROM current_planet_stats
+       my $findid = $dbh->prepare_cached(q{SELECT pid,channel FROM current_planet_stats
                WHERE x = ? AND y = ? and z = ?});
        my ($id,$oc) = $dbh->selectrow_array($findid,undef,$x,$y,$z);
        if ($channel ~~ $oc){
                $c->reply("$x:$y:$z already got $oc as channel");
        }elsif($id){
                $dbh->begin_work;
-               $dbh->do(q{UPDATE planets SET channel = $1 WHERE id = $2}
+               $dbh->do(q{UPDATE planets SET channel = $1 WHERE pid = $2}
                        ,undef,$channel,$id);
                $c->intel_log($id,"Set channel to: $channel");
                $dbh->commit;