Update to latest NHapi and bug fixes with that newest version

dib0 · dib0 · commit 078fdf339826 · 2015-04-12T17:02:14.000+02:00
diff --git a/Base/IO/HL7InputStreamMessageEnumerator.cs b/Base/IO/HL7InputStreamMessageEnumerator.cs
@@ -47,7 +47,11 @@ public IMessage Current
         {
             get
             {
-                return parser.Parse(enumerator.Current);
+                string curr = enumerator.Current;
+                if (string.IsNullOrEmpty(curr))
+                    return null;
+
+                return parser.Parse(curr);
             }
         }
 
diff --git a/Base/NHapiTools.Base.csproj b/Base/NHapiTools.Base.csproj
@@ -77,8 +77,6 @@
     <Compile Include="Model\GenericMessageWrapper.cs" />
     <Compile Include="Net\SimpleMLLPClient.cs" />
     <Compile Include="Parser\EnhancedModelClassFactory.cs" />
-    <Compile Include="Parser\HL7Package.cs" />
-    <Compile Include="Parser\PackageManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Util\Ack.cs" />
     <Compile Include="IO\HL7InputStreamMessageStringEnumerator.cs" />
diff --git a/Base/Parser/EnhancedModelClassFactory.cs b/Base/Parser/EnhancedModelClassFactory.cs
@@ -50,6 +50,14 @@ public override Type GetMessageClass(string theName, string theVersion, bool isE
 
             return typeof(NHapiTools.Base.Model.GenericMessageWrapper);
         }
+
+        public override Type GetSegmentClass(string theName, string theVersion)
+        {
+            List<string> l = DefaultModelClassFactory.PackageList("2.3");
+
+            Type t = base.GetSegmentClass(theName, theVersion);
+            return t;
+        }
         #endregion
 
         #region Public properties
diff --git a/Base/Parser/HL7Package.cs b/Base/Parser/HL7Package.cs
diff --git a/Base/Parser/PackageManager.cs b/Base/Parser/PackageManager.cs
diff --git a/Base/Properties/AssemblyInfo.cs b/Base/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NHapiTools.Base")]
-[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2014 - 2014")]
+[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/BuildResult/NHapiTools.Model.V21.dll b/BuildResult/NHapiTools.Model.V21.dll
diff --git a/BuildResult/NHapiTools.Model.V22.dll b/BuildResult/NHapiTools.Model.V22.dll
diff --git a/BuildResult/NHapiTools.Model.V251.dll b/BuildResult/NHapiTools.Model.V251.dll
diff --git a/BuildResult/Release notes.txt b/BuildResult/Release notes.txt
@@ -12,8 +12,11 @@ curve and not everything works as easy as it should. NHapiTools aims to improve
 - Two sets of context implementation to easily add all or configurable validation rules.
 
 3. Changelog
+- V1.6 Release (April 2015)
+  Updated to work with NuGet. Updated to the latest version of NHapi and fixed some bugs.
+  
 - V1.5 Release (April 2015)
-  Fixzed bug in ERR segment. Added custom ACK message classes for HL7 V2.2 and V2.1 since these seem to be missing from NHapi.
+  Fixed bug in ERR segment. Added custom ACK message classes for HL7 V2.2 and V2.1 since these seem to be missing from NHapi.
 
 - V1.4 Release (December 2014)
   Added more HL7 versions. Finished documentation.
diff --git a/Model.V21/Properties/AssemblyInfo.cs b/Model.V21/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NHapiTools.Model.V23")]
-[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2014")]
+[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Model.V22/Properties/AssemblyInfo.cs b/Model.V22/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NHapiTools.Model.V23")]
-[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2014")]
+[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Model.V23/Properties/AssemblyInfo.cs b/Model.V23/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NHapiTools.Model.V23")]
-[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2014")]
+[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Model.V231/Properties/AssemblyInfo.cs b/Model.V231/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Model.V24/Properties/AssemblyInfo.cs b/Model.V24/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NHapiTools.Model.V24")]
-[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2014")]
+[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Model.V25/Properties/AssemblyInfo.cs b/Model.V25/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Model.V251/Properties/AssemblyInfo.cs b/Model.V251/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/NuGet/NHapiTools.nuspec b/NuGet/NHapiTools.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>NHapiTools</id>
-    <version>1.5.0.0</version>
+    <version>1.6.0.0</version>
     <authors>Division by Zero</authors>
     <owners>Division by Zero</owners>
 	<licenseUrl>https://github.com/dib0/NHapiTools/blob/master/LICENSE</licenseUrl>
diff --git a/TestApp.CustomImplementation.V23/Properties/AssemblyInfo.cs b/TestApp.CustomImplementation.V23/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/TestApp/App.config b/TestApp/App.config
@@ -2,19 +2,21 @@
 <configuration>
 	<configSections>
 		<!-- This is the package collection used to add custom implementations to NHapi -->
-		<section name="Hl7PackageCollection" type="NHapi.Base.Model.Configuration.HL7PackageConfigurationSection, NHapi.Base"/>
+		<section name="HL7PackageConfiguration" type="NHapi.Base.Model.Configuration.HL7PackageConfigurationSection, NHapi.Base"/>
 		<!-- Use this section group to add rules to add specific validation rule implementations -->
 		<sectionGroup name="hl7ValidationRulesGroup">
-			<section name="hl7ValidationRules" type="NHapiTools.Base.Configuration.ValidationSection, NHapiTools.Base, version=1.0.0.0"/>
+			<section name="hl7ValidationRules" type="NHapiTools.Base.Configuration.ValidationSection, NHapiTools.Base"/>
 		</sectionGroup>
 		<!-- Use this section group to add configuration to some provided validation rules -->
 		<sectionGroup name="SpecificRulesGroup">
-			<section name="SpecificRules" type="NHapiTools.Base.Configuration.MessageRulesSection, NHapiTools.Base, version=1.0.0.0"/>
+			<section name="SpecificRules" type="NHapiTools.Base.Configuration.MessageRulesSection, NHapiTools.Base"/>
 		</sectionGroup>
 	</configSections>
-	<Hl7PackageCollection>
-		<HL7Package name="TestApp.CustomImplementation.V23." version="2.3"/>
-	</Hl7PackageCollection>
+	<HL7PackageConfiguration>
+		<HL7PackageCollection>
+			<HL7Package name="TestApp.CustomImplementation.V23." version="2.3"/>
+		</HL7PackageCollection>
+	</HL7PackageConfiguration>
 	<hl7ValidationRulesGroup>
 		<hl7ValidationRules>
 			<EncodingRules>
diff --git a/TestApp/Program.cs b/TestApp/Program.cs
@@ -234,8 +234,8 @@ private static void TestGenericMessageWrapper()
             EnhancedModelClassFactory emch = new EnhancedModelClassFactory();
             PipeParser parser = new PipeParser(emch);
             emch.ValidationContext = parser.ValidationContext;
+            IMessage im=parser.Parse(txtMessage);
 
-            IMessage im = parser.Parse(txtMessage);
             GenericMessageWrapper gcw = im as GenericMessageWrapper;
             if (gcw != null)
             {
diff --git a/TestApp/Properties/AssemblyInfo.cs b/TestApp/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("TestApp")]
-[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2014")]
+[assembly: AssemblyCopyright("Copyright Division by Zero ©  2013 - 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/TestApp/TestApp.csproj b/TestApp/TestApp.csproj
@@ -66,6 +66,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/TestApp/TestMessages/ADT_A08.txt b/TestApp/TestMessages/ADT_A08.txt

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,11 @@ public IMessage Current`
`47`	`47`	`{`
`48`	`48`	`get`
`49`	`49`	`{`
`50`		`- return parser.Parse(enumerator.Current);`
	`50`	`+ string curr = enumerator.Current;`
	`51`	`+ if (string.IsNullOrEmpty(curr))`
	`52`	`+ return null;`
	`53`	`+`
	`54`	`+ return parser.Parse(curr);`
`51`	`55`	`}`
`52`	`56`	`}`
`53`	`57`