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

Actually fix it this time

This commit is contained in:
Grahame Grieve 2020-12-09 11:10:16 +11:00
parent 82f3300b69
commit 4b5ea7d4d5
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
View File

@ -488,6 +488,13 @@ public class ProfileUtilities extends TranslatingUtilities {
return getChildList(profile, e.getContentReference()+"."+path.substring(p.length()+1), null, diff);
} else if (e.getContentReference().startsWith("#")) {
return getChildList(profile, e.getContentReference().substring(1), null, diff);
} else if (e.getContentReference().contains("#")) {
String url = e.getContentReference().substring(0, e.getContentReference().indexOf("#"));
StructureDefinition sd = context.fetchResource(StructureDefinition.class, url);
if (sd == null) {
throw new DefinitionException("Unable to find Structure "+url);
}
return getChildList(sd, e.getContentReference().substring(e.getContentReference().indexOf("#")+1), null, diff);
} else {
return getChildList(profile, e.getContentReference(), null, diff);
}

10
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/ElementWrappers.java
View File

@ -85,15 +85,7 @@ public class ElementWrappers {
element.getNamedChildrenWithWildcard(name, elements);
else
element.getNamedChildren(name, elements);
if (child.hasContentReference()) {
ElementDefinitionResolution nchild = context.getProfileUtilities().resolveContentRef(structure, child);
if (nchild == null) {
throw new DefinitionException("Unable to resolve content reference "+child.getContentReference());
}
list.add(new PropertyWrapperMetaElement(context, nchild.getSource(), nchild.getElement(), elements));
} else {
list.add(new PropertyWrapperMetaElement(context, structure, child, elements));
}
list.add(new PropertyWrapperMetaElement(context, structure, child, elements));
}
}
return list;