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 slicing by value set using contained value sets

This commit is contained in:
Grahame Grieve 2019-08-05 15:48:50 +10:00
parent 9d1d64bb59
commit ce4453b0cb
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
private Object appContext; private Object appContext;
private Element container; // bundle, or parameters private Element container; // bundle, or parameters
private Element resource; private Element resource;
private StructureDefinition profile; // the profile that contains the content being validated
public ValidatorHostContext(Object appContext) { public ValidatorHostContext(Object appContext) {
this.appContext = appContext; this.appContext = appContext;
} }
@ -181,6 +182,15 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
ValidatorHostContext res = new ValidatorHostContext(appContext); ValidatorHostContext res = new ValidatorHostContext(appContext);
res.resource = element; res.resource = element;
res.container = resource; res.container = resource;
res.profile = profile;
return res;
}
public ValidatorHostContext forProfile(StructureDefinition profile) {
ValidatorHostContext res = new ValidatorHostContext(appContext);
res.resource = resource;
res.container = container;
res.profile = profile;
return res; return res;
} }
} }
@ -288,6 +298,23 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
return ok; return ok;
} }
@Override
public ValueSet resolveValueSet(Object appContext, String url) {
ValidatorHostContext c = (ValidatorHostContext) appContext;
if (c.profile != null && url.startsWith("#")) {
for (Resource r : c.profile.getContained()) {
if (r.getId().equals(url.substring(1))) {
if (r instanceof ValueSet)
return (ValueSet) r;
else
throw new FHIRException("Reference "+url+" refers to a "+r.fhirType()+" not a ValueSet");
}
}
return null;
}
return context.fetchResource(ValueSet.class, url);
}
} }
private IWorkerContext context; private IWorkerContext context;
@ -1667,7 +1694,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
} }
if (type.equals("decimal")) { if (type.equals("decimal")) {
if (e.primitiveValue() != null) { if (e.primitiveValue() != null) {
DecimalStatus ds = Utilities.checkDecimal(e.primitiveValue(), true); DecimalStatus ds = Utilities.checkDecimal(e.primitiveValue(), true, false);
if (rule(errors, IssueType.INVALID, e.line(), e.col(), path, ds == DecimalStatus.OK || ds == DecimalStatus.RANGE, "The value '" + e.primitiveValue() + "' is not a valid decimal")) if (rule(errors, IssueType.INVALID, e.line(), e.col(), path, ds == DecimalStatus.OK || ds == DecimalStatus.RANGE, "The value '" + e.primitiveValue() + "' is not a valid decimal"))
warning(errors, IssueType.VALUE, e.line(), e.col(), path, ds != DecimalStatus.RANGE, "The value '" + e.primitiveValue() + "' is outside the range of commonly/reasonably supported decimals"); warning(errors, IssueType.VALUE, e.line(), e.col(), path, ds != DecimalStatus.RANGE, "The value '" + e.primitiveValue() + "' is outside the range of commonly/reasonably supported decimals");
} }
@ -2760,7 +2787,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
boolean ok; boolean ok;
try { try {
long t = System.nanoTime(); long t = System.nanoTime();
ok = fpe.evaluateToBoolean(hostContext, hostContext.resource, element, n); ok = fpe.evaluateToBoolean(hostContext.forProfile(profile), hostContext.resource, element, n);
fpeTime = fpeTime + (System.nanoTime() - t); fpeTime = fpeTime + (System.nanoTime() - t);
msg = fpe.forLog(); msg = fpe.forLog();
} catch (Exception ex) { } catch (Exception ex) {