ignore badly formatted log lines

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 71e7dab59810573a7699cff5fd2eb980b8703e79..32b5670060660a9afd2029e1968ae29319c2bafe 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -89,6 +89,8 @@
        $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
        if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
 
+       $fPostgisVersion = (float) CONST_Postgis_Version;
+
        if ($aCMDResult['create-db'] || $aCMDResult['all'])
        {
                echo "Create DB\n";
@@ -110,7 +112,7 @@
                $oDB =& getDB();
 
                $sVersionString = $oDB->getOne('select version()');
-               preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[.]([0-9]+) #', $sVersionString, $aMatches);
+               preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[^0-9]#', $sVersionString, $aMatches);
                if (CONST_Postgresql_Version != $aMatches[1].'.'.$aMatches[2])
                {
                        echo "ERROR: PostgreSQL version is not correct.  Expected ".CONST_Postgresql_Version." found ".$aMatches[1].'.'.$aMatches[2]."\n";
@@ -126,7 +128,6 @@
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }
 
-               $fPostgisVersion = (float) CONST_Postgis_Version;
                if ($fPostgisVersion < 2.0) {
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
@@ -190,8 +191,9 @@
                {
                        $osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
                }
+               $osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
                $osm2pgsql .= ' -lsc -O gazetteer --hstore';
-               $osm2pgsql .= ' -C '.$iCacheMemory;
+               $osm2pgsql .= ' -C 25000';
                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);
@@ -215,6 +217,14 @@
                if ($aCMDResult['enable-debug-statements']) $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
                if (CONST_Limit_Reindexing) $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);
                pgsqlRunScript($sTemplate);
+               if ($fPostgisVersion < 2.0) {
+                       echo "Helper functions for postgis < 2.0\n";
+                       $sTemplate = file_get_contents(CONST_BasePath.'/sql/postgis_15_aux.sql');
+               } else {
+                       echo "Helper functions for postgis >= 2.0\n";
+                       $sTemplate = file_get_contents(CONST_BasePath.'/sql/postgis_20_aux.sql');
+               }
+               pgsqlRunScript($sTemplate);
        }
 
        if ($aCMDResult['create-minimal-tables'])
@@ -517,7 +527,7 @@
                $sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',postcode,calculated_country_code,";
                $sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from (select calculated_country_code,postcode,";
                $sSQL .= "avg(st_x(st_centroid(geometry))) as x,avg(st_y(st_centroid(geometry))) as y ";
-               $sSQL .= "from placex where postcode is not null group by calculated_country_code,postcode) as x";
+               $sSQL .= "from placex where postcode is not null and calculated_country_code not in ('ie') group by calculated_country_code,postcode) as x";
                if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
 
                $sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,calculated_country_code,geometry) ";
@@ -685,6 +695,10 @@
        {
                showUsage($aCMDOptions, true);
        }
+       else
+       {
+               echo "Setup finished.\n";
+       }
 
        function pgsqlRunScriptFile($sFilename)
        {