mysql/mysql_change_charset.sql

[Pman.Core] / mysql / core_cities_merge.sql

diff --git a/mysql/core_cities_merge.sql b/mysql/core_cities_merge.sql
index 8aae806..0c520bf 100644 (file)
--- a/mysql/core_cities_merge.sql
+++ b/mysql/core_cities_merge.sql
@@ -37,6 +37,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;
             
@@ -173,6 +174,7 @@ CREATE FUNCTION core_cities_merge_city()  RETURNS INT DETERMINISTIC
 
         
         DECLARE v_iso_tmp TEXT DEFAULT '';
+        DECLARE v_iso_tmp_tmp TEXT DEFAULT '';
         DECLARE v_local_name_tmp TEXT DEFAULT '';
         DECLARE v_type_tmp TEXT DEFAULT '';
         DECLARE v_in_location_tmp INT DEFAULT 0;
@@ -204,6 +206,7 @@ CREATE FUNCTION core_cities_merge_city()  RETURNS INT DETERMINISTIC
             SET v_city_id = 0;
 
             SET v_iso_tmp = '';
+            SET v_iso_tmp_tmp = '';
             SET v_local_name_tmp = '';
             SET v_type_tmp = '';
             SET v_in_location_tmp = 0;
@@ -213,20 +216,18 @@ CREATE FUNCTION core_cities_merge_city()  RETURNS INT DETERMINISTIC
 
                 IF v_type_tmp = 'CO' THEN
                     SELECT id INTO v_country_id FROM core_geoip_country WHERE code = v_iso_tmp;
-
-                   -- INSERT INTO core_geoip_city (name, country_id) VALUES (v_local_name, v_id_tmp);
                 END IF;
 
                 IF v_type_tmp = 'RE' THEN
                     IF v_in_location_tmp != 0 THEN
 
-                        SELECT iso INTO v_iso_tmp FROM meta_location WHERE id = v_in_location;
+                        SELECT iso INTO v_iso_tmp_tmp FROM meta_location WHERE id = v_in_location_tmp;
 
-                        SELECT id INTO v_country_id FROM core_geoip_country WHERE code = v_iso_tmp;
+                        SELECT id INTO v_country_id FROM core_geoip_country WHERE code = v_iso_tmp_tmp;
 
                     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 +238,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 +262,7 @@ CREATE FUNCTION core_cities_merge_city()  RETURNS INT DETERMINISTIC
 DELIMITER ; 
 
 
------------------------------------------------------------------------------------------------------------------
+--   ---------------------------------------------------------------------------------------------------------------
 
 
 DROP FUNCTION IF EXISTS core_country_locations;
@@ -364,12 +364,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;