my $tick = $5;
if($dbh->selectrow_array(q{SELECT * FROM scans WHERE scan_id = ? AND tick = ? AND id <> ?},undef,$scan->{scan_id},$tick,$scan->{id})){
- $dbh->rollback;
+ $dbh->pg_rollback_to('scans') or die "rollback didn't work";
$delscan->execute($scan->{id});
$addpoints->execute(-1,$scan->{uid}) if $scan->{uid} > 0;
die "Duplicate scan: $scan->{id} http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}\n";
}
my ($planet) = $dbh->selectrow_array($findplanet,undef,$x,$y,$z,$tick);
unless ($planet){
- $dbh->rollback;
+ $dbh->pg_rollback_to('scans') or die "rollback didn't work";
next;
}
my $scantext = "";
}
if ($type eq 'Planet'){
$file =~ s/(\d),(\d)/$1$2/g;
- while($file =~ m/(Metal|Crystal|Eonium)\D+(\d+)\D+(\d+)/g){
+ while($file =~ m/"center">(Metal|Crystal|Eonium)\D+(\d+)\D+([\d,]+)/g){
+ my ($roids,$res) = ($2,$3);
+ $roids =~ s/,//g;
$addpdata->execute($planet,$tick,$scan->{id}
- ,'roid',$1, $2) or die $dbh->errstr;
+ ,'roid',$1, $roids) or die $dbh->errstr;
+ $res =~ s/,//g;
+ $addpdata->execute($planet,$tick,$scan->{id}
+ ,'resource',$1, $res) or die $dbh->errstr;
+ }
+ #if($file =~ m{"center">([^<]+)</td><td class="center">([^<]+)</td><td class="center">([^<]+)</td>}){
+ # $addpdata->execute($planet,$tick,$scan->{id}
+ # ,'planet','Light Usage', $1) or die $dbh->errstr;
+ # $addpdata->execute($planet,$tick,$scan->{id}
+ # ,'planet','Medium Usage', $2) or die $dbh->errstr;
+ # $addpdata->execute($planet,$tick,$scan->{id}
+ # ,'planet','Heavy Usage', $3) or die $dbh->errstr;
+ #}
+ if($file =~ m{<span class="superhighlight">([\d,]+)</span>}){
+ my $res = $1;
+ $res =~ s/,//g;
$addpdata->execute($planet,$tick,$scan->{id}
- ,'resource',$1, $3) or die $dbh->errstr;
+ ,'planet','Production', $res) or die $dbh->errstr;
}
}elsif ($type eq 'Jumpgate'){
while ($file =~ m/(\d+):(\d+):(\d+)\D+"left"\>(Attack|Defend|Return)<\/td><td>([^<]*)<\/td><td>(\d+)\D+(\d+)/g){
print "Something wrong with scan $scan->{id} type $type at tick $tick http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}";
}
$parsedscan->execute($tick,$type,$planet,$scan->{id}) or die $dbh->errstr;
+ $dbh->pg_release('scans') or die "Couldn't save";
$dbh->pg_savepoint('scans') or die "Couldn't save";
#$dbh->rollback;
};
$addpoints->execute(-1,$scan->{uid}) if $scan->{uid} > 0;
}
}
+#$dbh->rollback;
$dbh->commit;
sub addfleet {
my @ships;
my $total = 0;
- while(defined $ships && $ships =~ m{((?:[a-zA-Z]| )+)</td><td>(\d+)}sg){
+ while(defined $ships && $ships =~ m{((?:[a-zA-Z]| )+)</td><td(?: class="right")?>(\d+)}sg){
$total += $2;
push @ships, [$1,$2];
}