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 in path names for CDA

This commit is contained in:
Grahame Grieve 2020-09-15 10:25:23 +10:00
parent 9fc8b35797
commit 48dca881f3
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Element.java
View File

@ -932,4 +932,12 @@ public class Element extends Base {
return hasParentForValidator; return hasParentForValidator;
} }
public void clear() {
comments = null;
children.clear();;
property = null;
elementProperty = null;
xhtml = null;
}
} }

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ChildIterator.java
View File

@ -96,6 +96,7 @@ public class ChildIterator {
String n = name(); String n = name();
String fn = ""; String fn = "";
if (element().getProperty().isChoice()) { if (element().getProperty().isChoice()) {
if (element().getProperty().getName().endsWith("[x]")) {
String en = element().getProperty().getName(); String en = element().getProperty().getName();
en = en.substring(0, en.length() - 3); en = en.substring(0, en.length() - 3);
String t = n.substring(en.length()); String t = n.substring(en.length());
@ -103,6 +104,9 @@ public class ChildIterator {
t = Utilities.uncapitalize(t); t = Utilities.uncapitalize(t);
n = en; n = en;
fn = ".ofType(" + t + ")"; fn = ".ofType(" + t + ")";
} else {
// nothing to do?
}
} }
if (i > -1 || (element().getSpecial() == null && element().isList())) { if (i > -1 || (element().getSpecial() == null && element().isList())) {
sfx = "[" + Integer.toString(lastCount) + "]"; sfx = "[" + Integer.toString(lastCount) + "]";

5
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ElementInfo.java
View File

@ -111,11 +111,6 @@ public class ElementInfo {
return path; return path;
} }
public ElementInfo setPath(String path) {
this.path = path;
return this;
}
public int col() { public int col() {
return element.col(); return element.col();
} }