dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.9.17: Bugfix Konvertierung Flag in Uppercase beim Import

Browse Source
This commit is contained in:
Daniel Schick 2022-02-08 07:37:18 +01:00
parent efba8793e9
commit fd34b2b23a
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ENI2/App.config
View File

@ -26,12 +26,10 @@
<value>1000</value> <value>1000</value>
</setting> </setting>
<setting name="LockingServerAddress" serializeAs="String"> <setting name="LockingServerAddress" serializeAs="String">
<value>http://heupferd/bsmd.LockingService/LockingService.svc</value> <value>http://192.168.2.24/LockingService/LockingService.svc</value>
<!--value>http://192.168.2.24/LockingService/LockingService.svc</value-->
</setting> </setting>
<setting name="ConnectionString" serializeAs="String"> <setting name="ConnectionString" serializeAs="String">
<!--value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value--> <value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
<value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value>
</setting> </setting>
</ENI2.Properties.Settings> </ENI2.Properties.Settings>
</applicationSettings> </applicationSettings>

2
ENI2/ENI2.csproj
View File

@ -37,7 +37,7 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>6.9.16.0</ApplicationVersion> <ApplicationVersion>6.9.17.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

10
ENI2/Excel/ExcelReader.cs
View File

@ -203,21 +203,25 @@ namespace ENI2.Excel
} }
/// <summary> /// <summary>
/// read nationality field an returns 2 Char ISO code (optional lookup) and "confirms" /// read nationality field, validation only via log (so none, really..)
/// the field
/// </summary> /// </summary>
/// <returns>uppercase 2 character flag code if valid, empty string otherwise</returns>
internal string ReadNationality(string lookup) internal string ReadNationality(string lookup)
{ {
string val = this.ReadText(lookup); string val = this.ReadText(lookup).Trim().ToUpper();
if ((val != null) && (val.Length == 2)) if ((val != null) && (val.Length == 2))
{ {
string isoCode = LocodeDB.CountryCodeFromName(val); string isoCode = LocodeDB.CountryCodeFromName(val);
if (isoCode == null) if (isoCode == null)
{
_log.ErrorFormat("Wrong ISO code {0}", val); _log.ErrorFormat("Wrong ISO code {0}", val);
val = "";
}
} }
else else
{ {
val = "";
_log.ErrorFormat("cannot read nationality {0}", lookup); _log.ErrorFormat("cannot read nationality {0}", lookup);
} }