X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4d4b95923e87371b9203dd1bbbe74e12f61309a6..4c7145c2938022d8355f49eb89a5ae1a68217a18:/utils/setup.php diff --git a/utils/setup.php b/utils/setup.php index c61c43e3..6a809c73 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -369,7 +369,9 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) { $sSQL = "INSERT INTO placex ($sColumns) SELECT $sColumns FROM place WHERE osm_id % $iLoadThreads = $i"; $sSQL .= " and not (class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString')"; if ($aCMDResult['verbose']) echo "$sSQL\n"; - if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection)); + if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) { + fail(pg_last_error($aDBInstances[$i]->connection)); + } } // last thread for interpolation lines $aDBInstances[$iLoadThreads] =& getDB(true); @@ -378,7 +380,9 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) { $sSQL .= ' SELECT osm_id, address, geometry from place where '; $sSQL .= "class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString'"; if ($aCMDResult['verbose']) echo "$sSQL\n"; - if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection)); + if (!pg_send_query($aDBInstances[$iLoadThreads]->connection, $sSQL)) { + fail(pg_last_error($aDBInstances[$iLoadThreads]->connection)); + } $bAnyBusy = true; while ($bAnyBusy) {