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

fix bug loading language pack NPMs

This commit is contained in:
Grahame Grieve 2024-06-06 22:18:31 +10:00
parent 4de8ea621d
commit 7833281a52
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASE_NOTES.md
View File

@ -31,4 +31,5 @@
* Rework validation policy management in standalone validator * Rework validation policy management in standalone validator
* 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

7
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackage.java
View File

@ -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");