fix broken field name / committed debug

diff --git a/sql/tables.sql b/sql/tables.sql
index 3a0c8351fe868cd2187f106266db148682769c58..d5cf7bcd47eb0755ecbd2dcfdae9f2fac6092fe0 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -200,7 +200,7 @@ CREATE TABLE placex (
   indexed_date TIMESTAMP,
   wikipedia TEXT, -- calculated wikipedia article name (language:title)
   geometry_sector INTEGER,
   indexed_date TIMESTAMP,
   wikipedia TEXT, -- calculated wikipedia article name (language:title)
   geometry_sector INTEGER,

-  calaculated_country_code varchar(2)
+  calculated_country_code varchar(2)

   );
 SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);
 CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id);
   );
 SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);
 CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id);

diff --git a/utils/setup.php b/utils/setup.php
index f520f47d044fa5ce925a8ed3e8444bb253e57397..572e2c30ff34fbd1e5c151e15b5d216bfa54b380 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -441,7 +441,6 @@
                if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
                $sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile;
                passthru($sBaseCmd.' -R 4');
                if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
                $sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile;
                passthru($sBaseCmd.' -R 4');

-var_dump($sBaseCmd.' -r 15 -R 15');

                if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
                passthru($sBaseCmd.' -r 5 -R 25');
                if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
                if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
                passthru($sBaseCmd.' -r 5 -R 25');
                if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');