array('osm-file', '', 0, 1, 1, 1, 'realpath', 'File to import'),
array('threads', '', 0, 1, 1, 1, 'int', 'Number of threads (where possible)'),
- array('module-path', '', 0, 1, 1, 1, 'string', 'Directory on Postgres server containing Nominatim module'),
array('all', '', 0, 1, 0, 0, 'bool', 'Do the complete process'),
$iCacheMemory = getCacheMemoryMB();
}
-$modulePath = CONST_InstallPath . '/module';
-if (isset($aCMDResult['module-path'])) {
- $modulePath = $aCMDResult['module-path'];
- echo 'module path: ' . $modulePath . '\n';
-}
+$sModulePath = CONST_Database_Module_Path;
+info('module path: ' . $sModulePath);
$aDSNInfo = DB::parseDSN(CONST_Database_DSN);
if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
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']) {
- $createdbCmd .= ' -U ' . $aDSNInfo['username'];
+ $sCreateDBCmd .= ' -U ' . $aDSNInfo['username'];
}
if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
- $createdbCmd .= ' -h ' . $aDSNInfo['hostspec'];
+ $sCreateDBCmd .= ' -h ' . $aDSNInfo['hostspec'];
}
- $procenv = null;
+ $aProcEnv = null;
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);
- if ($result != 0) fail('Error executing external command: '.$createdbCmd);
+ $result = runWithEnv($sCreateDBCmd, $aProcEnv);
+ if ($result != 0) fail('Error executing external command: '.$sCreateDBCmd);
}
if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
exit(1);
}
- // Try accessing the C module, so we know early if something is wrong
- // and can simply error out.
- $sSQL = "CREATE FUNCTION nominatim_test_import_func(text) RETURNS text AS '";
- $sSQL .= $modulePath."/nominatim.so', 'transliteration' LANGUAGE c IMMUTABLE STRICT";
- $sSQL .= ';DROP FUNCTION nominatim_test_import_func(text);';
- $oResult = $oDB->query($sSQL);
-
- if (PEAR::isError($oResult)) {
- echo "\nERROR: Failed to load nominatim module. Reason:\n";
- echo $oResult->userinfo."\n\n";
- exit(1);
+ if (!checkModulePresence()) {
+ fail('error loading nominatim.so module');
}
if (!file_exists(CONST_ExtraDataPath.'/country_osm_grid.sql.gz')) {
$osm2pgsql .= ' -H ' . $aDSNInfo['hostspec'];
}
- $procenv = null;
+ $aProcEnv = null;
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'];
- runWithEnv($osm2pgsql, $procenv);
+ runWithEnv($osm2pgsql, $aProcEnv);
$oDB =& getDB();
if (!$aCMDResult['ignore-errors'] && !chksql($oDB->getRow('select * from place limit 1'))) {
if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
info('Create Functions');
$bDidSomething = true;
+
+ if (!checkModulePresence()) {
+ fail('error loading nominatim.so module');
+ }
+
create_sql_functions($aCMDResult);
}
fail(pg_last_error($aDBInstances[$iLoadThreads]->connection));
}
- $failed = false;
+ $bFailed = false;
for ($i = 0; $i <= $iLoadThreads; $i++) {
- while (($pgresult = pg_get_result($aDBInstances[$i]->connection)) !== false) {
- $resultStatus = pg_result_status($pgresult);
+ while (($hPGresult = pg_get_result($aDBInstances[$i]->connection)) !== false) {
+ $resultStatus = pg_result_status($hPGresult);
// 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($pgresult);
- echo '-- error text ' . $i . ': ' . $resultError . '\n';
- $failed = true;
+ $resultError = pg_result_error($hPGresult);
+ echo '-- error text ' . $i . ': ' . $resultError . "\n";
+ $bFailed = true;
}
}
}
- if ($failed) {
+ if ($bFailed) {
fail('SQL errors loading placex and/or location_property_osmline tables');
}
echo "\n";
if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
$sBaseCmd .= ' -U ' . $aDSNInfo['username'];
}
- $procenv = null;
+ $aProcEnv = null;
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');
- $status = runWithEnv($sBaseCmd.' -R 4', $procenv);
- if ($status != 0) {
- fail('error status ' . $status . ' running nominatim!');
+ $iStatus = runWithEnv($sBaseCmd.' -R 4', $aProcEnv);
+ if ($iStatus != 0) {
+ fail('error status ' . $iStatus . ' running nominatim!');
}
if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
info('Index ranks 5 - 25');
- $status = runWithEnv($sBaseCmd.' -r 5 -R 25', $procenv);
- if ($status != 0) {
- fail('error status ' . $status . ' running nominatim!');
+ $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');
- $status = runWithEnv($sBaseCmd.' -r 26', $procenv);
- if ($status != 0) {
- fail('error status ' . $status . ' running nominatim!');
+ $iStatus = runWithEnv($sBaseCmd.' -r 26', $aProcEnv);
+ if ($iStatus != 0) {
+ fail('error status ' . $iStatus . ' running nominatim!');
}
info('Index postcodes');
if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
$sCMD .= ' -U ' . $aDSNInfo['username'];
}
- $procenv = null;
+ $aProcEnv = null;
if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
- $procenv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
+ $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
}
$ahGzipPipes = null;
2 => array('file', '/dev/null', 'a')
);
$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');
// TODO: error checking
if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
$sCMD .= ' -U ' . $aDSNInfo['username'];
}
- $procenv = null;
+ $aProcEnv = null;
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;
- passthru($cmd, $result);
+ $iResult = -1;
+ passthru($sCmd, $iResult);
}
function replace_tablespace($sTemplate, $sTablespace, $sSql)
function create_sql_functions($aCMDResult)
{
- global $modulePath;
+ global $sModulePath;
$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']) {
$sTemplate = str_replace('RETURN NEW; -- %DIFFUPDATES%', '--', $sTemplate);
}
}
pgsqlRunScript($sTemplate);
}
+
+function checkModulePresence()
+{
+ // Try accessing the C module, so we know early if something is wrong
+ // and can simply error out.
+ global $sModulePath;
+ $sSQL = "CREATE FUNCTION nominatim_test_import_func(text) RETURNS text AS '";
+ $sSQL .= $sModulePath."/nominatim.so', 'transliteration' LANGUAGE c IMMUTABLE STRICT";
+ $sSQL .= ';DROP FUNCTION nominatim_test_import_func(text);';
+
+ $oDB =& getDB();
+ $oResult = $oDB->query($sSQL);
+
+ $bResult = true;
+
+ if (PEAR::isError($oResult)) {
+ echo "\nERROR: Failed to load nominatim module. Reason:\n";
+ echo $oResult->userinfo."\n\n";
+ $bResult = false;
+ }
+
+ return $bResult;
+}
projects / nominatim.git / blobdiff