mysql/core_cities_merge.sql

[Pman.Core] / mysql / core_cities_merge.sql

diff --git a/mysql/core_cities_merge.sql b/mysql/core_cities_merge.sql
index 269e6d8..b687a4a 100644 (file)
--- a/mysql/core_cities_merge.sql
+++ b/mysql/core_cities_merge.sql
@@ -1,4 +1,7 @@
 
+-- not sure if this is used anywhere...
+
+
 DROP FUNCTION IF EXISTS core_cities_merge_country;
 DELIMITER $$
 CREATE FUNCTION core_cities_merge_country()  RETURNS INT DETERMINISTIC
@@ -37,6 +40,7 @@ CREATE FUNCTION core_cities_merge_country()  RETURNS INT DETERMINISTIC
         SET v_count = 0;
 
         OPEN co_csr;
+        
         co_loop: LOOP
             FETCH co_csr INTO v_id,v_iso,v_local_name,v_in_location;
             
@@ -226,7 +230,7 @@ CREATE FUNCTION core_cities_merge_city()  RETURNS INT DETERMINISTIC
 
                     END IF;
 
-                    SELECT id INTO v_divsion_id FROM core_geoip_divsion WHERE name = v_local_name_tmp AND country_id = v_country_id;
+                    SELECT id INTO v_division_id FROM core_geoip_division WHERE name = v_local_name_tmp AND country_id = v_country_id;
 
                 END IF;
 
@@ -237,7 +241,6 @@ CREATE FUNCTION core_cities_merge_city()  RETURNS INT DETERMINISTIC
             SELECT id INTO v_city_id FROM core_geoip_city WHERE name = v_local_name AND country_id = v_country_id AND division_id = v_division_id;
 
             IF(v_city_id = 0) THEN
-                
                         
                 INSERT INTO core_geoip_city (name, country_id, division_id) VALUES (v_local_name, v_country_id, v_division_id);
                    
@@ -262,7 +265,7 @@ CREATE FUNCTION core_cities_merge_city()  RETURNS INT DETERMINISTIC
 DELIMITER ; 
 
 
------------------------------------------------------------------------------------------------------------------
+--   ---------------------------------------------------------------------------------------------------------------
 
 
 DROP FUNCTION IF EXISTS core_country_locations;
@@ -364,12 +367,16 @@ CREATE FUNCTION core_country_blocks()  RETURNS INT DETERMINISTIC
             AND
                 network_start_ip REGEXP '::ffff:[0-9]+.[0-9]+.[0-9]+.[0-9]+$';
         
-        SELECT COUNT(network_start_ip) INTO v_total FROM country_blocks WHERE geoname_id != 0 AND registered_country_geoname_id != 0 AND geoname_id = registered_country_geoname_id AND network_start_ip REGEXP '::ffff:[0-9]+.[0-9]+.[0-9]+.[0-9]+$';
+        SELECT COUNT(network_start_ip) INTO v_total FROM country_blocks
+                WHERE geoname_id != 0 AND registered_country_geoname_id != 0
+                AND geoname_id = registered_country_geoname_id AND network_start_ip REGEXP '::ffff:[0-9]+.[0-9]+.[0-9]+.[0-9]+$';
 
         SET v_count = 0;
 
         OPEN csr;
+        
         read_loop: LOOP
+        
             FETCH csr INTO v_network_start_ip,v_network_mask_length,v_geoname_id,v_is_anonymous_proxy,v_is_satellite_provider;
             
             SET v_count = v_count + 1;