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 missing R5 definitions in publisher

This commit is contained in:
Grahame Grieve 2022-11-22 06:38:01 -03:00
parent 74b1b7f201
commit 6bdf3389bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/R5ExtensionsLoader.java
View File

@ -90,7 +90,7 @@ public class R5ExtensionsLoader {
} else if (pri.getResourceType().equals("ValueSet")) { } else if (pri.getResourceType().equals("ValueSet")) {
valueSets.put(pri.getUrl(), new Loadable<ValueSet>(pri)); valueSets.put(pri.getUrl(), new Loadable<ValueSet>(pri));
valueSets.put(pri.getUrl()+"|"+pri.getVersion(), new Loadable<ValueSet>(pri)); valueSets.put(pri.getUrl()+"|"+pri.getVersion(), new Loadable<ValueSet>(pri));
} else if (pri.getResourceType().equals("StructureDefinition") && pri.getStatedType().equals("Extension")) { } else if (pri.getResourceType().equals("StructureDefinition")) {
structures.add(new Loadable<StructureDefinition>(pri)); structures.add(new Loadable<StructureDefinition>(pri));
} }
} }
@ -100,7 +100,7 @@ public class R5ExtensionsLoader {
count = 0; count = 0;
List<String> typeNames = new ContextUtilities(context).getTypeNames(); List<String> typeNames = new ContextUtilities(context).getTypeNames();
for (Loadable<StructureDefinition> lsd : structures) { for (Loadable<StructureDefinition> lsd : structures) {
if (!context.hasResource(StructureDefinition.class, lsd.info.getUrl())) { if (lsd.info.getStatedType().equals("Extension") && !context.hasResource(StructureDefinition.class, lsd.info.getUrl())) {
StructureDefinition sd = lsd.getResource(); StructureDefinition sd = lsd.getResource();
if (sd.getDerivation() == TypeDerivationRule.CONSTRAINT) { if (sd.getDerivation() == TypeDerivationRule.CONSTRAINT) {
if (survivesStrippingTypes(sd, context, typeNames)) { if (survivesStrippingTypes(sd, context, typeNames)) {