order final data set by importance, ignore search query score (importance seems to...

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 352aa943edc620bfa744de92993c8835fb1b84b7..0b5392da2079b38a59dbdb5270447c40ad3a0b80 100755 (executable)
--- 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) ";
@@ -369,22 +372,18 @@
                $sCMD = 'psql -p '.$aDSNInfo['port'].' '.$aDSNInfo['database'];
                $aDescriptors = array(
                        0 => array('pipe', 'r'),
-                       1 => array('pipe', 'w'),
-                       2 => array('file', '/dev/null', 'a')
+                       1 => STDOUT, 
+                       2 => STDERR
                );
                $ahPipes = null;
                $hProcess = proc_open($sCMD, $aDescriptors, $ahPipes);
                if (!is_resource($hProcess)) fail('unable to start pgsql');
 
-               fwrite($ahPipes[0], $sScript);
-               fclose($ahPipes[0]);
-
-               // TODO: error checking
-               while(!feof($ahPipes[1]))
+               while(strlen($sScript))
                {
-                       echo fread($ahPipes[1], 4096);
+                       $written = fwrite($ahPipes[0], $sScript);
+                       $sScript = substr($sScript, $written);
                }
-               fclose($ahPipes[1]);
-
+               fclose($ahPipes[0]);
                proc_close($hProcess);
        }