From ce9b24b16397f66996eb5f4e7f7a0da594bfb88e Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Mon, 18 Aug 2008 22:25:59 +0200
Subject: [PATCH] Bugfix, we need to use new scan infrastructure for raids too

---
 lib/NDWeb/Controller/Raids.pm | 16 ++++++----------
 root/src/raids/view.tt2       | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index ba56fa8..9f0c46d 100644
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -96,7 +96,6 @@ sub view : Local {
 	$c->forward('findRaid');
 	$raid = $c->stash->{raid};
 
-
 	$c->stash(raid => $raid->{id});
 	my $noingal = '';
 	my $planet;
@@ -185,17 +184,14 @@ sub view : Local {
 		}
 		$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
+		my $query = $dbh->prepare(q{SELECT ps.*, ss.*, ts.*
+			FROM current_planet_scans ps
+				LEFT OUTER JOIN current_structure_scans ss USING (planet)
+				LEFT OUTER JOIN current_tech_scans ts USING (planet)
+			WHERE planet = $1
 		});
 		$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{scans} = $query->fetchrow_hashref;
 
 		my @roids;
 		my @claims;
diff --git a/root/src/raids/view.tt2 b/root/src/raids/view.tt2
index e163b9d..80288f1 100644
--- a/root/src/raids/view.tt2
+++ b/root/src/raids/view.tt2
@@ -43,15 +43,15 @@
 	<tr><th></th><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
 	<tr align="center">
 		<th>Roids</th>
-		<td>[% t.roidMetal %]</td>
-		<td>[% t.roidCrystal %]</td>
-		<td>[% t.roidEonium %]</td>
+		<td>[% t.scans.metal_roids %]</td>
+		<td>[% t.scans.crystal_roids %]</td>
+		<td>[% t.scans.eonium_roids %]</td>
 	</tr>
 	<tr align="center">
 		<th>Resources</th>
-		<td>[% t.resourceMetal %]</td>
-		<td>[% t.resourceCrystal %]</td>
-		<td>[% t.resourceEonium %]</td>
+		<td>[% t.scans.metal %]</td>
+		<td>[% t.scans.crystal %]</td>
+		<td>[% t.scans.eonium %]</td>
 	</tr>
 
 	</table>
@@ -61,32 +61,32 @@
 	<tr><th>Waves</th></tr>
 	<tr>
 		<td>Research</td>
-		<td>[% t.techWaves %]</td>
+		<td>[% t.scans.waves %]</td>
 	</tr>
 	<tr>
 		<td>Amps</td>
-		<td>[% t.strucWave_Amplifier %]</td>
+		<td>[% t.scans.amps %]</td>
 	</tr>
 	<tr>
 		<td>Dists</td>
-		<td>[% t.strucWave_Distorter %]</td>
+		<td>[% t.scans.distorters %]</td>
 	</tr>
 	<tr><th>Production</th></tr>
 	<tr>
 		<td>Research</td>
-		<td>[% t.techHulls %]</td>
+		<td>[% t.scans.hulls %]</td>
 	</tr>
 	<tr>
 		<td>Light factory</td>
-		<td>[% t.strucLight_Factory %]</td>
+		<td>[% t.scans.light_fac %]</td>
 	</tr>
 	<tr>
 		<td>Medium factory</td>
-		<td>[% t.strucMedium_Factory %]</td>
+		<td>[% t.scans.medium_fac %]</td>
 	</tr>
 	<tr>
 		<td>Heavy factory</td>
-		<td>[% t.strucHeavy_Factory %]</td>
+		<td>[% t.scans.heavy_fac %]</td>
 	</tr>
 	</table>
 	</div>
-- 
2.39.2