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

Support descendents analysing fhirpath types

This commit is contained in:
Grahame Grieve 2022-08-26 21:00:08 +10:00
parent fe2b06031a
commit b37c40419e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java
View File

@ -583,7 +583,7 @@ public class FHIRPathEngine {
fmt = fmt + " "+worker.formatMessage(I18nConstants.FHIRPATH_LOCATION, location);
}
if (holder != null) {
return new PathEngineException(fmt, holder.getStart(), holder.toString());
return new PathEngineException(fmt, holder.getStart(), holder.toString());
} else {
return new PathEngineException(fmt);
}
@ -5503,10 +5503,11 @@ public class FHIRPathEngine {
if (dt == null) {
throw makeException(expr, I18nConstants.FHIRPATH_NO_TYPE, ProfileUtilities.sdNs(t.getCode(), worker.getOverrideVersionNs()), "getChildTypesByName");
}
sdl.add(dt);
addTypeAndDescendents(sdl, dt, worker.allStructures());
// also add any descendant types
}
} else {
sdl.add(sd);
addTypeAndDescendents(sdl, sd, worker.allStructures());
if (type.contains("#")) {
tail = type.substring(type.indexOf("#")+1);
tail = tail.substring(tail.indexOf("."));
@ -5596,6 +5597,15 @@ public class FHIRPathEngine {
}
}
private void addTypeAndDescendents(List<StructureDefinition> sdl, StructureDefinition dt, List<StructureDefinition> types) {
sdl.add(dt);
for (StructureDefinition sd : types) {
if (sd.hasBaseDefinition() && sd.getBaseDefinition().equals(dt.getUrl()) && sd.getDerivation() == TypeDerivationRule.SPECIALIZATION) {
addTypeAndDescendents(sdl, sd, types);
}
}
}
private void getClassInfoChildTypesByName(String name, TypeDetails result) {
if (name.equals("namespace")) {
result.addType(TypeDetails.FP_String);