enwikipedia-acc / waca

PrecacheGeolocation.php

Spacing +2 added lines, -2 removed lines

@@ -63,12 +63,12 @@
         $database->commit();
         echo ". Committed txn.\n";
     } catch (Exception $ex) {
-        echo ". Encountered exception: " . $ex->getMessage(). "\n";
+        echo ". Encountered exception: ".$ex->getMessage()."\n";
         $database->rollBack();
         echo ". Rolled back txn\n";
         throw $ex;
     } finally {
-        if($database->hasActiveTransaction()){
+        if ($database->hasActiveTransaction()) {
             $database->rollBack();
             echo ". Rolled back txn\n";
         }

Braces +5 added lines, -3 removed lines

@@ -62,13 +62,15 @@
         echo ". IP location fetch complete.\n";
         $database->commit();
         echo ". Committed txn.\n";
-    } catch (Exception $ex) {
+    }
+    catch (Exception $ex) {
         echo ". Encountered exception: " . $ex->getMessage(). "\n";
         $database->rollBack();
         echo ". Rolled back txn\n";
         throw $ex;
-    } finally {
-        if($database->hasActiveTransaction()){
+    }
+    finally {
+        if($database->hasActiveTransaction()) {
             $database->rollBack();
             echo ". Rolled back txn\n";
         }

Indentation +40 added lines, -40 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (isset($_SERVER['REQUEST_METHOD'])) {
-    die();
+	die();
 } // Web clients die.
 
 ini_set('display_errors', 1);
@@ -17,19 +17,19 @@ 
 $locationProvider = new IpLocationProvider($database, $locationProviderApiKey);
 
 while (true) {
-    echo "Beginning txn\n";
-    $database->beginTransaction();
+	echo "Beginning txn\n";
+	$database->beginTransaction();
 
-    try {
-        // fetch a bunch of un-geolocated IPs from the database.
-        // note we have to parse the forwardedip field in the database so we can test against the geolocation table.
-        // This guarantees we get ten unlocated IPs back, unless there actually aren't 10 available.
-        // Alternatives include downloading a small set of forwarded IPs, splitting it in PHP, constructing an IN()
-        // clause dynamically, sending that back to the database to check if there are geolocation entries, then repeating
-        // until we have 10 to process - and the fact that we'd have to potentially retrieve all IPs from the database
-        // before we find any at all. This way keeps all of that legwork in the database, at the cost of a more complex
-        // query.
-        $statement = $database->query(<<<SQL
+	try {
+		// fetch a bunch of un-geolocated IPs from the database.
+		// note we have to parse the forwardedip field in the database so we can test against the geolocation table.
+		// This guarantees we get ten unlocated IPs back, unless there actually aren't 10 available.
+		// Alternatives include downloading a small set of forwarded IPs, splitting it in PHP, constructing an IN()
+		// clause dynamically, sending that back to the database to check if there are geolocation entries, then repeating
+		// until we have 10 to process - and the fact that we'd have to potentially retrieve all IPs from the database
+		// before we find any at all. This way keeps all of that legwork in the database, at the cost of a more complex
+		// query.
+		$statement = $database->query(<<<SQL
             SELECT p.prox
             FROM (
               SELECT trim(substring_index(substring_index(r.forwardedip, ',', n.n), ',', -1)) prox
@@ -46,38 +46,38 @@ 
             WHERE NOT EXISTS (SELECT 1 FROM geolocation g WHERE g.address = p.prox)
             LIMIT 10;
 SQL
-        );
+		);
 
-        $missingIps = $statement->fetchAll(PDO::FETCH_COLUMN);
+		$missingIps = $statement->fetchAll(PDO::FETCH_COLUMN);
 
-        $count = count($missingIps);
-        if ($count === 0) {
-            echo ". Found nothing to do.\n";
-            break;
-        }
+		$count = count($missingIps);
+		if ($count === 0) {
+			echo ". Found nothing to do.\n";
+			break;
+		}
 
-        echo ". Picked {$count} IP addresses\n";
+		echo ". Picked {$count} IP addresses\n";
 
-        foreach ($missingIps as $ip) {
-            echo ". . Getting location for {$ip}...\n";
-            $data = json_encode($locationProvider->getIpLocation($ip));
-            echo ". . . {$data}\n";
-        }
+		foreach ($missingIps as $ip) {
+			echo ". . Getting location for {$ip}...\n";
+			$data = json_encode($locationProvider->getIpLocation($ip));
+			echo ". . . {$data}\n";
+		}
 
-        echo ". IP location fetch complete.\n";
-        $database->commit();
-        echo ". Committed txn.\n";
-    } catch (Exception $ex) {
-        echo ". Encountered exception: " . $ex->getMessage(). "\n";
-        $database->rollBack();
-        echo ". Rolled back txn\n";
-        throw $ex;
-    } finally {
-        if($database->hasActiveTransaction()){
-            $database->rollBack();
-            echo ". Rolled back txn\n";
-        }
-    }
+		echo ". IP location fetch complete.\n";
+		$database->commit();
+		echo ". Committed txn.\n";
+	} catch (Exception $ex) {
+		echo ". Encountered exception: " . $ex->getMessage(). "\n";
+		$database->rollBack();
+		echo ". Rolled back txn\n";
+		throw $ex;
+	} finally {
+		if($database->hasActiveTransaction()){
+			$database->rollBack();
+			echo ". Rolled back txn\n";
+		}
+	}
 }
 
 echo "Done.\n";