Compare commits

..

No commits in common. "e965bc6b89e507e15eb85b449b8c0b7c05c6ed57" and "6eb265ea5585aad1e3db50eb509205a5e27dc358" have entirely different histories.

3 changed files with 6 additions and 8 deletions

View File

@ -36,8 +36,8 @@
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion> <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>3</ApplicationRevision> <ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>7.2.11.3</ApplicationVersion> <ApplicationVersion>7.2.11.2</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

View File

@ -68,10 +68,7 @@ namespace bsmd.database
while(reader.Read()) while(reader.Read())
{ {
string type = ""; if (reader.IsDBNull(4)) continue; // this row has no type -> ignore
if (!reader.IsDBNull(4))
type = reader.GetString(4);
HAZPosTemplate hpt = new HAZPosTemplate(); HAZPosTemplate hpt = new HAZPosTemplate();
hpt.Description = reader.GetString(0); hpt.Description = reader.GetString(0);
if (!reader.IsDBNull(1)) if (!reader.IsDBNull(1))
@ -84,7 +81,8 @@ namespace bsmd.database
if (specRefString.Equals("JA", StringComparison.OrdinalIgnoreCase) || specRefString.Equals("Yes", StringComparison.OrdinalIgnoreCase)) hpt.SpecRef15_19 = true; if (specRefString.Equals("JA", StringComparison.OrdinalIgnoreCase) || specRefString.Equals("Yes", StringComparison.OrdinalIgnoreCase)) hpt.SpecRef15_19 = true;
if (specRefString.Equals("NEIN", StringComparison.OrdinalIgnoreCase) || specRefString.Equals("No", StringComparison.OrdinalIgnoreCase)) hpt.SpecRef15_19 = false; if (specRefString.Equals("NEIN", StringComparison.OrdinalIgnoreCase) || specRefString.Equals("No", StringComparison.OrdinalIgnoreCase)) hpt.SpecRef15_19 = false;
} }
string type = reader.GetString(4);
switch(type) switch(type)
{ {
case "IBC": hpt.TemplateType = SublistType.IBC; break; case "IBC": hpt.TemplateType = SublistType.IBC; break;
@ -92,7 +90,7 @@ namespace bsmd.database
case "IMSBC": hpt.TemplateType = SublistType.IMSBC ; break; case "IMSBC": hpt.TemplateType = SublistType.IMSBC ; break;
case "MARPOL": hpt.TemplateType = SublistType.MARPOL; break; case "MARPOL": hpt.TemplateType = SublistType.MARPOL; break;
default: default:
break; continue; // ignore this thing
} }
if(!reader.IsDBNull(5)) if(!reader.IsDBNull(5))

Binary file not shown.