diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 73af9c35b..f6c028058 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -31,4 +31,5 @@ * Rework validation policy management in standalone validator * Try deploying javadoc with SNAPSHOT * Add utility to unpack the spec.internals file -* v2 in FHIR tests \ No newline at end of file +* v2 in FHIR tests +* Fix bug loading language pack NPMs \ No newline at end of file diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackage.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackage.java index 387240cdd..68341ff44 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackage.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackage.java @@ -958,10 +958,11 @@ public class NpmPackage { public String fhirVersion() { if ("hl7.fhir.core".equals(npm.asString("name"))) return npm.asString("version"); - else if (npm.asString("name").startsWith("hl7.fhir.r2.") || npm.asString("name").startsWith("hl7.fhir.r2b.") || npm.asString("name").startsWith("hl7.fhir.r3.") || - npm.asString("name").startsWith("hl7.fhir.r4.") || npm.asString("name").startsWith("hl7.fhir.r4b.") || npm.asString("name").startsWith("hl7.fhir.r5.")) + else if ("fhir.core".equals(npm.asString("type")) && + Utilities.startsWithInList( npm.asString("name"), "hl7.fhir.r2.", "hl7.fhir.r2b.", "hl7.fhir.r3.", + "hl7.fhir.r4.", "hl7.fhir.r4b.", "hl7.fhir.r5.")) { return npm.asString("version"); - else { + } else { JsonObject dep = null; if (npm.hasObject("dependencies")) { dep = npm.getJsonObject("dependencies");