osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-25 22:12:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

support custom psql port in setup.php

Browse Source 
patch by b3nn0 (see http://trac.openstreetmap.org/ticket/4736)
This commit is contained in:
Sarah Hoffmann 2013-01-14 22:48:52 +01:00
parent a54c5e3003
commit 20a852b554
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/setup.php
View File

@ -95,7 +95,7 @@
{ {
fail('database already exists ('.CONST_Database_DSN.')'); fail('database already exists ('.CONST_Database_DSN.')');
} }
passthruCheckReturn('createdb -E UTF-8 '.$aDSNInfo['database']); passthruCheckReturn('createdb -E UTF-8 -p '.$aDSNInfo['port'].' '.$aDSNInfo['database']);
} }
if ($aCMDResult['setup-db'] || $aCMDResult['all']) if ($aCMDResult['setup-db'] || $aCMDResult['all'])
@ -114,7 +114,7 @@
exit; exit;
} }
passthru('createlang plpgsql '.$aDSNInfo['database']); passthru('createlang plpgsql -p '.$aDSNInfo['port'].' '.$aDSNInfo['database']);
$pgver = (float) CONST_Postgresql_Version; $pgver = (float) CONST_Postgresql_Version;
if ($pgver < 9.1) { if ($pgver < 9.1) {
pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql'); pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
@ -156,6 +156,7 @@
} }
$osm2pgsql .= ' -lsc -O gazetteer --hstore'; $osm2pgsql .= ' -lsc -O gazetteer --hstore';
$osm2pgsql .= ' -C '.$iCacheMemory; $osm2pgsql .= ' -C '.$iCacheMemory;
$osm2pgsql .= ' -P '.$aDSNInfo['port'];
$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file']; $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
passthruCheckReturn($osm2pgsql); passthruCheckReturn($osm2pgsql);
@ -536,7 +537,7 @@
$bDidSomething = true; $bDidSomething = true;
$sOutputFile = ''; $sOutputFile = '';
if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output']; if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
$sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile; $sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$iInstances.$sOutputFile;
passthruCheckReturn($sBaseCmd.' -R 4'); passthruCheckReturn($sBaseCmd.' -R 4');
if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE'); if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
passthruCheckReturn($sBaseCmd.' -r 5 -R 25'); passthruCheckReturn($sBaseCmd.' -r 5 -R 25');