honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle validation for current version better

This commit is contained in:
Grahame Grieve 2020-01-15 08:07:20 +11:00
parent a28261abc6
commit f2b7c518c5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java
View File

@ -875,7 +875,7 @@ public class ValidationEngine implements IValidatorResourceFetcher {
throw new Exception("Unsupported format for "+fn);
VersionConvertorAdvisor50 advisor = new org.hl7.fhir.convertors.IGR2ConvertorAdvisor5();
r = new VersionConvertor_10_50(advisor ).convertResource(res);
} else if (version.equals(Constants.VERSION)) {
} else if (version.equals(Constants.VERSION) || "current".equals(version)) {
if (fn.endsWith(".xml") && !fn.endsWith("template.xml"))
r = new XmlParser().parse(new ByteArrayInputStream(content));
else if (fn.endsWith(".json") && !fn.endsWith("template.json"))
@ -1702,7 +1702,7 @@ public class ValidationEngine implements IValidatorResourceFetcher {
else
throw new Exception("Unsupported format for "+fn);
} else
throw new Exception("Unsupported version "+version);
throw new Exception("Encounted unsupported configured version "+version+" loading "+fn);
s.close();
}