Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 270c1a4916220af8d3aeb2f5b8403e340e0d6274..870d37eca3a5de45c7d275375bab04583bc28f99 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -22,6 +22,7 @@
                array('create-functions', '', 0, 1, 0, 0, 'bool', 'Create functions'),
                array('enable-diff-updates', '', 0, 1, 0, 0, 'bool', 'Turn on the code required to make diff updates work'),
                array('enable-debug-statements', '', 0, 1, 0, 0, 'bool', 'Include debug warning statements in pgsql commands'),
+               array('ignore-errors', '', 0, 1, 0, 0, 'bool', 'Continue import even when errors in SQL are present (EXPERT)'),
                array('create-minimal-tables', '', 0, 1, 0, 0, 'bool', 'Create minimal main tables'),
                array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
                array('create-partition-tables', '', 0, 1, 0, 0, 'bool', 'Create required partition tables'),
@@ -132,6 +133,10 @@
                } else {
                        pgsqlRunScript('CREATE EXTENSION postgis');
                }
+               if ($fPostgisVersion < 2.1) {
+                       // Function was renamed in 2.1 and throws an annoying deprecation warning
+                       pgsqlRunScript('ALTER FUNCTION st_line_interpolate_point(geometry, double precision) RENAME TO ST_LineInterpolatePoint');
+               }
                $sVersionString = $oDB->getOne('select postgis_full_version()');
                preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
                if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2])
@@ -143,7 +148,15 @@
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');
-               pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode.sql');
+               pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_table.sql');
+               if (file_exists(CONST_BasePath.'/data/gb_postcode_data.sql.gz'))
+               {
+                       pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_data.sql.gz');
+               }
+               else
+               {
+                       echo "WARNING: external UK postcode table not found.\n";
+               }
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_statecounty.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_state.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_postcode.sql');
@@ -152,6 +165,13 @@
                {
                        pgsqlRunScript('update country_name set partition = 0');
                }
+
+               // the following will be needed by create_functions later but
+               // is only defined in the subsequently called create_tables.
+               // Create dummies here that will be overwritten by the proper
+               // versions in create-tables.
+               pgsqlRunScript('CREATE TABLE place_boundingbox ()');
+               pgsqlRunScript('create type wikipedia_article_match as ()');
        }
 
        if ($aCMDResult['import-data'] || $aCMDResult['all'])
@@ -194,6 +214,7 @@
                $sTemplate = str_replace('{modulepath}', CONST_BasePath.'/module', $sTemplate);
                if ($aCMDResult['enable-diff-updates']) $sTemplate = str_replace('RETURN NEW; -- @DIFFUPDATES@', '--', $sTemplate);
                if ($aCMDResult['enable-debug-statements']) $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
+               if (CONST_Limit_Reindexing) $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);
                pgsqlRunScript($sTemplate);
        }
 
@@ -673,10 +694,29 @@
                // Convert database DSN to psql parameters
                $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
                if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
-               $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'].' -f '.$sFilename;
+               $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
+
+               $ahGzipPipes = null;
+               if (preg_match('/\\.gz$/', $sFilename))
+               {
+                       $aDescriptors = array(
+                               0 => array('pipe', 'r'),
+                               1 => array('pipe', 'w'),
+                               2 => array('file', '/dev/null', 'a')
+                       );
+                       $hGzipProcess = proc_open('zcat '.$sFilename, $aDescriptors, $ahGzipPipes);
+                       if (!is_resource($hGzipProcess)) fail('unable to start zcat');
+                       $aReadPipe = $ahGzipPipes[1];
+                       fclose($ahGzipPipes[0]);
+               }
+               else
+               {
+                       $sCMD .= ' -f '.$sFilename;
+                       $aReadPipe = array('pipe', 'r');
+               }
 
                $aDescriptors = array(
-                       0 => array('pipe', 'r'),
+                       0 => $aReadPipe,
                        1 => array('pipe', 'w'),
                        2 => array('file', '/dev/null', 'a')
                );
@@ -684,7 +724,6 @@
                $hProcess = proc_open($sCMD, $aDescriptors, $ahPipes);
                if (!is_resource($hProcess)) fail('unable to start pgsql');
 
-               fclose($ahPipes[0]);
 
                // TODO: error checking
                while(!feof($ahPipes[1]))
@@ -693,15 +732,28 @@
                }
                fclose($ahPipes[1]);
 
-               proc_close($hProcess);
+               $iReturn = proc_close($hProcess);
+               if ($iReturn > 0)
+               {
+                       fail("pgsql returned with error code ($iReturn)");
+               }
+               if ($ahGzipPipes)
+               {
+                       fclose($ahGzipPipes[1]);
+                       proc_close($hGzipProcess);
+               }
+
        }
 
        function pgsqlRunScript($sScript)
        {
+               global $aCMDResult;
                // Convert database DSN to psql parameters
                $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
                if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
                $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
+               if (!$aCMDResult['ignore-errors'])
+                       $sCMD .= ' -v ON_ERROR_STOP=1';
                $aDescriptors = array(
                        0 => array('pipe', 'r'),
                        1 => STDOUT, 
@@ -714,10 +766,15 @@
                while(strlen($sScript))
                {
                        $written = fwrite($ahPipes[0], $sScript);
+                       if ($written <= 0) break;
                        $sScript = substr($sScript, $written);
                }
                fclose($ahPipes[0]);
-               proc_close($hProcess);
+               $iReturn = proc_close($hProcess);
+               if ($iReturn > 0)
+               {
+                       fail("pgsql returned with error code ($iReturn)");
+               }
        }
 
        function pgsqlRunRestoreData($sDumpFile)
@@ -745,7 +802,7 @@
                }
                fclose($ahPipes[1]);
 
-               proc_close($hProcess);
+               $iReturn = proc_close($hProcess);
        }
 
        function pgsqlRunDropAndRestore($sDumpFile)
@@ -773,7 +830,7 @@
                }
                fclose($ahPipes[1]);
 
-               proc_close($hProcess);
+               $iReturn = proc_close($hProcess);
        }
 
        function passthruCheckReturn($cmd)