hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt PR changes to use new variable naming convention

Browse Source
This commit is contained in:
Eric Stadtherr
2018-07-21 17:09:59 -06:00
parent 1108bf7d86
commit b8b87716db
3 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/cmd.php
View File

@@ -164,9 +164,9 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError
if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
$sCMD .= ' -U ' . $aDSNInfo['username']; $sCMD .= ' -U ' . $aDSNInfo['username'];
} }
$procenv = null; $aProcEnv = null;
if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
$procenv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
} }
if (!$bVerbose) { if (!$bVerbose) {
$sCMD .= ' -q'; $sCMD .= ' -q';
@@ -180,15 +180,15 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError
2 => STDERR 2 => STDERR
); );
$ahPipes = null; $ahPipes = null;
$hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes, null, $procenv); $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes, null, $aProcEnv);
if (!is_resource($hProcess)) { if (!is_resource($hProcess)) {
fail('unable to start pgsql'); fail('unable to start pgsql');
} }
while (strlen($sScript)) { while (strlen($sScript)) {
$written = fwrite($ahPipes[0], $sScript); $iWritten = fwrite($ahPipes[0], $sScript);
if ($written <= 0) break; if ($iWritten <= 0) break;
$sScript = substr($sScript, $written); $sScript = substr($sScript, $iWritten);
} }
fclose($ahPipes[0]); fclose($ahPipes[0]);
$iReturn = proc_close($hProcess); $iReturn = proc_close($hProcess);
@@ -198,19 +198,19 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError
} }
function runWithEnv($cmd, $env) function runWithEnv($sCmd, $aEnv)
{ {
$fds = array(0 => array('pipe', 'r'), $aFDs = array(0 => array('pipe', 'r'),
1 => STDOUT, 1 => STDOUT,
2 => STDERR); 2 => STDERR);
$pipes = null; $aPipes = null;
$proc = @proc_open($cmd, $fds, $pipes, null, $env); $hProc = @proc_open($sCmd, $aFDs, $aPipes, null, $aEnv);
if (!is_resource($proc)) { if (!is_resource($hProc)) {
fail('unable to run command:' . $cmd); fail('unable to run command:' . $sCmd);
} }
fclose($pipes[0]); // no stdin fclose($aPipes[0]); // no stdin
$stat = proc_close($proc); $iStat = proc_close($hProc);
return $stat; return $iStat;
} }

84
utils/setup.php
View File

@@ -80,10 +80,10 @@ if (isset($aCMDResult['osm2pgsql-cache'])) {
$iCacheMemory = getCacheMemoryMB(); $iCacheMemory = getCacheMemoryMB();
} }
$modulePath = CONST_InstallPath . '/module'; $sModulePath = CONST_InstallPath . '/module';
if (isset($aCMDResult['module-path'])) { if (isset($aCMDResult['module-path'])) {
$modulePath = $aCMDResult['module-path']; $sModulePath = $aCMDResult['module-path'];
echo 'module path: ' . $modulePath . '\n'; echo 'module path: ' . $sModulePath . '\n';
} }
$aDSNInfo = DB::parseDSN(CONST_Database_DSN); $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
@@ -97,21 +97,21 @@ if ($aCMDResult['create-db'] || $aCMDResult['all']) {
fail('database already exists ('.CONST_Database_DSN.')'); fail('database already exists ('.CONST_Database_DSN.')');
} }
$createdbCmd = 'createdb -E UTF-8 -p '.$aDSNInfo['port'].' '.$aDSNInfo['database']; $sCreateDBCmd = 'createdb -E UTF-8 -p '.$aDSNInfo['port'].' '.$aDSNInfo['database'];
if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
$createdbCmd .= ' -U ' . $aDSNInfo['username']; $sCreateDBCmd .= ' -U ' . $aDSNInfo['username'];
} }
if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
$createdbCmd .= ' -h ' . $aDSNInfo['hostspec']; $sCreateDBCmd .= ' -h ' . $aDSNInfo['hostspec'];
} }
$procenv = null; $aProcEnv = null;
if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
$procenv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
} }
$result = runWithEnv($createdbCmd, $procenv); $result = runWithEnv($sCreateDBCmd, $aProcEnv);
if ($result != 0) fail('Error executing external command: '.$createdbCmd); if ($result != 0) fail('Error executing external command: '.$sCreateDBCmd);
} }
if ($aCMDResult['setup-db'] || $aCMDResult['all']) { if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
@@ -162,7 +162,7 @@ if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
// Try accessing the C module, so we know early if something is wrong // Try accessing the C module, so we know early if something is wrong
// and can simply error out. // and can simply error out.
$sSQL = "CREATE FUNCTION nominatim_test_import_func(text) RETURNS text AS '"; $sSQL = "CREATE FUNCTION nominatim_test_import_func(text) RETURNS text AS '";
$sSQL .= $modulePath."/nominatim.so', 'transliteration' LANGUAGE c IMMUTABLE STRICT"; $sSQL .= $sModulePath."/nominatim.so', 'transliteration' LANGUAGE c IMMUTABLE STRICT";
$sSQL .= ';DROP FUNCTION nominatim_test_import_func(text);'; $sSQL .= ';DROP FUNCTION nominatim_test_import_func(text);';
$oResult = $oDB->query($sSQL); $oResult = $oDB->query($sSQL);
@@ -235,13 +235,13 @@ if ($aCMDResult['import-data'] || $aCMDResult['all']) {
$osm2pgsql .= ' -H ' . $aDSNInfo['hostspec']; $osm2pgsql .= ' -H ' . $aDSNInfo['hostspec'];
} }
$procenv = null; $aProcEnv = null;
if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
$procenv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
} }
$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file']; $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
runWithEnv($osm2pgsql, $procenv); runWithEnv($osm2pgsql, $aProcEnv);
$oDB =& getDB(); $oDB =& getDB();
if (!$aCMDResult['ignore-errors'] && !chksql($oDB->getRow('select * from place limit 1'))) { if (!$aCMDResult['ignore-errors'] && !chksql($oDB->getRow('select * from place limit 1'))) {
@@ -441,22 +441,22 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) {
fail(pg_last_error($aDBInstances[$iLoadThreads]->connection)); fail(pg_last_error($aDBInstances[$iLoadThreads]->connection));
} }
$failed = false; $bFailed = false;
for ($i = 0; $i <= $iLoadThreads; $i++) { for ($i = 0; $i <= $iLoadThreads; $i++) {
while (($pgresult = pg_get_result($aDBInstances[$i]->connection)) !== false) { while (($hPGresult = pg_get_result($aDBInstances[$i]->connection)) !== false) {
$resultStatus = pg_result_status($pgresult); $resultStatus = pg_result_status($hPGresult);
// PGSQL_EMPTY_QUERY, PGSQL_COMMAND_OK, PGSQL_TUPLES_OK, // PGSQL_EMPTY_QUERY, PGSQL_COMMAND_OK, PGSQL_TUPLES_OK,
// PGSQL_COPY_OUT, PGSQL_COPY_IN, PGSQL_BAD_RESPONSE, // PGSQL_COPY_OUT, PGSQL_COPY_IN, PGSQL_BAD_RESPONSE,
// PGSQL_NONFATAL_ERROR and PGSQL_FATAL_ERROR // 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) { if ($resultStatus != PGSQL_COMMAND_OK && $resultStatus != PGSQL_TUPLES_OK) {
$resultError = pg_result_error($pgresult); $resultError = pg_result_error($hPGresult);
echo '-- error text ' . $i . ': ' . $resultError . '\n'; echo '-- error text ' . $i . ': ' . $resultError . '\n';
$failed = true; $bFailed = true;
} }
} }
} }
if ($failed) { if ($bFailed) {
fail('SQL errors loading placex and/or location_property_osmline tables'); fail('SQL errors loading placex and/or location_property_osmline tables');
} }
echo "\n"; echo "\n";
@@ -622,27 +622,27 @@ if ($aCMDResult['index'] || $aCMDResult['all']) {
if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
$sBaseCmd .= ' -U ' . $aDSNInfo['username']; $sBaseCmd .= ' -U ' . $aDSNInfo['username'];
} }
$procenv = null; $aProcEnv = null;
if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
$procenv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
} }
info('Index ranks 0 - 4'); info('Index ranks 0 - 4');
$status = runWithEnv($sBaseCmd.' -R 4', $procenv); $iStatus = runWithEnv($sBaseCmd.' -R 4', $aProcEnv);
if ($status != 0) { if ($iStatus != 0) {
fail('error status ' . $status . ' running nominatim!'); fail('error status ' . $iStatus . ' running nominatim!');
} }
if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE'); if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
info('Index ranks 5 - 25'); info('Index ranks 5 - 25');
$status = runWithEnv($sBaseCmd.' -r 5 -R 25', $procenv); $iStatus = runWithEnv($sBaseCmd.' -r 5 -R 25', $procenv);
if ($status != 0) { if ($iStatus != 0) {
fail('error status ' . $status . ' running nominatim!'); fail('error status ' . $iStatus . ' running nominatim!');
} }
if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE'); if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
info('Index ranks 26 - 30'); info('Index ranks 26 - 30');
$status = runWithEnv($sBaseCmd.' -r 26', $procenv); $iStatus = runWithEnv($sBaseCmd.' -r 26', $procenv);
if ($status != 0) { if ($iStatus != 0) {
fail('error status ' . $status . ' running nominatim!'); fail('error status ' . $iStatus . ' running nominatim!');
} }
info('Index postcodes'); info('Index postcodes');
@@ -785,9 +785,9 @@ function pgsqlRunScriptFile($sFilename)
if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
$sCMD .= ' -U ' . $aDSNInfo['username']; $sCMD .= ' -U ' . $aDSNInfo['username'];
} }
$procenv = null; $aProcEnv = null;
if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
$procenv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
} }
$ahGzipPipes = null; $ahGzipPipes = null;
@@ -812,7 +812,7 @@ function pgsqlRunScriptFile($sFilename)
2 => array('file', '/dev/null', 'a') 2 => array('file', '/dev/null', 'a')
); );
$ahPipes = null; $ahPipes = null;
$hProcess = proc_open($sCMD, $aDescriptors, $ahPipes, null, $procenv); $hProcess = proc_open($sCMD, $aDescriptors, $ahPipes, null, $aProcEnv);
if (!is_resource($hProcess)) fail('unable to start pgsql'); if (!is_resource($hProcess)) fail('unable to start pgsql');
// TODO: error checking // TODO: error checking
@@ -902,18 +902,18 @@ function pgsqlRunDropAndRestore($sDumpFile)
if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
$sCMD .= ' -U ' . $aDSNInfo['username']; $sCMD .= ' -U ' . $aDSNInfo['username'];
} }
$procenv = null; $aProcEnv = null;
if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
$procenv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
} }
$iReturn = runWithEnv($sCMD, $procenv); $iReturn = runWithEnv($sCMD, $aProcEnv);
} }
function passthruCheckReturn($cmd) function passthruCheckReturn($sCmd)
{ {
$result = -1; $iResult = -1;
passthru($cmd, $result); passthru($sCmd, $iResult);
} }
function replace_tablespace($sTemplate, $sTablespace, $sSql) function replace_tablespace($sTemplate, $sTablespace, $sSql)
@@ -929,9 +929,9 @@ function replace_tablespace($sTemplate, $sTablespace, $sSql)
function create_sql_functions($aCMDResult) function create_sql_functions($aCMDResult)
{ {
global $modulePath; global $sModulePath;
$sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql'); $sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
$sTemplate = str_replace('{modulepath}', $modulePath, $sTemplate); $sTemplate = str_replace('{modulepath}', $sModulePath, $sTemplate);
if ($aCMDResult['enable-diff-updates']) { if ($aCMDResult['enable-diff-updates']) {
$sTemplate = str_replace('RETURN NEW; -- %DIFFUPDATES%', '--', $sTemplate); $sTemplate = str_replace('RETURN NEW; -- %DIFFUPDATES%', '--', $sTemplate);
} }

20
utils/update.php
View File

@@ -65,9 +65,9 @@ if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
$sOsm2pgsqlCmd .= ' -H ' . $aDSNInfo['hostspec']; $sOsm2pgsqlCmd .= ' -H ' . $aDSNInfo['hostspec'];
} }
$procenv = null; $aProcEnv = null;
if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
$procenv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
} }
if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) { if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
@@ -153,7 +153,7 @@ if (isset($aResult['import-diff']) || isset($aResult['import-file'])) {
// Import the file // Import the file
$sCMD = $sOsm2pgsqlCmd.' '.$sNextFile; $sCMD = $sOsm2pgsqlCmd.' '.$sNextFile;
echo $sCMD."\n"; echo $sCMD."\n";
$iErrorLevel = runWithEnv($sCMD, $procenv); $iErrorLevel = runWithEnv($sCMD, $aProcEnv);
if ($iErrorLevel) { if ($iErrorLevel) {
fail("Error from osm2pgsql, $iErrorLevel\n"); fail("Error from osm2pgsql, $iErrorLevel\n");
@@ -205,7 +205,7 @@ if ($bHaveDiff) {
// import generated change file // import generated change file
$sCMD = $sOsm2pgsqlCmd.' '.$sTemporaryFile; $sCMD = $sOsm2pgsqlCmd.' '.$sTemporaryFile;
echo $sCMD."\n"; echo $sCMD."\n";
$iErrorLevel = runWithEnv($sCMD, $procenv); $iErrorLevel = runWithEnv($sCMD, $aProcEnv);
if ($iErrorLevel) { if ($iErrorLevel) {
fail("osm2pgsql exited with error level $iErrorLevel\n"); fail("osm2pgsql exited with error level $iErrorLevel\n");
} }
@@ -289,15 +289,15 @@ if ($aResult['recompute-word-counts']) {
} }
if ($aResult['index']) { if ($aResult['index']) {
$cmd = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']; $sCmd = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank'];
if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
$cmd .= ' -H ' . $aDSNInfo['hostspec']; $sCmd .= ' -H ' . $aDSNInfo['hostspec'];
} }
if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
$cmd .= ' -U ' . $aDSNInfo['username']; $sCmd .= ' -U ' . $aDSNInfo['username'];
} }
runWithEnv($cmd, $procenv); runWithEnv($sCmd, $aProcEnv);
} }
if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
@@ -384,7 +384,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
$fCMDStartTime = time(); $fCMDStartTime = time();
echo $sCMDImport."\n"; echo $sCMDImport."\n";
unset($sJunk); unset($sJunk);
$iErrorLevel = runWithEnv($sCMDImport, $procenv); $iErrorLevel = runWithEnv($sCMDImport, $aProcEnv);
if ($iErrorLevel) { if ($iErrorLevel) {
echo "Error executing osm2pgsql: $iErrorLevel\n"; echo "Error executing osm2pgsql: $iErrorLevel\n";
exit($iErrorLevel); exit($iErrorLevel);
@@ -413,7 +413,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
$fCMDStartTime = time(); $fCMDStartTime = time();
echo "$sThisIndexCmd\n"; echo "$sThisIndexCmd\n";
$iErrorLevel = runWithEnv($sThisIndexCmd, $procenv); $iErrorLevel = runWithEnv($sThisIndexCmd, $aProcEnv);
if ($iErrorLevel) { if ($iErrorLevel) {
echo "Error: $iErrorLevel\n"; echo "Error: $iErrorLevel\n";
exit($iErrorLevel); exit($iErrorLevel);