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 b9045e7050f7b3afef5ca22b508de10d50340132..5ae604d41e2bb0e61c11b3947ff577cdd8b87530 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -396,30 +396,30 @@
 
                echo "Load Data\n";
                $aDBInstances = array();
 
                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);
                {
                        $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));
                }
                        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;
                $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;
                        }
                        {
                                if (pg_connection_busy($aDBInstances[$i]->connection)) $bAnyBusy = true;
                        }