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 to not load Simplifier packages via lazy loading

This commit is contained in:
Grahame Grieve 2020-08-18 18:00:20 +10:00
parent 67c9904aa8
commit 5c8cdec49c
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DiagnosticReportRenderer.java
View File

@ -125,8 +125,9 @@ public class DiagnosticReportRenderer extends ResourceRenderer {
}
pw = getProperty(dr, "conclusion");
if (valued(pw))
if (valued(pw)) {
render(x.para(), pw.value());
}
pw = getProperty(dr, "conclusionCode");
if (!valued(pw)) {

5
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java vendored
View File

@ -1080,12 +1080,15 @@ public class NpmPackage {
return false;
}
public boolean canLazyLoad() {
public boolean canLazyLoad() throws IOException {
for (NpmPackageFolder folder : folders.values()) {
if (folder.folder == null) {
return false;
}
}
if (!hasFile("other", "spec.internals")) {
return false;
}
return true;
}

11
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageHacker.java vendored
View File

@ -25,7 +25,7 @@ import com.google.gson.JsonObject;
public class PackageHacker {
public static void main(String[] args) throws FileNotFoundException, IOException {
new PackageHacker().edit("M:\\web\\terminology.hl7.org\\hl7.terminology.r3.tgz");
new PackageHacker().edit("M:\\web\\hl7.org\\fhir\\us\\davinci-pdex-plan-net\\2020Feb\\package.tgz");
}
private void edit(String name) throws FileNotFoundException, IOException {
@ -57,16 +57,17 @@ public class PackageHacker {
private void change(JsonObject npm, Map<String, byte[]> content) throws FileNotFoundException, IOException {
// fixVersions(npm);
// npm.remove("name");
// npm.addProperty("name", "hl7.terminology.r5");
npm.remove("version");
npm.addProperty("version", "1.0.0");
// npm.remove("url");
// npm.addProperty("url", url);
// npm.remove("version");
// npm.addProperty("version", "1.0.0");
// npm.remove("canonical");
// npm.addProperty("canonical", "http://hl7.org/fhir/us/davinci-drug-formulary");
//// npm.remove("description");
//// npm.addProperty("description", "Group Wrapper that includes all the R4 packages");
// npm.remove("url");
// npm.addProperty("url", "https://terminology.hl7.org/1.0.0/");
// npm.remove("dependencies");
// JsonObject dep = new JsonObject();
// npm.add("dependencies", dep);
// dep.addProperty("hl7.fhir.r4.core", "4.0.1");

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java
View File

@ -4527,10 +4527,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
msg = ex.getMessage();
}
if (!ok) {
if (!Utilities.noString(msg))
if (!Utilities.noString(msg)) {
msg = " (" + msg + ")";
if (debug) {
System.out.println(" failed! "+msg);
}
if (inv.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice") &&
ToolingExtensions.readBooleanExtension(inv, "http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice")) {