From: Eric Stadtherr <estadtherr@caci.com>
Date: Sun, 22 Jul 2018 02:43:48 +0000 (-0600)
Subject: fix a couple errors with naming convention changes
X-Git-Tag: v3.2.0~36^2~6
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1d81c173358adcbe5263d805458f202a4fd8bc8a

fix a couple errors with naming convention changes
---

diff --git a/utils/setup.php b/utils/setup.php
index f7b639ca..50b44a2c 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -448,10 +448,10 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) {
             // PGSQL_EMPTY_QUERY, PGSQL_COMMAND_OK, PGSQL_TUPLES_OK,
             // PGSQL_COPY_OUT, PGSQL_COPY_IN, PGSQL_BAD_RESPONSE,
             // PGSQL_NONFATAL_ERROR and PGSQL_FATAL_ERROR
-            echo 'Query result ' . $i . ' is: ' . $resultStatus . '\n';
+            echo 'Query result ' . $i . ' is: ' . $resultStatus . "\n";
             if ($resultStatus != PGSQL_COMMAND_OK && $resultStatus != PGSQL_TUPLES_OK) {
                 $resultError = pg_result_error($hPGresult);
-                echo '-- error text ' . $i . ': ' . $resultError . '\n';
+                echo '-- error text ' . $i . ': ' . $resultError . "\n";
                 $bFailed = true;
             }
         }
@@ -634,13 +634,13 @@ if ($aCMDResult['index'] || $aCMDResult['all']) {
     }
     if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
     info('Index ranks 5 - 25');
-    $iStatus = runWithEnv($sBaseCmd.' -r 5 -R 25', $procenv);
+    $iStatus = runWithEnv($sBaseCmd.' -r 5 -R 25', $aProcEnv);
     if ($iStatus != 0) {
         fail('error status ' . $iStatus . ' running nominatim!');
     }
     if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
     info('Index ranks 26 - 30');
-    $iStatus = runWithEnv($sBaseCmd.' -r 26', $procenv);
+    $iStatus = runWithEnv($sBaseCmd.' -r 26', $aProcEnv);
     if ($iStatus != 0) {
         fail('error status ' . $iStatus . ' running nominatim!');
     }