diff --git a/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/validator/core/GVTValidator.java b/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/validator/core/GVTValidator.java index aee0fabc30e92718676f1e73efb193410368f996..75174ead644c95f72669d51898c585b9bc6cc2bc 100644 --- a/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/validator/core/GVTValidator.java +++ b/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/validator/core/GVTValidator.java @@ -2,6 +2,7 @@ package net.ihe.gazelle.hl7.validator.core; import gov.nist.validation.report.Entry; import gov.nist.validation.report.Report; +import hl7.v2.profile.Message; import hl7.v2.profile.XMLDeserializer; import hl7.v2.validation.SyncHL7Validator; import hl7.v2.validation.content.ConformanceContext; @@ -16,6 +17,7 @@ import net.ihe.gazelle.preferences.PreferenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -24,14 +26,13 @@ import java.util.Arrays; import java.util.List; import java.util.Map; - public class GVTValidator extends GenericHL7Validator { private static Logger LOG = LoggerFactory.getLogger(GVTValidator.class); private InputStream constraintsXML; private InputStream vsLibraryXML; private InputStream profileXML; - //private String id; + private String id; public GVTValidator(Profile profile, ValidationContext validationContext, String message) { @@ -148,12 +149,16 @@ public class GVTValidator extends GenericHL7Validator { } } + private String getID( hl7.v2.profile.Profile profile){ + return profile.messages().mkString().substring(0,24); + } public Report validate() throws Exception { hl7.v2.profile.Profile profile = getProfile(); + this.id = getID(profile); ConformanceContext constraints = getConformanceContext(); ValueSetLibrary vsLibrary = getValueSetLibrary(); - String id = "5d1f4b6784ae07947ea48581"; + return new SyncHL7Validator(profile, vsLibrary, constraints).check(getMessageToValidate(), id); } @@ -168,8 +173,8 @@ public class GVTValidator extends GenericHL7Validator { private ValueSetLibrary getValueSetLibrary() { - // return ValueSetLibraryImpl.apply(this.vsLibraryXML).get(); - return null; + //return ValueSetLibraryImpl.apply(this.vsLibraryXML).get(); + return null; } @@ -205,4 +210,6 @@ public class GVTValidator extends GenericHL7Validator { //Default type return "DEFAULT"; } + + }