Merge branch 'develop' into release/eni_7.11
This commit is contained in:
commit
ce0a7f052c
@ -32,7 +32,7 @@ namespace bsmd.Tool
|
|||||||
|
|
||||||
// preload countries
|
// preload countries
|
||||||
Dictionary<string, int> countryDict = new Dictionary<string, int>();
|
Dictionary<string, int> countryDict = new Dictionary<string, int>();
|
||||||
|
|
||||||
SQLiteCommand countryCmd = new SQLiteCommand(connection);
|
SQLiteCommand countryCmd = new SQLiteCommand(connection);
|
||||||
countryCmd.CommandText = "SELECT id, code FROM countries";
|
countryCmd.CommandText = "SELECT id, code FROM countries";
|
||||||
SQLiteDataReader reader = countryCmd.ExecuteReader();
|
SQLiteDataReader reader = countryCmd.ExecuteReader();
|
||||||
@ -95,7 +95,7 @@ namespace bsmd.Tool
|
|||||||
if (code.Length < 3) continue;
|
if (code.Length < 3) continue;
|
||||||
|
|
||||||
currentLocodes.Add(country + code);
|
currentLocodes.Add(country + code);
|
||||||
|
|
||||||
ccode.Value = country;
|
ccode.Value = country;
|
||||||
lcode.Value = code;
|
lcode.Value = code;
|
||||||
|
|
||||||
@ -172,6 +172,8 @@ namespace bsmd.Tool
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
string locode = reader2.GetString(0) + reader2.GetString(2);
|
string locode = reader2.GetString(0) + reader2.GetString(2);
|
||||||
|
if (locode.Equals("ZZUKN")) continue;
|
||||||
|
if (locode.Equals("ZZNOK")) continue;
|
||||||
if (!currentLocodes.Contains(locode))
|
if (!currentLocodes.Contains(locode))
|
||||||
deleteIds.Add(reader2.GetInt32(1));
|
deleteIds.Add(reader2.GetInt32(1));
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
misc/db.sqlite
BIN
misc/db.sqlite
Binary file not shown.
Loading…
Reference in New Issue
Block a user