From a4c63c094f12766e49a142425af8455cc4524ea5 Mon Sep 17 00:00:00 2001 From: Frederik Ramm Date: Fri, 18 Feb 2011 09:18:37 +0000 Subject: [PATCH] * use osm2pgsql from $PATH if none present locally * do not display usage() on successful postcode generation --- utils/setup.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/setup.php b/utils/setup.php index 352aa943..c7667b15 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -96,8 +96,10 @@ echo "Import\n"; $bDidSomething = true; - if (!file_exists(CONST_BasePath.'/osm2pgsql/osm2pgsql')) fail("please download and build osm2pgsql"); - passthru(CONST_BasePath.'/osm2pgsql/osm2pgsql -lsc -O gazetteer -C 10000 --hstore -d nominatim '.$aCMDResult['osm-file']); + $osm2pgsql = CONST_BasePath.'/osm2pgsql/osm2pgsql'; + if (!file_exists($osm2pgsql)) $osm2pgsql = trim(`which osm2pgsql`); + if (!file_exists($osm2pgsql)) fail("please download and build osm2pgsql"); + passthru($osm2pgsql.' -lsc -O gazetteer -C 10000 --hstore -d nominatim '.$aCMDResult['osm-file']); $oDB =& getDB(); $x = $oDB->getRow('select * from place limit 1'); @@ -288,6 +290,7 @@ if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) { + $bDidSomething = true; $oDB =& getDB(); if (!pg_query($oDB->connection, 'DELETE from placex where osm_type=\'P\'')) fail(pg_last_error($oDB->connection)); $sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,country_code,geometry) "; -- 2.45.1