X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRaids.pm;h=16ce6b508d715fdbb025032e677c3bf0735d24fb;hb=15e271f8e65bfc35d311f9b9cad581e3a1c70def;hp=86465bc0d25246d1685f4c9ee9c0789ced4680e5;hpb=5b6c3c7d0003d636c1c3da6d25734e4aad5736a5;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 86465bc..16ce6b5 100644
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -96,66 +96,47 @@ sub view : Local {
 	$c->forward('findRaid');
 	$raid = $c->stash->{raid};
 
+	$c->stash(comma => \&comma_value);
 
 	$c->stash(raid => $raid->{id});
-	my $noingal = '';
 	my $planet;
 	if ($c->user->planet){
 		my $query = $dbh->prepare("SELECT value, score,x,y FROM current_planet_stats WHERE id = ?");
 		$planet = $dbh->selectrow_hashref($query,undef,$c->user->planet);
-		$noingal = "AND NOT (x = $planet->{x} AND y = $planet->{y})";
 	}
 	$c->stash(message => parseMarkup($raid->{message}));
 	$c->stash(landingtick => $raid->{tick});
-	my $targetquery = $dbh->prepare(qq{SELECT r.id, r.planet, size, score, value
+	my $targetquery = $dbh->prepare(q{SELECT r.id, r.planet, size, score, value
 		, p.x,p.y,p.z, race
-		, p.value - p.size*200 - 
-			COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150 - 
+		, p.value - p.size*200 -
+			COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150 -
 			COALESCE(ss.total ,(SELECT
 				COALESCE(avg(total),0) FROM
 				structure_scans)::int)*1500 AS fleetvalue
 		,(metal+crystal+eonium)/100 AS resvalue, comment
-		, hidden, light, medium, heavy
-		FROM current_planet_stats p 
-		JOIN raid_targets r ON p.id = r.planet 
-		LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet
-		LEFT OUTER JOIN structure_scans ss ON p.id = ss.planet
-		WHERE r.raid = ?
-		$noingal
+		, hidden, light, medium, heavy, metal, crystal, eonium
+		,metal_roids, crystal_roids, eonium_roids
+		,amps, distorters, light_fac, medium_fac, heavy_fac
+		,hulls, waves
+		FROM current_planet_stats p
+			JOIN raid_targets r ON p.id = r.planet
+			LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet
+			LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet
+			LEFT OUTER JOIN current_tech_scans ts ON p.id = ts.planet
+		WHERE r.raid = $1
+			AND NOT COALESCE(p.x = $2 AND p.y = $3,False)
 		ORDER BY size});
-	$targetquery->execute($raid->{id});
+	$targetquery->execute($raid->{id},$planet->{x},$planet->{y});
 	my @targets;
-	my %production = (0 => 'None', 35 => 'Light', 65 => 'Medium', 100 => 'High');
 	while (my $target = $targetquery->fetchrow_hashref){
-		my %target;
 		if ($planet){
 			if ($planet->{x} == $target->{x}){
-				$target{style} = 'incluster';
+				$target->{style} = 'incluster';
 			}
-			$target{scorebash} = 'bash' if ($target->{score}/$planet->{score} < 0.4);
-			$target{valuebash} = 'bash' if ($target->{value}/$planet->{value} < 0.4);
+			$target->{scorebash} = 'bash' if ($target->{score}/$planet->{score} < 0.4);
+			$target->{valuebash} = 'bash' if ($target->{value}/$planet->{value} < 0.4);
 			#next if ($target->{score}/$planet->{score} < 0.4) && ($target->{value}/$planet->{value} < 0.4);
 		}
-		$target{id} = $target->{id};
-		$target{race} = $target->{race};
-		my $num = pow(10,length($target->{score})-2);
-		$target{score} = "Hidden"; #ceil($target->{score}/$num)*$num;
-		$num = pow(10,length($target->{value})-2);
-		$target{value} = "Hidden"; #ceil($target->{value}/$num)*$num;
-		$num = pow(10,length($target->{size})-2);
-		$target{size} = floor($target->{size}/$num)*$num;
-		$num = pow(10,length($target->{fleetvalue})-2);
-		$target{fleetvalue} = floor($target->{fleetvalue}/$num)*$num;
-		if (defined $target->{resvalue}){
-			$num = pow(10,length($target->{resvalue})-2);
-			$target{resvalue} = floor($target->{resvalue}/$num)*$num;
-		}
-		$target{comment} = parseMarkup($target->{comment}) if ($target->{comment});
-		
-		$target{hidden} = int($target->{hidden} / 100);
-		$target{light} = $production{$target->{light}};
-		$target{medium} = $production{$target->{medium}};
-		$target{heavy} = $production{$target->{heavy}};
 
 		my $unitscans = $dbh->prepare(q{ 
 			SELECT DISTINCT ON (name) i.id,i.name, i.tick, i.amount 
@@ -179,27 +160,13 @@ sub view : Local {
 			}
 			push @ships, {ship => 'No', amount => 'ships'} if @ships == 0;
 			$mission->{ships} = \@ships;
-			$mission->{amount} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000
-			delete $mission->{id};
 			push @missions,$mission;
 		}
-		$target{missions} = \@missions;
-
-		my $query = $dbh->prepare(q{SELECT DISTINCT ON(rid) tick,category,name,amount
-			FROM planet_data pd JOIN planet_data_types pdt ON pd.rid = pdt.id
-			WHERE pd.id = $1 AND rid in (1,2,3,4,5,6,9,10,14,15,16,17,18)
-			ORDER BY rid,tick DESC
-		});
-		$query->execute($target->{planet});
-		while (my $data = $query->fetchrow_hashref){
-			$data->{amount} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000
-			$data->{name} =~ s/ /_/g;
-			$target{$data->{category}.$data->{name}} = $data->{amount};
-		}
+		$target->{missions} = \@missions;
 
 		my @roids;
 		my @claims;
-		my $size = $target{size};
+		my $size = $target->{size};
 		for (my $i = 1; $i <= $raid->{waves}; $i++){
 			my $roids = floor(0.25*$size);
 			$size -= $roids;
@@ -210,10 +177,25 @@ sub view : Local {
 			push @roids,{wave => $i, roids => $roids, xp => $xp};
 			push @claims,{wave => $i}
 		}
-		$target{roids} = \@roids;
-		$target{claims} = \@claims;
+		$target->{roids} = \@roids;
+		$target->{claims} = \@claims;
 
-		push @targets,\%target;
+		my $num = pow(10,length($target->{score})-2);
+		$target->{score} = "Hidden"; #ceil($target->{score}/$num)*$num;
+		$num = pow(10,length($target->{value})-2);
+		$target->{value} = "Hidden"; #ceil($target->{value}/$num)*$num;
+		$num = pow(10,length($target->{size})-2);
+		$target->{size} = floor($target->{size}/$num)*$num;
+		$num = pow(10,length($target->{fleetvalue})-2);
+		$target->{fleetvalue} = floor($target->{fleetvalue}/$num)*$num;
+		if (defined $target->{resvalue}){
+			$num = pow(10,length($target->{resvalue})-2);
+			$target->{resvalue} = floor($target->{resvalue}/$num)*$num;
+		}
+		$target->{comment} = parseMarkup($target->{comment}) if ($target->{comment});
+		$target->{hidden} = int($target->{hidden} / 100);
+
+		push @targets,$target;
 	}
 	@targets = sort {$b->{roids}[0]{xp} <=> $a->{roids}[0]{xp} or $b->{size} <=> $a->{size}} @targets;
 
@@ -403,6 +385,7 @@ sub posttargetupdates : Local {
 		WHERE target = ? AND wave = ? AND uid = -2
 		});
 	my $remove = $dbh->prepare(q{DELETE FROM raid_targets WHERE raid = ? AND id = ?});
+
 	for $_ ($c->req->param()){
 		if (/^comment:(\d+)$/){
 			$comment->execute(html_escape $c->req->param($_),$1);
@@ -445,9 +428,11 @@ sub posttargetupdates : Local {
 sub open : Local {
 	my ($self, $c, $raid) = @_;
 
+	$c->model->begin_work;
 	$c->model->do(q{UPDATE raids SET open = TRUE, removed = FALSE WHERE id = ?}
 		,undef,$raid);
 	$c->forward('log',[$raid, "BC opened raid"]);
+	$c->model->commit;
 
 	$c->res->redirect($c->req->referer);
 }
@@ -455,9 +440,11 @@ sub open : Local {
 sub close : Local {
 	my ($self, $c, $raid) = @_;
 
+	$c->model->begin_work;
 	$c->model->do(q{UPDATE raids SET open = FALSE WHERE id = ?}
 		,undef,$raid);
 	$c->forward('log',[$raid, "BC closed raid"]);
+	$c->model->commit;
 
 	$c->res->redirect($c->req->referer);
 }
@@ -465,9 +452,11 @@ sub close : Local {
 sub remove : Local {
 	my ($self, $c, $raid) = @_;
 
+	$c->model->begin_work;
 	$c->model->do(q{UPDATE raids SET open = FALSE, removed = TRUE WHERE id = ?}
 		,undef,$raid);
 	$c->forward('log',[$raid, "BC removed raid"]);
+	$c->model->commit;
 
 	$c->res->redirect($c->req->referer);
 }
@@ -475,9 +464,11 @@ sub remove : Local {
 sub showcoords : Local {
 	my ($self, $c, $raid) = @_;
 
+	$c->model->begin_work;
 	$c->model->do(q{UPDATE raids SET released_coords = TRUE WHERE id = ?}
 		,undef,$raid);
 	$c->forward('log',[$raid, "BC released coords"]);
+	$c->model->commit;
 
 	$c->res->redirect($c->req->referer);
 }
@@ -485,9 +476,11 @@ sub showcoords : Local {
 sub hidecoords : Local {
 	my ($self, $c, $raid) = @_;
 
+	$c->model->begin_work;
 	$c->model->do(q{UPDATE raids SET released_coords = FALSE WHERE id = ?}
 		,undef,$raid);
 	$c->forward('log',[$raid, "BC hid coords"]);
+	$c->model->commit;
 
 	$c->res->redirect($c->req->referer);
 }
@@ -503,6 +496,7 @@ sub postcreate : Local {
 	my ($self, $c) = @_;
 	my $dbh = $c->model;
 
+	$dbh->begin_work;
 	my $query = $dbh->prepare(q{INSERT INTO raids (tick,waves,message) VALUES(?,?,?) RETURNING (id)});
 	$query->execute($c->req->param('tick'),$c->req->param('waves')
 		,html_escape $c->req->param('message'));
@@ -524,6 +518,9 @@ sub postcreate : Local {
 		$addtarget->execute($raid,\@targets,\@gals,$c->req->param('sizelimit'));
 		$c->forward('log',[$raid,"BC added planets (@targets) and the gals for (@gals)"]);
 	}
+	$dbh->do(q{INSERT INTO raid_access (raid,gid) VALUES(?,2)}
+		,undef,$raid);
+	$dbh->commit;
 
 	$c->res->redirect($c->uri_for('edit',$raid));
 }