From e5b3eb03b4e031185a6a63b3492ef46d7f6b2400 Mon Sep 17 00:00:00 2001 From: Juan carlos Date: Mon, 12 Aug 2024 18:50:34 +0200 Subject: [PATCH] Added more subdivions Added canada, Mexico, Argentina, Brazil and Japan --- .../db_adif_primary_subdvisions_data.cpp | 251 +++++++++++++++++- .../db_adif_primary_subdvisions_data.h | 5 + 2 files changed, 254 insertions(+), 2 deletions(-) diff --git a/src/database/db_adif_primary_subdvisions_data.cpp b/src/database/db_adif_primary_subdvisions_data.cpp index c9c0fa5f..9df3eec0 100644 --- a/src/database/db_adif_primary_subdvisions_data.cpp +++ b/src/database/db_adif_primary_subdvisions_data.cpp @@ -32,7 +32,9 @@ bool DB_ADIF_Primary_Subdvisions_data::addData() qDebug() << Q_FUNC_INFO << " - Checking if DB exists"; if (!isDBCreated()) return false; - + qDebug() << Q_FUNC_INFO << " - Adding 1"; + if (!add_Canada_1()) // Adds the data for Canada + return false; qDebug() << Q_FUNC_INFO << " - Adding 6"; if (!add_USA_6()) // Adds the data for Alaska return false; @@ -45,6 +47,15 @@ bool DB_ADIF_Primary_Subdvisions_data::addData() qDebug() << Q_FUNC_INFO << " - Adding 32"; if (!add_EA9_32()) // Adds the data for Ceuta y Melilla return false; + qDebug() << Q_FUNC_INFO << " - Adding 50"; + if (!add_Mexico_50()) // Adds the data for Mexico + return false; + qDebug() << Q_FUNC_INFO << " - Adding 100"; + if (!add_Argentina_100()) // Adds the data for Argentina + return false; + qDebug() << Q_FUNC_INFO << " - Adding 108"; + if (!add_Brazil_108()) // Adds the data for Brazil + return false; qDebug() << Q_FUNC_INFO << " - Adding 110"; if (!add_USA_110()) // Adds the data for Hawaii return false; @@ -63,7 +74,9 @@ bool DB_ADIF_Primary_Subdvisions_data::addData() qDebug() << Q_FUNC_INFO << " - Adding 291"; if (!add_USA_291()) // Adds the data for United States of America return false; - + qDebug() << Q_FUNC_INFO << " - Adding 339"; + if (!add_Japan_339()) // Adds the data for Japan + return false; return true; } @@ -92,6 +105,40 @@ bool DB_ADIF_Primary_Subdvisions_data::addValues(const QString &rows, const QStr return true; } +bool DB_ADIF_Primary_Subdvisions_data::add_Canada_1() +{ + // This function contains the Primary Subdivision data for Canada + // Source of data is https://www.adif.org (version 3.1.4) + // Last modification 20240620 + + QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted"); + QStringList values; + values.clear(); + values + << "'1', 'Nova Scotia', 'NS', '', '05', '09', '', '-1', '', '', 'N'" + << "'1', 'Quebec', 'QC', '', '02', '04', '', '-1', '', '', 'N'" + << "'1', 'Quebec', 'QC', '', '05', '09', '', '-1', '', '', 'N'" + << "'1', 'Ontario', 'ON', '', '04', '03', '', '-1', '', '', 'N'" + << "'1', 'Ontario', 'ON', '', '04', '04', '', '-1', '', '', 'N'" + << "'1', 'Manitoba', 'MB', '', '04', '03', '', '-1', '', '', 'N'" + << "'1', 'Manitoba', 'MB', '', '04', '04', '', '-1', '', '', 'N'" + << "'1', 'Saskatchewan', 'SK', '', '04', '03', '', '-1', '', '', 'N'" + << "'1', 'Alberta', 'AB', '', '04', '02', '', '-1', '', '', 'N'" + << "'1', 'British Columbia', 'BC', '', '03', '02', '', '-1', '', '', 'N'" + << "'1', 'Northwest Territories', 'NT', '', '01', '03', '', '-1', '', '', 'N'" + << "'1', 'Northwest Territories', 'NT', '', '02', '04', '', '-1', '', '', 'N'" + << "'1', 'Northwest Territories', 'NT', '', '04', '75', '', '-1', '', '', 'N'" + << "'1', 'New Brunswick', 'NB', '', '05', '09', '', '-1', '', '', 'N'" + << "'1', 'New foundland', 'NL', '', '02', '09', '', '-1', '', '', 'N'" + << "'1', 'New foundland', 'NL', '', '05', '09', '', '-1', '', '', 'N'" + << "'1', 'Yukon', 'YT', '', '01', '02', '', '-1', '', '', 'N'" + << "'1', 'Prince Edward island', 'PE', '', '05', '09', '', '-1', '', '', 'N'" + << "'1', 'Nunavut', 'NU', '', '02', '04', '', '-1', '', '', 'N'" + << "'1', 'Nunavut', 'NU', '', '02', '09', '', '-1', '', '', 'N'" + ; + return addValues(rows, values); +} + bool DB_ADIF_Primary_Subdvisions_data::add_USA_6() { // This function contains the Primary Subdivision data for Alaska @@ -154,6 +201,131 @@ bool DB_ADIF_Primary_Subdvisions_data::add_EA9_32() return addValues(rows, values); } +bool DB_ADIF_Primary_Subdvisions_data::add_Mexico_50() +{ + // This function contains the Primary Subdivision data for Mexico + // Source of data is https://www.adif.org (version 3.1.4) + // Last modification 20240620 + + QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted"); + QStringList values; + values.clear(); + values + << "'50', 'Colima', 'COL', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Distrito Federal', 'DF', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Estado de Mexico', 'EMX', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Guanajuato', 'GTO', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Hidalgo', 'HGO', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Jalisco', 'JAL', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Michoacan', 'MIC', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Morelos', 'MOR', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Nayarit', 'NAY', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Puebla', 'PUE', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Queretaro', 'QRO', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Tlaxcala', 'TLX', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Veracruz', 'VER', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Aguascalientes', 'AGS', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Baja California', 'BC', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Baja California Sur', 'BCS', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Chihuahua', 'CHH', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Coahuila', 'COA', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Durango', 'DGO', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Nuevo Leon', 'NL', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'San Luis Potosi', 'SLP', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Sinaloa', 'SIN', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Sonora', 'SON', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Tamaulipas', 'TMS', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Zacatecas', 'ZAC', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Campeche', 'CAM', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Chiapas', 'CHS', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Guerrero', 'GRO', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Oaxaca', 'OAX', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Quintana Roo', 'QTR', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Tabasco', 'TAB', 'XE', '06', '10', '', '-1', '', '', 'N'" + << "'50', 'Yucatan', 'YUC', 'XE', '06', '10', '', '-1', '', '', 'N'" + ; + return addValues(rows, values); +} + +bool DB_ADIF_Primary_Subdvisions_data::add_Argentina_100() +{ + // This function contains the Primary Subdivision data for Mexico + // Source of data is https://www.adif.org (version 3.1.4) + // Last modification 20240620 + + QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted"); + QStringList values; + values.clear(); + values + << "'100', 'Buenos Aires City', 'C', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Provincia de Buenos Aires', 'B', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Santa Fe', 'S', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Chaco', 'H', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Formosa', 'P', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Cordoba', 'X', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Misiones', 'N', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Entre Rios', 'E', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Tucuman', 'T', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Corrientes', 'W', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Mendoza', 'M', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Santiago del Estero', 'G', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Salta', 'A', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'San Juan', 'J', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'San Luis', 'D', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Catamarca', 'K', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'La Rioja', 'F', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Jujuy', 'Y', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'La Pampa', 'L', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Rio Negro', 'R', 'LU', '13', '14', '', '-1', '', '', 'N'" + << "'100', 'Chubut', 'U', 'LU', '13', '16', '', '-1', '', '', 'N'" + << "'100', 'Santa Cruz', 'Z', 'LU', '13', '16', '', '-1', '', '', 'N'" + << "'100', 'Tierra del Fuego', 'V', 'LU', '13', '16', '', '-1', '', '', 'N'" + << "'100', 'Neuquen', 'Q', 'LU', '13', '14', '', '-1', '', '', 'N'" + ; + return addValues(rows, values); +} + +bool DB_ADIF_Primary_Subdvisions_data::add_Brazil_108() +{ + // This function contains the Primary Subdivision data for Mexico + // Source of data is https://www.adif.org (version 3.1.4) + // Last modification 20240620 + + QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted"); + QStringList values; + values.clear(); + values + << "'108', 'Espirito Santo', 'ES', 'PY', '11', '15', '', '-1', '', '', 'N'" + << "'108', 'Goias', 'GO', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Santa Catarina', 'SC', 'PY', '11', '15', '', '-1', '', '', 'N'" + << "'108', 'Sergipe', 'SE', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Alagoas', 'AL', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Amazonas', 'AM', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Tocantins', 'TO', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Amapa', 'AP', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Paraiba', 'PB', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Maranhao', 'MA', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Rio Grande do Norte', 'RN', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Piuai', 'PI', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Brasila', 'DF', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Ceara', 'CE', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Acre', 'AC', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Mato Grosso do Sul', 'MS', 'PY', '11', '15', '', '-1', '', '', 'N'" + << "'108', 'Roraima', 'RR', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Rondonia', 'RO', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Rio de Janeiro', 'RJ', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Sao Paulo', 'SP', 'PY', '11', '15', '', '-1', '', '', 'N'" + << "'108', 'Rio Grande do Soul', 'RS', 'PY', '11', '15', '', '-1', '', '', 'N'" + << "'108', 'Minas Gerais', 'MG', 'PY', '11', '15', '', '-1', '', '', 'N'" + << "'108', 'Parana', 'PR', 'PY', '11', '15', '', '-1', '', '', 'N'" + << "'108', 'Bahia', 'BA', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Pernambuco', 'PE', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Para', 'PA', 'PY', '11', '13', '', '-1', '', '', 'N'" + << "'108', 'Mato Grosso', 'MT', 'PY', '11', '13', '', '-1', '', '', 'N'" + ; + return addValues(rows, values); +} + bool DB_ADIF_Primary_Subdvisions_data::add_USA_110() { // This function contains the Primary Subdivision data for Hawaii @@ -324,34 +496,46 @@ bool DB_ADIF_Primary_Subdvisions_data::add_USA_291() << "'291', 'Kentucky', 'KY', '', '04', '08', '', '-1', '', '', 'N'" << "'291', 'North Carolina', 'NC', '', '04', '08', '', '-1', '', '', 'N'" << "'291', 'South Carolina', 'SC', '', '05', '08', '', '-1', '', '', 'N'" + << "'291', 'Tennessee', 'TN', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Tennessee', 'TN', '', '04', '08', '', '-1', '', '', 'N'" << "'291', 'Virginia', 'VA', '', '05', '08', '', '-1', '', '', 'N'" + << "'291', 'Arkansas', 'AR', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Arkansas', 'AR', '', '04', '08', '', '-1', '', '', 'N'" + << "'291', 'Lousiana', 'LA', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Lousiana', 'LA', '', '04', '08', '', '-1', '', '', 'N'" + << "'291', 'Mississippi', 'MS', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Mississippi', 'MS', '', '04', '08', '', '-1', '', '', 'N'" << "'291', 'New Mexico', 'NM', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Oklahoma', 'OK', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Texas', 'TX', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'California', 'CA', '', '03', '06', '', '-1', '', '', 'N'" << "'291', 'Arizona', 'AZ', '', '03', '06', '', '-1', '', '', 'N'" + << "'291', 'Arizona', 'AZ', '', '03', '07', '', '-1', '', '', 'N'" << "'291', 'Idaho', 'ID', '', '03', '06', '', '-1', '', '', 'N'" << "'291', 'Montana', 'MT', '', '04', '06', '', '-1', '', '', 'N'" + << "'291', 'Montana', 'MT', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Nevada', 'NV', '', '03', '06', '', '-1', '', '', 'N'" << "'291', 'Oregon', 'OR', '', '03', '06', '', '-1', '', '', 'N'" << "'291', 'Utah', 'UT', '', '03', '06', '', '-1', '', '', 'N'" + << "'291', 'Utah', 'UT', '', '03', '07', '', '-1', '', '', 'N'" << "'291', 'Washington', 'WA', '', '03', '06', '', '-1', '', '', 'N'" << "'291', 'Wyoming', 'WY', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Michigan', 'MI', '', '04', '07', '', '-1', '', '', 'N'" + << "'291', 'Michigan', 'MI', '', '04', '08', '', '-1', '', '', 'N'" << "'291', 'Ohio', 'OH', '', '04', '08', '', '-1', '', '', 'N'" << "'291', 'West Virginia', 'WV', '', '05', '08', '', '-1', '', '', 'N'" << "'291', 'Illinois', 'IL', '', '04', '07', '', '-1', '', '', 'N'" + << "'291', 'Illinois', 'IL', '', '04', '08', '', '-1', '', '', 'N'" << "'291', 'Indiana', 'IN', '', '04', '08', '', '-1', '', '', 'N'" + << "'291', 'Wisconsin', 'WI', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Wisconsin', 'WI', '', '04', '08', '', '-1', '', '', 'N'" << "'291', 'Colorado', 'CO', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Iowa', 'IA', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Kansas', 'KS', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'Minnesota', 'MN', '', '04', '07', '', '-1', '', '', 'N'" + << "'291', 'Minnesota', 'MN', '', '04', '08', '', '-1', '', '', 'N'" << "'291', 'Missouri', 'MO', '', '04', '07', '', '-1', '', '', 'N'" + << "'291', 'Missouri', 'MO', '', '04', '08', '', '-1', '', '', 'N'" << "'291', 'Nebraska', 'NE', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'North dakota', 'ND', '', '04', '07', '', '-1', '', '', 'N'" << "'291', 'South Dakota', 'SD', '', '04', '07', '', '-1', '', '', 'N'" @@ -359,3 +543,66 @@ bool DB_ADIF_Primary_Subdvisions_data::add_USA_291() return addValues(rows, values); } + +bool DB_ADIF_Primary_Subdvisions_data::add_Japan_339() +{ + // This function contains the Primary Subdivision data for Japan + // Source of data is https://www.adif.org (version 3.1.4) + // Last modification 20240620 + + QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted"); + QStringList values; + values.clear(); + values + << "'339', 'Chiba', '12', 'JA', '25', '45', 'Kanto', '-1', '', '', 'N'" + << "'339', 'Gunma', '16', 'JA', '25', '45', 'Kanto', '-1', '', '', 'N'" + << "'339', 'Ibaraki', '14', 'JA', '25', '45', 'Kanto', '-1', '', '', 'N'" + << "'339', 'Kanagawa', '11', 'JA', '25', '45', 'Kanto', '-1', '', '', 'N'" + << "'339', 'Saitama', '13', 'JA', '25', '45', 'Kanto', '-1', '', '', 'N'" + << "'339', 'Tochigi', '15', 'JA', '25', '45', 'Kanto', '-1', '', '', 'N'" + << "'339', 'Tokyo', '10', 'JA', '25', '45', 'Kanto', '-1', '', '', 'N'" + << "'339', 'Yamanashi', '17', 'JA', '25', '45', 'Kanto', '-1', '', '', 'N'" + << "'339', 'Aichi', '20', 'JA', '25', '45', 'Tokai', '-1', '', '', 'N'" + << "'339', 'Gifu', '19', 'JA', '25', '45', 'Tokai', '-1', '', '', 'N'" + << "'339', 'Mie', '21', 'JA', '25', '45', 'Tokai', '-1', '', '', 'N'" + << "'339', 'Shizuoka', '18', 'JA', '25', '45', 'Tokai', '-1', '', '', 'N'" + << "'339', 'Hyogo', '27', 'JA', '25', '45', 'Kansai', '-1', '', '', 'N'" + << "'339', 'Kyoto', '22', 'JA', '25', '45', 'Kansai', '-1', '', '', 'N'" + << "'339', 'Nara', '24', 'JA', '25', '45', 'Kansai', '-1', '', '', 'N'" + << "'339', 'Osaka', '25', 'JA', '25', '45', 'Kansai', '-1', '', '', 'N'" + << "'339', 'Shiga', '23', 'JA', '25', '45', 'Kansai', '-1', '', '', 'N'" + << "'339', 'Wakayama', '26', 'JA', '25', '45', 'Kansai', '-1', '', '', 'N'" + << "'339', 'Hiroshima', '35', 'JA', '25', '45', 'Chugoku', '-1', '', '', 'N'" + << "'339', 'Okayama', '31', 'JA', '25', '45', 'Chugoku', '-1', '', '', 'N'" + << "'339', 'Shimane', '32', 'JA', '25', '45', 'Chugoku', '-1', '', '', 'N'" + << "'339', 'Tottori', '34', 'JA', '25', '45', 'Chugoku', '-1', '', '', 'N'" + << "'339', 'Yamaguchi', '33', 'JA', '25', '45', 'Chugoku', '-1', '', '', 'N'" + << "'339', 'Ehime', '38', 'JA', '25', '45', 'Shikoku', '-1', '', '', 'N'" + << "'339', 'Kagawa', '36', 'JA', '25', '45', 'Shikoku', '-1', '', '', 'N'" + << "'339', 'Kochi', '39', 'JA', '25', '45', 'Shikoku', '-1', '', '', 'N'" + << "'339', 'Tokushima', '37', 'JA', '25', '45', 'Shikoku', '-1', '', '', 'N'" + << "'339', 'Fukuoka', '40', 'JA', '25', '45', 'Kyushu', '-1', '', '', 'N'" + << "'339', 'Kagoshima', '46', 'JA', '25', '45', 'Kyushu', '-1', '', '', 'N'" + << "'339', 'Kumamoto', '43', 'JA', '25', '45', 'Kyushu', '-1', '', '', 'N'" + << "'339', 'Miyazaki', '45', 'JA', '25', '45', 'Kyushu', '-1', '', '', 'N'" + << "'339', 'Nagasaki', '42', 'JA', '25', '45', 'Kyushu', '-1', '', '', 'N'" + << "'339', 'Oita', '44', 'JA', '25', '45', 'Kyushu', '-1', '', '', 'N'" + << "'339', 'Okinawa', '47', 'JA', '25', '45', 'Kyushu', '-1', '', '', 'N'" + << "'339', 'Saga', '41', 'JA', '25', '45', 'Kyushu', '-1', '', '', 'N'" + << "'339', 'Akita', '04', 'JA', '25', '45', 'Tohoku', '-1', '', '', 'N'" + << "'339', 'Aomori', '02', 'JA', '25', '45', 'Tohoku', '-1', '', '', 'N'" + << "'339', 'Fukushima', '07', 'JA', '25', '45', 'Tohoku', '-1', '', '', 'N'" + << "'339', 'Iwate', '03', 'JA', '25', '45', 'Tohoku', '-1', '', '', 'N'" + << "'339', 'Miyagi', '06', 'JA', '25', '45', 'Tohoku', '-1', '', '', 'N'" + << "'339', 'Yamagata', '05', 'JA', '25', '45', 'Tohoku', '-1', '', '', 'N'" + << "'339', 'Hokkaido', '01', 'JA', '25', '45', 'Hokkaido', '-1', '', '', 'N'" + << "'339', 'Fukui', '29', 'JA', '25', '45', 'Hokuriku', '-1', '', '', 'N'" + << "'339', 'Ishikawa', '30', 'JA', '25', '45', 'Hokuriku', '-1', '', '', 'N'" + << "'339', 'Toyama', '28', 'JA', '25', '45', 'Hokuriku', '-1', '', '', 'N'" + << "'339', 'Nagano', '09', 'JA', '25', '45', 'Shinestu', '-1', '', '', 'N'" + << "'339', 'Niigata', '08', 'JA', '25', '45', 'Shinestu', '-1', '', '', 'N'" + ; + + return addValues(rows, values); +} + diff --git a/src/database/db_adif_primary_subdvisions_data.h b/src/database/db_adif_primary_subdvisions_data.h index 9eb7e180..9c5cb8e5 100644 --- a/src/database/db_adif_primary_subdvisions_data.h +++ b/src/database/db_adif_primary_subdvisions_data.h @@ -52,16 +52,21 @@ private: QueryExecutor *exe; bool isDBCreated(); // This function checks if the DB is created. bool addValues(const QString &rows, const QStringList &values); + bool add_Canada_1(); // Adds the data for Canada bool add_USA_6(); // Adds the data for Alaska bool add_EA6_21(); // Adds the data for Balearic Is bool add_EA8_29(); // Adds the data for Canary Is bool add_EA9_32(); // Adds the data for Ceuta y Melilla + bool add_Mexico_50(); // Adds the data for Mexico + bool add_Argentina_100();// Adds the data for Argentina + bool add_Brazil_108(); // Adds the data for Brazil bool add_EA_281(); // Adds the data for Spain bool add_USA_110(); // Adds the data for Hawaii bool add_CT_149(); // Adds the data for Azores bool add_CT_256(); // Adds the data for Madeira bool add_CT_272(); // Adds the data for Portugal bool add_USA_291(); // Adds the data for United States of America + bool add_Japan_339(); // Adds the data for Japan };