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 problem validating extension context on choice types

This commit is contained in:
Grahame Grieve 2022-01-29 09:17:29 +11:00
parent 3559bd6638
commit ccfd715a5a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/NodeStack.java
View File

@ -119,7 +119,7 @@ public class NodeStack {
}
res.logicalPaths = new ArrayList<String>();
if (type != null) {
// type will be bull if we on a stitching point of a contained resource, or if....
// type will be null if we on a stitching point of a contained resource, or if....
res.type = type;
String tn = res.type.getPath();
String t = tail(definition.getPath());
@ -128,9 +128,11 @@ public class NodeStack {
}
for (String lp : getLogicalPaths()) {
res.logicalPaths.add(lp + "." + t);
if (t.endsWith("[x]"))
if (t.endsWith("[x]")) {
res.logicalPaths.add(lp + "." + t.substring(0, t.length() - 3) + ".ofType("+type.getPath()+")");
res.logicalPaths.add(lp + "." + t.substring(0, t.length() - 3) + type.getPath());
}
}
res.logicalPaths.add(tn);
} else if (definition != null) {
for (String lp : getLogicalPaths()) {