From d3ded290f59315b2782d6bb9472a0b301240d210 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 26 Sep 2022 08:11:02 +0200 Subject: [PATCH] Case-independent lookup of Nationality in dictionary (some have lower case..) --- ENI2/Excel/ExcelUtil.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs index c69618b2..6aa03f40 100644 --- a/ENI2/Excel/ExcelUtil.cs +++ b/ENI2/Excel/ExcelUtil.cs @@ -2265,18 +2265,18 @@ namespace ENI2.Excel pas.IsDeparture = true; pas.NotificationSchengen = notificationSchengen; pas.NotificationPAX = notificationPax; - pas.PassengerLastName = lastName; - pas.PassengerFirstName = reader.ReadText(pasFirstName); + pas.PassengerLastName = lastName; + pas.PassengerFirstName = reader.ReadText(pasFirstName); pas.PassengerGender = reader.ReadGender(pasGender); - pas.PassengerNationality = reader.ReadNationality(pasNationality); + pas.PassengerNationality = reader.ReadNationality(pasNationality); // TODO: Nicht klar ob hier LOCODEs kommen oder nicht - pas.PassengerPortOfEmbarkation = reader.ReadTextNoWhitespace(pasEmbarkation); - pas.PassengerPortOfDisembarkation = reader.ReadTextNoWhitespace(pasDebarkation); + pas.PassengerPortOfEmbarkation = reader.ReadTextNoWhitespace(pasEmbarkation); + pas.PassengerPortOfDisembarkation = reader.ReadTextNoWhitespace(pasDebarkation); pas.PassengerInTransit = reader.ReadBoolean(pasTransit); - pas.PassengerPlaceOfBirth = reader.ReadText(pasPlaceOfBirth); + pas.PassengerPlaceOfBirth = reader.ReadText(pasPlaceOfBirth); pas.PassengerDateOfBirth = reader.ReadBirthDate(pasDateOfBirth); pas.PassengerIdentityDocumentType = reader.ReadIdentityDocumentType(pasIdentDocType); - pas.PassengerIdentityDocumentId = reader.ReadText(pasIdentDocId); + pas.PassengerIdentityDocumentId = reader.ReadText(pasIdentDocId); pas.PassengerVisaNumber = reader.ReadText(pasVisaNo); pas.PassengerIdentityDocumentIssuingState = reader.ReadNationality(pasIssuing); pas.PassengerIdentityDocumentExpiryDate = reader.ReadDate(pasExpiryDate); @@ -2481,11 +2481,16 @@ namespace ENI2.Excel public static string ReadNationality(string nationality) { string result = null; + nationality = nationality.Trim(); if(CREW.NationalityDict.ContainsKey(nationality)) { result = nationality; } + else if(CREW.NationalityDict.ContainsKey(nationality.ToUpper())) + { + result = CREW.NationalityDict[nationality.ToUpper()]; + } else if(_countryImportDict.ContainsKey(nationality)) { result = _countryImportDict[nationality];