fix bug loading language pack NPMs
This commit is contained in:
parent
4de8ea621d
commit
7833281a52
|
@ -32,3 +32,4 @@
|
||||||
* Try deploying javadoc with SNAPSHOT
|
* Try deploying javadoc with SNAPSHOT
|
||||||
* Add utility to unpack the spec.internals file
|
* Add utility to unpack the spec.internals file
|
||||||
* v2 in FHIR tests
|
* v2 in FHIR tests
|
||||||
|
* Fix bug loading language pack NPMs
|
|
@ -958,10 +958,11 @@ public class NpmPackage {
|
||||||
public String fhirVersion() {
|
public String fhirVersion() {
|
||||||
if ("hl7.fhir.core".equals(npm.asString("name")))
|
if ("hl7.fhir.core".equals(npm.asString("name")))
|
||||||
return npm.asString("version");
|
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.") ||
|
else if ("fhir.core".equals(npm.asString("type")) &&
|
||||||
npm.asString("name").startsWith("hl7.fhir.r4.") || npm.asString("name").startsWith("hl7.fhir.r4b.") || npm.asString("name").startsWith("hl7.fhir.r5."))
|
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");
|
return npm.asString("version");
|
||||||
else {
|
} else {
|
||||||
JsonObject dep = null;
|
JsonObject dep = null;
|
||||||
if (npm.hasObject("dependencies")) {
|
if (npm.hasObject("dependencies")) {
|
||||||
dep = npm.getJsonObject("dependencies");
|
dep = npm.getJsonObject("dependencies");
|
||||||
|
|
Loading…
Reference in New Issue