honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-09 06:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

OID related fixes

Browse Source
This commit is contained in:
Grahame Grieve 2023-10-12 20:13:48 +11:00
parent 4917dd7815
commit 04597eea27
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java
View File

@ -482,7 +482,10 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon
packageTracker.packageLoaded(pi.id(), pi.version()); packageTracker.packageLoaded(pi.id(), pi.version());
} }
oidFiles.add(pi.getFolders().get("package").oidIndexFile()); String oi = pi.getFolders().get("package").oidIndexFile();
if (oi != null) {
oidFiles.add(oi);
}
if ((types == null || types.size() == 0) && loader != null) { if ((types == null || types.size() == 0) && loader != null) {
types = loader.getTypes(); types = loader.getTypes();

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

@ -325,7 +325,11 @@ public class NpmPackage {
} }
public String oidIndexFile() throws IOException { public String oidIndexFile() throws IOException {
return fn(".oids.json"); if (folder == null) {
return null;
} else {
return fn(".oids.json");
}
} }
} }

23
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackageIndexBuilder.java
View File

@ -166,10 +166,15 @@ public class NpmPackageIndexBuilder {
oids.add(v); oids.add(v);
} }
} }
JsonArray a = new JsonArray(); if (url != null) {
("codesystem".equals(json.asString("kind")) ? oidIndexCS : oidIndexOther).add(url, a); JsonArray a = new JsonArray();
for (String s : oids) { JsonObject cache = ("codesystem".equals(json.asString("kind")) ? oidIndexCS : oidIndexOther);
a.add(s); if (!cache.has(url)) {
json.add(url, a);
for (String s : oids) {
a.add(s);
}
}
} }
} else { } else {
if (json.hasPrimitive("url")) { if (json.hasPrimitive("url")) {
@ -191,9 +196,12 @@ public class NpmPackageIndexBuilder {
} }
if (!oids.isEmpty()) { if (!oids.isEmpty()) {
JsonArray a = new JsonArray(); JsonArray a = new JsonArray();
("CodeSystem".equals(rt) ? oidIndexCS : oidIndexOther).add(json.asString("url"), a); JsonObject cache = ("CodeSystem".equals(rt) ? oidIndexCS : oidIndexOther);
for (String s : oids) { if (!cache.has(json.asString("url"))) {
a.add(s); cache.add(json.asString("url"), a);
for (String s : oids) {
a.add(s);
}
} }
} }
} }
@ -201,6 +209,7 @@ public class NpmPackageIndexBuilder {
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("Error parsing "+name+": "+e.getMessage()); System.out.println("Error parsing "+name+": "+e.getMessage());
e.printStackTrace();
if (name.contains("openapi")) { if (name.contains("openapi")) {
return false; return false;
} }