From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 15 May 2016 07:41:11 +0000 (+0200)
Subject: fix syntax in load-data function
X-Git-Tag: v3.0.0~170^2~10
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/0fcab79486d68bcf9d24b5580ce605b82253502d

fix syntax in load-data function

Also makes sure that load data runs with at least 2 threads: one
for loading placex and one for loading osmline.
---

diff --git a/utils/setup.php b/utils/setup.php
index b9045e70..5ae604d4 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -396,30 +396,30 @@
 
 		echo "Load Data\n";
 		$aDBInstances = array();
-		for($i = 0; $i < $iInstances; $i++)
+		$iLoadThreads = max(1, $iInstances - 1);
+		for($i = 0; $i < $iLoadThreads; $i++)
 		{
 			$aDBInstances[$i] =& getDB(true);
-			if( $i < $iInstances-1 )
-			{
-				$sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, ';
-				$sSQL .= 'housenumber, street, addr_place, isin, postcode, country_code, extratags, ';
-				$sSQL .= 'geometry) select * from place where osm_id % '.$iInstances-1.' = '.$i;
-			}
-			else
-			{
-				// last thread for interpolation lines
-				$sSQL = 'select insert_osmline (osm_id, housenumber, street, addr_place, postcode, country_code, ';
-				$sSQL .= 'geometry) from place where ';
-				$sSQL .= 'class=\'place\' and type=\'houses\' and osm_type=\'W\' and ST_GeometryType(geometry) = \'ST_LineString\'';
-			}
+			$sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, ';
+			$sSQL .= 'housenumber, street, addr_place, isin, postcode, country_code, extratags, ';
+			$sSQL .= 'geometry) select * 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));
 		}
+		// last thread for interpolation lines
+		$aDBInstances[$iLoadThreads] =& getDB(true);
+		$sSQL = 'select insert_osmline (osm_id, housenumber, street, addr_place, postcode, country_code, ';
+		$sSQL .= '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));
+
 		$bAnyBusy = true;
 		while($bAnyBusy)
 		{
 			$bAnyBusy = false;
-			for($i = 0; $i < $iInstances; $i++)
+			for($i = 0; $i <= $iLoadThreads; $i++)
 			{
 				if (pg_connection_busy($aDBInstances[$i]->connection)) $bAnyBusy = true;
 			}