honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-07 21:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

get tests passing

Browse Source
This commit is contained in:
Grahame Grieve 2019-07-06 07:39:25 +10:00
parent bc30ea197e
commit e2d52143d9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
View File

@ -22,6 +22,7 @@ package org.hl7.fhir.r5.validation;
import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.junit.Assert.assertNotNull;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -4458,7 +4459,7 @@ private boolean isAnswerRequirementFulfilled(QuestionnaireItemComponent qItem, L
n = en; n = en;
fn = ".ofType("+t+")"; fn = ".ofType("+t+")";
} }
if (i > -1 || element().isList()) { if (i > -1 || (element().getSpecial() == null && element().isList())) {
sfx = "[" + Integer.toString(lastCount) + "]"; sfx = "[" + Integer.toString(lastCount) + "]";
} }
return basePath + "." + n + sfx+fn; return basePath + "." + n + sfx+fn;
@ -4530,6 +4531,17 @@ private boolean isAnswerRequirementFulfilled(QuestionnaireItemComponent qItem, L
res.literalPath = getLiteralPath() + "." + element.getName(); res.literalPath = getLiteralPath() + "." + element.getName();
if (count > -1) if (count > -1)
res.literalPath = res.literalPath + "[" + Integer.toString(count) + "]"; res.literalPath = res.literalPath + "[" + Integer.toString(count) + "]";
else if (element.getSpecial() == null && element.getProperty().isList())
res.literalPath = res.literalPath + "[0]";
else if (element.getProperty().isChoice()) {
String n = res.literalPath.substring(res.literalPath.lastIndexOf(".")+1);
String en = element.getProperty().getName();
en = en.substring(0, en.length()-3);
String t = n.substring(en.length());
if (isPrimitiveType(Utilities.uncapitalize(t)))
t = Utilities.uncapitalize(t);
res.literalPath = res.literalPath.substring(0, res.literalPath.lastIndexOf("."))+"."+en+".ofType("+t+")";
}
res.logicalPaths = new ArrayList<String>(); res.logicalPaths = new ArrayList<String>();
if (type != null) { if (type != null) {
// type will be bull if we on a stitching point of a contained resource, or if.... // type will be bull if we on a stitching point of a contained resource, or if....