don't log IPv6 IPs for the moment

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index c6cc7773dfdef7f119db162f94570fea80681fce..b93e4f827988c37060570f47e57c310c3575f483 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -540,10 +540,8 @@ if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
         $sSQL .= '  FROM us_postcode WHERE postcode NOT IN';
         $sSQL .= '        (SELECT postcode FROM location_postcode';
         $sSQL .= "          WHERE country_code = 'us')";
         $sSQL .= '  FROM us_postcode WHERE postcode NOT IN';
         $sSQL .= '        (SELECT postcode FROM location_postcode';
         $sSQL .= "          WHERE country_code = 'us')";

-    } else {
-        $sSQL .= 'TRUNCATE TABLE us_postcode';
+        if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));

     }
     }

-    if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));

 
     // add missing postcodes for GB (if available)
     $sSQL  = 'INSERT INTO location_postcode';
 
     // add missing postcodes for GB (if available)
     $sSQL  = 'INSERT INTO location_postcode';


@@ -657,6 +655,7 @@ if ($aCMDResult['drop']) {
                     'import_polygon_*',
                     'import_status',
                     'place_addressline',
                     'import_polygon_*',
                     'import_status',
                     'place_addressline',

+                    'location_postcode',

                     'location_property*',
                     'placex',
                     'search_name',
                     'location_property*',
                     'placex',
                     'search_name',


@@ -664,7 +663,6 @@ if ($aCMDResult['drop']) {
                     'word',
                     'query_log',
                     'new_query_log',
                     'word',
                     'query_log',
                     'new_query_log',

-                    'gb_postcode',

                     'spatial_ref_sys',
                     'country_name',
                     'place_classtype_*'
                     'spatial_ref_sys',
                     'country_name',
                     'place_classtype_*'