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

Don't load resources from core examples package

This commit is contained in:
Grahame Grieve 2023-08-02 22:11:43 +10:00
parent 42aef4ad40
commit db0413c735
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASE_NOTES.md
View File

@ -2,8 +2,11 @@
* Fix invalid integer detection * Fix invalid integer detection
* Improved invariant checking * Improved invariant checking
* Create warnings for status on terminology resources
## Other code changes ## Other code changes
* Update obligation handling code for split definitions * Update obligation handling code for split definitions
* Update ICF importer to handle grouping levels * Update ICF importer to handle grouping levels
* fix up copy directory for case differences

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

@ -1266,6 +1266,11 @@ public class NpmPackage {
return Utilities.existsInList(npm.asString("type"), "fhir.core", "Core"); return Utilities.existsInList(npm.asString("type"), "fhir.core", "Core");
} }
public boolean isCoreExamples() {
return name().startsWith("hl7.fhir.r") && name().endsWith(".examples");
}
public boolean isTx() { public boolean isTx() {
return npm.asString("name").startsWith("hl7.terminology"); return npm.asString("name").startsWith("hl7.terminology");
} }

14
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java
View File

@ -520,12 +520,14 @@ public class IgLoader implements IValidationEngineLoader {
} }
} }
if (loadInContext) { if (!pi.isCoreExamples()) {
// getContext().getLoadedPackages().add(pi.name() + "#" + pi.version()); if (loadInContext) {
getContext().loadFromPackage(pi, ValidatorUtils.loaderForVersion(pi.fhirVersion())); // getContext().getLoadedPackages().add(pi.name() + "#" + pi.version());
} getContext().loadFromPackage(pi, ValidatorUtils.loaderForVersion(pi.fhirVersion()));
for (String s : pi.listResources("CodeSystem", "ConceptMap", "ImplementationGuide", "CapabilityStatement", "SearchParameter", "Conformance", "StructureMap", "ValueSet", "StructureDefinition")) { }
res.put(s, TextFile.streamToBytes(pi.load("package", s))); for (String s : pi.listResources("CodeSystem", "ConceptMap", "ImplementationGuide", "CapabilityStatement", "SearchParameter", "Conformance", "StructureMap", "ValueSet", "StructureDefinition")) {
res.put(s, TextFile.streamToBytes(pi.load("package", s)));
}
} }
String ini = "[FHIR]\r\nversion=" + pi.fhirVersion() + "\r\n"; String ini = "[FHIR]\r\nversion=" + pi.fhirVersion() + "\r\n";
res.put("version.info", ini.getBytes()); res.put("version.info", ini.getBytes());