#!/usr/bin/perl
#**************************************************************************
-# Copyright (C) 2006 by Michael Andreen <harvATruinDOTnu> *
+# Copyright (C) 2006,2007 by Michael Andreen <harvATruinDOTnu> *
# *
# This program is free software; you can redistribute it and/or modify *
# it under the terms of the GNU General Public License as published by *
use strict;
use warnings;
+no warnings 'exiting';
+use local::lib;
use CGI;
use DBI;
use DBD::Pg qw(:pg_types);
-use LWP::Simple;
-
-our $dbh;
-for my $file ("/home/whale/db.pl")
-{
- unless (my $return = do $file){
- warn "couldn't parse $file: $@" if $@;
- warn "couldn't do $file: $!" unless defined $return;
- warn "couldn't run $file" unless $return;
+
+use LWP::Simple qw/get $ua/;
+$ua->agent("Stupid user agent check is stupid");
+
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+
+use ND::DB;
+
+our $dbh = ND::DB::DB();
+
+#$dbh->trace("1","/tmp/scanstest");
+
+#my $test = $dbh->prepare(q{INSERT INTO scans (tick,scan_id) VALUES(1,3) RETURNING id});
+#print ;
+$dbh->do(q{SET CLIENT_ENCODING TO 'LATIN1';});
+
+my $scangroups = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans
+ WHERE groupscan AND NOT parsed FOR UPDATE
+});
+my $oldscan = $dbh->prepare(q{SELECT scan_id FROM scans WHERE scan_id = LOWER(?) AND tick >= tick() - 168});
+my $addScan = $dbh->prepare(q{INSERT INTO scans (scan_id,tick,uid) VALUES (LOWER(?),?,?)});
+my $parsedscan = $dbh->prepare(q{UPDATE scans SET tick = ?, type = ?, pid = ?, parsed = TRUE WHERE id = ?});
+my $addpoints = $dbh->prepare(q{UPDATE users SET scan_points = scan_points + ? WHERE uid = ? });
+my $delscan = $dbh->prepare(q{DELETE FROM scans WHERE id = ?});
+
+$scangroups->execute or die $dbh->errstr;
+
+while (my $group = $scangroups->fetchrow_hashref){
+ $dbh->begin_work;
+ my $file = get("http://game.planetarion.com/showscan.pl?scan_grp=$group->{scan_id}");
+
+ if ($file){
+ my $points = 0;
+ while ($file =~ m/showscan.pl\?scan_id=(\w+)/g){
+ unless ($dbh->selectrow_array($oldscan,undef,$1)){
+ $addScan->execute($1,$group->{tick},$group->{uid});
+ ++$points;
+ }
+ }
+ $addpoints->execute($points,$group->{uid});
+ $parsedscan->execute($group->{tick},'GROUP',undef,$group->{id});
}
+ $dbh->commit;
}
-$dbh->trace("3","/tmp/scanstest");
-$dbh->do("SET CLIENT_ENCODING TO 'LATIN1';");
+my $newscans = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans
+ WHERE NOT groupscan AND NOT parsed FOR UPDATE
+});
+my $findplanet = $dbh->prepare(q{SELECT planetid(?,?,?,?)});
+my $findoldplanet = $dbh->prepare(q{SELECT pid FROM planet_stats WHERE x = $1 AND y = $2 AND z = $3 AND tick <= $4 ORDER BY tick DESC LIMIT 1});
+my $findcoords = $dbh->prepare(q{SELECT * FROM planetcoords(?,?)});
+my $addfleet = $dbh->prepare(q{INSERT INTO fleets (name,mission,pid,tick,amount) VALUES(?,?,?,?,?) RETURNING fid});
+my $fleetscan = $dbh->prepare(q{INSERT INTO fleet_scans (fid,id) VALUES(?,?)});
+my $addintel = $dbh->prepare(q{INSERT INTO intel (name,mission,sender,target,tick,eta,back,amount,ingal,uid)
+ VALUES(?,?,?,?,?,?,?,?,?,-1) RETURNING id});
+my $intelscan = $dbh->prepare(q{INSERT INTO intel_scans (intel,id) VALUES(?,?)});
+my $addships = $dbh->prepare(q{INSERT INTO fleet_ships (fid,ship,amount) VALUES(?,?,?)});
+my $addplanetscan = $dbh->prepare(q{INSERT INTO planet_scans
+ (id,tick,pid,metal_roids,metal,crystal_roids,crystal,eonium_roids,eonium
+ ,agents,guards,light,medium,heavy,hidden)
+ VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)});
-my $scangroups = $dbh->prepare(q{SELECT scan_id,tick,scan FROM scans WHERE "type" = 'group' AND scan ~ '^-?[0-9]+$'});
-my $oldscan = $dbh->prepare(q{SELECT scan_id FROM scans WHERE scan_id = ? AND tick >= tick() - 168});
-my $addScan = $dbh->prepare(q{INSERT INTO scans (scan_id,tick,"type") VALUES (?,?,COALESCE(?,'-1'))});
-my $donegroup = $dbh->prepare(q{UPDATE scans SET "type" = 'donegroup' WHERE scan_id = ? AND "type" = 'group' AND tick = ?});
+sub parse_planet {
+ my ($scan,$file) = @_;
-$scangroups->execute;
+ my @values = ($scan->{id},$scan->{tick},$scan->{pid});
+ $file =~ s/(\d),(\d)/$1$2/g;
-while (my @group = $scangroups->fetchrow){
- my $file = get("http://game.planetarion.com/showscan.pl?scan_grp=$group[0]");
+ while($file =~ m{"center">(Metal|Crystal|Eonium)</td>\D+(\d+)\D+([\d,]+)}g){
+ push @values,$2,$3;
+ }
+ if($file =~ m{Security\ Guards .+? "center">(\d+)</td>
+ .+? "center">(\d+)</td>}sx){
+ push @values,$1,$2;
+ }
+ if($file =~ m{<td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td>}){
+ push @values,$1,$2,$3;
+ }
+ if($file =~ m{<span class="superhighlight">([\d,]+)</span>}){
+ push @values,$1;
+ }
+ $addplanetscan->execute(@values);
+}
- my $points = 0;
- while ($file =~ m/showscan.pl\?scan_id=(\d+)/g){
- unless ($dbh->selectrow_array($oldscan,undef,$1)){
- $addScan->execute($1,$group[1],$group[2]);
- ++$points;
- }
+sub parse_incoming {
+ my ($scan,$file) = @_;
+
+ while($file =~ m{class="left">Fleet:\s(.*?)</td><td\sclass="right">
+ Mission:\s(\w+)</td></tr>(.*?)Total\sShips:\s(\d+)}sxg){
+ my $id = addfleet($1,$2,$3,$scan->{pid},$scan->{tick},$4);
+ $fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
}
- my $f = $dbh->prepare('UPDATE users SET scan_points = scan_points + ? WHERE uid = ? ');
- $f->execute($points,$group[2]);
- $donegroup->execute($group[0],$group[1]);
}
-my $emptyscans = $dbh->prepare('SELECT scan_id,tick,"type"::integer,tick() FROM scans WHERE planet is NULL AND type ~ \'^-?[0-9]+$\'');
-my $update = $dbh->prepare('UPDATE scans SET tick = ?, "type" = ?, scan = ? , planet = ? WHERE scan_id = ? AND tick = ?');
-$addScan = $dbh->prepare('INSERT INTO scans (tick,scan_id,"type",scan,planet) VALUES($1,$2,$3,$4,$5)') or die $dbh->errstr;
-my $findplanet = $dbh->prepare('SELECT planetid(?,?,?,?)');
-
-my $oldcoords = $dbh->prepare(q{SELECT x,y,z FROM planet_stats
- WHERE id = ? AND tick = ?});
-my $delscan = $dbh->prepare('DELETE FROM scans WHERE scan_id = ? AND tick = ?');
-unless ($emptyscans->execute){
- my $cleanup = $dbh->prepare('UPDATE scans SET "type" = \'-1\' WHERE planet is NULL');
- $cleanup->execute;
- $emptyscans->execute;
+sub parse_unit {
+ my ($scan,$file) = @_;
+
+ my $id = addfleet($scan->{type},'Full fleet',$file,$scan->{pid},$scan->{tick});
+ $fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
}
-while (my @scan = $emptyscans->fetchrow){
- my $file = get("http://game.planetarion.com/showscan.pl?scan_id=$scan[0]");
+
+sub parse_jumpgate {
+ my ($scan,$file) = @_;
+
+ $file =~ s/,//g;
+ while ($file =~ m{(\d+):(\d+):(\d+)\D+(Attack|Defend|Return)</td><td class="left">([^<]*)\D+(\d+)\D+(\d+)}g){
+ my ($sender) = $dbh->selectrow_array($findplanet,undef,$1,$2,$3,$scan->{tick});
+ ($sender) = $dbh->selectrow_array($findoldplanet,undef,$1,$2,$3,$scan->{tick})
+ if ((not defined $sender) && $4 eq 'Return');
+ my $id = addintel($5,$4,$sender,$scan->{pid},$scan->{tick}+$6,$6
+ ,undef,$7, $scan->{x} == $1 && $scan->{y} == $2);
+ $intelscan->execute($id,$scan->{id});
+ }
+
+}
+
+my $adddevscan = $dbh->prepare(q{INSERT INTO development_scans
+ (id,tick,pid,light_fac,medium_fac,heavy_fac,amps,distorters
+ ,metal_ref,crystal_ref,eonium_ref,reslabs,fincents,seccents
+ ,travel,infra,hulls,waves,extraction,covert,mining,total)
+ VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ });
+
+
+my %parsers = (
+ Planet => \&parse_planet,
+ Incoming => \&parse_incoming,
+ Unit => \&parse_unit,
+ 'Advanced Unit' => \&parse_unit,
+ Jumpgate => \&parse_jumpgate,
+);
+
+
+$dbh->begin_work or die 'No transaction';
+$newscans->execute or die $dbh->errstr;
+$dbh->pg_savepoint('scans') or die "No savepoint";
+
+my $parsedscans = 0;
+
+while (my $scan = $newscans->fetchrow_hashref){
+ $dbh->pg_release('scans') or die "Couldn't save";
+ $dbh->pg_savepoint('scans') or die "Couldn't save";
+ my $file = get("http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}");
+ next unless defined $file;
if ($file =~ /((?:\w| )*) (?:Scan|Probe) on (\d+):(\d+):(\d+) in tick (\d+)/){
+ eval {
my $type = $1;
my $x = $2;
my $y = $3;
my $z = $4;
my $tick = $5;
+ $scan->{tick} = $5;
+ $scan->{type} = $1;
+ $scan->{x} = $x;
+ $scan->{y} = $y;
+
+ if($dbh->selectrow_array(q{SELECT * FROM scans WHERE scan_id = ? AND tick = ? AND id <> ?},undef,$scan->{scan_id},$tick,$scan->{id})){
+ $dbh->pg_rollback_to('scans') or die "rollback didn't work";
+ $delscan->execute($scan->{id});
+ $addpoints->execute(-1,$scan->{uid}) if $scan->{uid} > 0;
+ warn "Duplicate scan: $scan->{id} http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}\n";
+ next;
+ }
my ($planet) = $dbh->selectrow_array($findplanet,undef,$x,$y,$z,$tick);
+ $scan->{pid} = $planet;
unless ($planet){
- if ($scan[1] + 48 < $scan[3]){
- $delscan->execute($scan[0],$scan[1]);
+ $dbh->pg_rollback_to('scans') or die "rollback didn't work";
+ if ( $x == 0 && $y == 0 && $z == 0 ){
+ $delscan->execute($scan->{id});
+ $addpoints->execute(-1,$scan->{uid}) if $scan->{uid} > 0;
}
next;
}
my $scantext = "";
if ($file =~ /(Note: [^<]*)/){
- $scantext .= qq{
- <table class="closedPlanet">
- <tr><td>$1</td></tr>
- </table>};
+ #TODO: something about planet being closed?
}
- if ($type eq 'Planet'){
- $file =~ s/(\d),(\d)/$1$2/g;
- if($file =~ m/Metal\D+(\d+)\D+(\d+).+?Crystal\D+(\d+)\D+(\d+).+?Eonium\D+(\d+)\D+(\d+)/s){
- $scantext .= <<HTML
- <table cellpadding="2">
- <tr><th></th><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
- <tr><td>Asteroids</td><td>$1</td><td>$3</td><td>$5</td></tr>
- <tr><td>Resources</td><td>$2</td><td>$4</td><td>$6</td></tr>
- </table>
-HTML
- }
- ;
- my $f = $dbh->prepare("UPDATE covop_targets SET metal = ?, crystal = ?, eonium = ? WHERE planet = ?");
- if ($f->execute($2,$4,$6,$planet) < 1){
- $f = $dbh->prepare("INSERT INTO covop_targets (planet,metal, crystal, eonium) VALUES(?,?,?,?)");
- $f->execute($planet,$2,$4,$6);
- }
- }elsif ($type eq 'Jumpgate'){
- $scantext .= <<HTML
- <table>
- <tr>
- <th>Coords</th>
- <th>Mission</th>
- <th>Fleet</th>
- <th>Eta</th>
- <th>Amount</th>
- </tr>
-HTML
- ;
- my $f = $dbh->prepare("SELECT add_intel(?,?,?,?,?,?,?,?,?,?,-1)");
- my $i = 1;
- while ($file =~ m/(\d+):(\d+):(\d+)\D+"left"\>(Attack|Defend|Return)<\/td><td>([^<]*)<\/td><td>(\d+)\D+(\d+)/g){
- my $row = "odd";
- $row = "even" if ($i % 2 == 0);
- if ($4 ne 'Return'){
- $f->execute($tick,$6,$x,$y,$z,$1,$2,$3,$7,$4);# or $server->command("echo " . DBI->errstr);
- }
- $scantext .= qq{
- <tr class="$row"><td><a href="check?coords=$1:$2:$3">$1:$2:$3</a></td><td class="$4">$4</td><td>$5</td><td>$6</td><td>$7</td></tr>};
- $i++;
- }
- $scantext .= "</table>\n";
+ if (exists $parsers{$type}){
+ $parsers{$type}->($scan,$file);
}elsif ($type eq 'News'){
- $scantext .= "<table>\n";
- my $i = 1;
- my $cgi = new CGI;
- my $f = $dbh->prepare("SELECT add_intel(?,?,?,?,?,?,?,?,?,?,-1)");
while( $file =~ m{top">((?:\w| )+)\D+(\d+)</td><td class="left" valign="top">(.+?)</td></tr>}g){
- my $row = "odd";
- $row = "even" if ($i % 2 == 0);
- $i++;
my $news = $1;
my $t = $2;
- my $text = $cgi->escapeHTML($3);
- my $class = '';
- my ($x,$y,$z) = $dbh->selectrow_array($oldcoords,undef,$planet,$t);
-
- if($news eq 'Launch' && $text =~ m/(?:[^<]*) fleet has been launched, heading for (\d+):(\d+):(\d+), on a mission to (Attack|Defend). Arrival tick: (\d+)/g){
-
+ my $text = $3;
+ my ($x,$y,$z) = $dbh->selectrow_array($findcoords,undef,$planet,$t);
+ die "No coords for: $planet tick $t" unless defined $x;
+ if($news eq 'Launch' && $text =~ m{The (.*?) fleet has been launched, heading for <a class="coords" href="galaxy.pl\?x=\d+&y=\d+">(\d+):(\d+):(\d+)</a>, on a mission to (Attack|Defend). Arrival tick: (\d+)}g){
+ my $eta = $6 - $t;
+ my $mission = $5;
+ my $back = $6 + $eta;
+ $mission = 'AllyDef' if $eta == 6 && $x != $2;
+ my ($target) = $dbh->selectrow_array($findplanet,undef
+ ,$2,$3,$4,$t) or die $dbh->errstr;
+ die "No target: $2:$3:$4" unless defined $target;
+ my $id = addintel($1,$mission,$planet,$target,$6
+ ,$eta,$back,undef, ($x == $2 && $y == $3));
+ $intelscan->execute($id,$scan->{id});
+ }elsif($news eq 'Incoming' && $text =~ m{We have detected an open jumpgate from (.*?), located at <a class="coords" href="galaxy.pl\?x=\d+&y=\d+">(\d+):(\d+):(\d+)</a>. The fleet will approach our system in tick (\d+) and appears to have (\d+) visible ships}g){
my $eta = $5 - $t;
- my $mission = $4;
- $mission = 'AllyDef' if $eta == 6 && $x != $1;
- $f->execute($t,$eta,$1,$2,$3,$x,$y,$z,-1,$mission) or print $dbh->errstr;
- $class = qq{ class="$mission"};
- }elsif($news eq 'Incoming' && $text =~ m/We have detected an open jumpgate from (?:[^<]*), located at (\d+):(\d+):(\d+). The fleet will approach our system in tick (\d+) and appears to have roughly (\d+) ships/g){
- my $eta = $4 - $t;
my $mission = '';
+ my $back = $5 + $eta;
$mission = 'Defend' if $eta <= 6;
- $mission = 'AllyDef' if $eta == 6 && $x != $1;
- $f->execute($t,$eta,$x,$y,$z,$1,$2,$3,$5,$mission) or print $dbh->errstr;
- $class = qq{ class="$mission"};
+ $mission = 'AllyDef' if $eta == 6 && $x != $2;
+ my ($target) = $dbh->selectrow_array($findplanet,undef
+ ,$2,$3,$4,$t) or die $dbh->errstr;
+ die "No target: $2:$3:$4" unless defined $target;
+ my $id = addintel($1,$mission,$target,$planet,$5
+ ,$eta,$back,$6, ($x == $2 && $y == $3));
+ $intelscan->execute($id,$scan->{id});
}
- $text =~ s{(\d+):(\d+):(\d+)}{<a href="check?coords=$1:$2:$3">$1:$2:$3</a>}g;
- $scantext .= "<tr class =\"$row\"><td$class>$news</td><td>$t</td><td>$text</td></tr>\n";
}
- $scantext .= "</table>\n";
- } elsif($type eq 'Unit' || $type eq 'Advanced Unit' || $type eq 'Surface Analysis' || $type eq 'Technology Analysis'){
- $scantext .= "<table>\n";
- my $i = 0;
+ } elsif($type eq 'Development'){
+ my @values = ($scan->{id},$tick,$planet);
my $total = 0;
- my $sec = 0;
- my $dist = 0;
- my $f = $dbh->prepare(qq{SELECT "type","class" FROM ship_stats WHERE name = ?});
- my %visible;
- my %total;
while($file =~ m{((?:[a-zA-Z]| )+)</t[dh]><td(?: class="right")?>(\d+)}sg){
- $i++;
- my $row = "odd";
- $row = "even" if ($i % 2 == 0);
- $scantext .= "<tr class=\"$row\"><td>$1</td><td>$2</td></tr>\n";
- $total += $2;
- $sec = $2 if ($1 eq 'Security Centre');
- $dist = $2 if ($1 eq 'Wave Distorter');
- $f->execute($1);
- if (my $ship = $f->fetchrow_hashref){
- $total{$ship->{class}} += $2;
- $visible{$ship->{class}} += $2 unless $ship->{type} eq 'Cloak';
- }
- }
- if ($type =~ 'Unit'){
- my $scan .= q{<table>
- <tr><th>Class</th><th>Total</th><th>Visible</th></tr>};
- my $i = 0;
- for my $type (qw/Fighter Corvette Frigate Destroyer Cruiser Battleship/){
- next unless $total{$type};
- $i++;
- my $row = "odd";
- $row = "even" if ($i % 2 == 0);
- $visible{$type} = 0 unless $visible{$type};
- $scan .= "<tr class=\"$row\"><td>$type</td><td>".$total{$type}."</td><td>".$visible{$type}."</td></tr>\n";
- }
- $scan .= "</table>\n";
- $addScan->execute($tick-1,$scan[0],'Ship Classes',$scan,$planet);
- }
- $scantext .= "<tr class=\"odd\"><td>No</td><td>Ships</td></tr>\n" unless $i;
- $scantext .= "</table>\n";
-
- if($type eq 'Surface Analysis'){
- my $f = $dbh->prepare("UPDATE covop_targets SET structures = ?, sec_centres = ?, dists = ? WHERE planet = ?");
- if ($f->execute($total,$sec,$dist,$planet) < 1){
- $f = $dbh->prepare("INSERT INTO covop_targets (planet,structures, sec_centres, dists) VALUES(?,?,?,?)");
- $f->execute($planet,$total,$sec,$dist);
- }
+ push @values,$2;
+ $total += $2 if $#values <= 13;
}
- } elsif($type eq 'Military'){
- $scantext .= "<table>\n";
- my $i = 1;
- my @totals = (0,0,0,0);
- my @eta = (8,8,8,8);
- my $f = $dbh->prepare(qq{SELECT "type","class" FROM ship_stats WHERE name = ?});
- while($file =~ m/big left">((?:[a-zA-Z]| )+)<\/t[dh]>.*?center>(\d+).*?center>(\d+).*?center>(\d+).*?center>(\d+)/sg){
- next if ($2+$3+$4+$5 == 0);
- my @ships = ($2,$3,$4,$5);
- my $row = "odd";
- my ($type,$class) = $dbh->selectrow_array($f,undef,$1);
- #print "$1 $type\n";
- $row = "even" if ($i % 2 == 0);
- $scantext .= "<tr class=\"$row\"><td>$1</td><td>$2</td><td>$3</td><td>$4</td><td>$5</td></tr>\n";
- $i++;
- unless ($type eq "Cloak"){
- $totals[0] += $2;
- $totals[1] += $3;
- $totals[2] += $4;
- $totals[3] += $5;
- }
- foreach my $i (0,1,2,3){
- if ($ships[$i] > 0 && $eta[$i] < 9 && ($class =~ /Frigate|Destroyer/)){
- $eta[$i] = 9;
- }elsif ($ships[$i] > 0 && $eta[$i] < 10 && ($class =~ /Cruiser|Battleship/)){
- $eta[$i] = 10;
- }
- }
- }
- $scantext .= "<tr class=\"total\"><td>Total uncloaked</td><td>$totals[0]</td><td>$totals[1]</td><td>$totals[2]</td><td>$totals[3]</td></tr>\n";
- $scantext .= "<tr><td>Initial eta</td><td>$eta[0]</td><td>$eta[1]</td><td>$eta[2]</td><td>$eta[3]</td></tr>\n";
- $scantext .= "</table>\n";
+ push @values,$total;
+ $adddevscan->execute(@values);
+ } elsif($type eq 'Landing'){
+ } else {
+ print "Something wrong with scan $scan->{id} type $type at tick $tick http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}\n";
}
- unless ($scantext || $type eq 'Incoming'){
- print "Something wrong with scan $scan[0] type $type at tick $tick";
+ $parsedscan->execute($tick,$type,$planet,$scan->{id}) or die $dbh->errstr;
+ #$dbh->rollback;
+ ++$parsedscans;
+ };
+ if ($@) {
+ warn $@;
+ $dbh->pg_rollback_to('scans') or die "rollback didn't work";
}
- $update->execute($tick,$type,$scantext,$planet,$scan[0],$scan[1]) or warn DBI->errstr;
}else{
- my $f = $dbh->prepare('UPDATE users SET scan_points = scan_points - 1 WHERE uid = ? ');
- $f->execute($scan[2]);
- $delscan->execute($scan[0],$scan[1]);
+ warn "Nothing useful in scan: $scan->{id} http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}\n";
+ $delscan->execute($scan->{id});
+ $addpoints->execute(-1,$scan->{uid}) if $scan->{uid} > 0;
+ }
+}
+#$dbh->rollback;
+$dbh->commit;
+
+system 'killall','-USR1', 'ndbot.pl' if $parsedscans;
+
+sub addfleet {
+ my ($name,$mission,$ships,$sender,$tick,$amount) = @_;
+
+ my @ships;
+ my $total = 0;
+ $ships =~ s/,//g;
+ while(defined $ships && $ships =~ m{((?:[a-zA-Z]| )+)</td><td(?: class="right")?>(\d+)}sg){
+ $total += $2;
+ push @ships, [$1,$2];
+ }
+ $amount = $total if (!defined $amount);
+ my $id = $dbh->selectrow_array($addfleet,undef,$name,$mission,$sender
+ ,$tick, $amount);
+ for my $s (@ships){
+ unshift @{$s},$id;
+ $addships->execute(@{$s}) or die $dbh->errstr;
}
+ return $id;
+}
+
+sub addintel {
+ my ($name,$mission,$sender,$target,$tick,$eta,$back,$amount,$ingal) = @_;
+
+ die "no sender" unless defined $sender;
+
+ $ingal = 0 unless $ingal;
+ $back = $tick + 4 if $ingal && $eta <= 4;
+
+ if ($mission eq 'Return'){
+ ($sender,$target) = ($target,$sender);
+ $back = $tick + $eta if $eta;
+ }
+
+ my $id = $dbh->selectrow_array($addintel,undef,$name,$mission,$sender
+ ,$target,$tick, $eta, $back, $amount,$ingal);
+ return $id;
}
-$dbh->disconnect;
projects / ndwebbie.git / blobdiff