diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 08d545c8..1cc369c0 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -36,7 +36,7 @@ 5.4.0.0 true publish.html - 0 + 2 7.11.0.%2a false true diff --git a/bsmd.ExcelReadService/LocodeDB.cs b/bsmd.ExcelReadService/LocodeDB.cs index cf6ac2e6..67439ca4 100644 --- a/bsmd.ExcelReadService/LocodeDB.cs +++ b/bsmd.ExcelReadService/LocodeDB.cs @@ -45,7 +45,7 @@ namespace ENI2.Locode public static string LocodeFromCity(string city, string country) { string result = null; - string query = string.Format("SELECT city_code FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE countries.code = '{0}' AND locodes.port='t' AND (locodes.name like '{1}' OR locodes.name_wo_diacritics like '{1}')", + string query = string.Format("SELECT city_code FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE countries.code = '{0}' AND locodes.port=1 AND (locodes.name like '{1}' OR locodes.name_wo_diacritics like '{1}')", country, city); SQLiteCommand cmd = new SQLiteCommand(query, _con); IDataReader reader = cmd.ExecuteReader(); @@ -73,7 +73,7 @@ namespace ENI2.Locode if ((countryCode != null) && (lcLookup != null)) results.Add(lcLookup); } - string query = string.Format("SELECT city_code, countries.code FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE locodes.port='t' AND (locodes.name like '{0}' OR locodes.name_wo_diacritics like '{0}')", city); + string query = string.Format("SELECT city_code, countries.code FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE locodes.port=1 AND (locodes.name like '{0}' OR locodes.name_wo_diacritics like '{0}')", city); SQLiteCommand cmd = new SQLiteCommand(query, _con); IDataReader reader = cmd.ExecuteReader(); while (reader.Read()) @@ -103,7 +103,7 @@ namespace ENI2.Locode } } - string query = "SELECT locodes.name_wo_diacritics, city_code, countries.code FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE locodes.port='t' AND (locodes.name like $PAR OR locodes.name_wo_diacritics like $PAR)"; + string query = "SELECT locodes.name_wo_diacritics, city_code, countries.code FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE locodes.port=1 AND (locodes.name like $PAR OR locodes.name_wo_diacritics like $PAR)"; if(!onlyPorts) query = "SELECT locodes.name_wo_diacritics, city_code, countries.code FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE (locodes.name like $PAR OR locodes.name_wo_diacritics like $PAR)"; @@ -190,7 +190,7 @@ namespace ENI2.Locode try { string locodeUpper = locode.ToUpper(); - string query = string.Format("SELECT locodes.name_wo_diacritics FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE locodes.port='t' AND locodes.city_code = '{0}' AND countries.code = '{1}'", + string query = string.Format("SELECT locodes.name_wo_diacritics FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE locodes.port=1 AND locodes.city_code = '{0}' AND countries.code = '{1}'", locodeUpper.Substring(2), locodeUpper.Substring(0, 2)); SQLiteCommand cmd = new SQLiteCommand(query, _con); IDataReader reader = cmd.ExecuteReader(); diff --git a/misc/db.sqlite b/misc/db.sqlite index 4eefef87..ffbecee5 100644 Binary files a/misc/db.sqlite and b/misc/db.sqlite differ