safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Merge branch 'master' of github.com:twain47/Nominatim

Browse Source
This commit is contained in:
Brian Quinion
2012-05-15 03:06:12 +02:00
parent 0ab9c90708 7c4b68d2ea
commit f17c5345ec
5 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/setup.php
View File

@@ -264,6 +264,14 @@
if (!pg_query($oDB->connection, 'CREATE SEQUENCE seq_place start 100000')) fail(pg_last_error($oDB->connection));
echo '.';
// pre-create the word list
if (!pg_query($oDB->connection, 'select count(make_keywords(v)) from (select distinct svals(name) as v from place) as w where v is not null;')) fail(pg_last_error($oDB->connection));
echo '.';
if (!pg_query($oDB->connection, 'select count(make_keywords(v)) from (select distinct postcode as v from place) as w where v is not null;')) fail(pg_last_error($oDB->connection));
echo '.';
if (!pg_query($oDB->connection, 'select count(getorcreate_housenumber_id(v)) from (select distinct housenumber as v from place where housenumber is not null) as w;')) fail(pg_last_error($oDB->connection));
echo '.';
$aDBInstances = array();
for($i = 0; $i < $iInstances; $i++)
{
@@ -423,11 +431,7 @@
$sOutputFile = '';
if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
$sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile;
passthru($sBaseCmd.' -R 4');
pgsqlRunScript('ANALYSE');
passthru($sBaseCmd.' -r 5 -R 25');
pgsqlRunScript('ANALYSE');
passthru($sBaseCmd.' -r 26');
passthru($sBaseCmd);
}
if ($aCMDResult['create-search-indices'] || $aCMDResult['all'])