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

Remove validator fix (for submission via separate PR)

This commit is contained in:
Lloyd McKenzie 2020-01-10 12:22:34 -07:00
parent 91880e7a09
commit c761166544
1 changed files with 2 additions and 4 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/r5/validation/InstanceValidator.java
View File

@ -2279,9 +2279,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
if (!candidateProfiles.isEmpty()) { if (!candidateProfiles.isEmpty()) {
for (String pr: candidateProfiles) { for (String pr: candidateProfiles) {
profiles.add(pr); profiles.add(pr);
StructureDefinition cpr = (StructureDefinition)context.fetchResource(StructureDefinition.class, pr);
List<ValidationMessage> profileErrors = new ArrayList<ValidationMessage>(); List<ValidationMessage> profileErrors = new ArrayList<ValidationMessage>();
doResourceProfile(hostContext, we, pr, profileErrors, stack.push(we, -1, null, null), path, element, cpr); doResourceProfile(hostContext, we, pr, profileErrors, stack.push(we, -1, null, null), path, element, profile);
if (hasErrors(profileErrors)) if (hasErrors(profileErrors))
badProfiles.add(profileErrors); badProfiles.add(profileErrors);
@ -2348,10 +2347,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
private void doResourceProfile(ValidatorHostContext hostContext, Element resource, String profile, List<ValidationMessage> errors, NodeStack stack, String path, Element element, StructureDefinition containingProfile) throws FHIRException, IOException { private void doResourceProfile(ValidatorHostContext hostContext, Element resource, String profile, List<ValidationMessage> errors, NodeStack stack, String path, Element element, StructureDefinition containingProfile) throws FHIRException, IOException {
ResourceProfiles resourceProfiles = addResourceProfile(errors, resource, profile, path, element, stack, containingProfile); ResourceProfiles resourceProfiles = addResourceProfile(errors, resource, profile, path, element, stack, containingProfile);
if (!resourceProfiles.isProcessed()) { if (resourceProfiles.isProcessed()) {
start(hostContext, errors, resource, resource, null, stack); start(hostContext, errors, resource, resource, null, stack);
} }
// lloyd capture errors?
} }
private ResourceProfiles getResourceProfiles(Element resource, NodeStack stack) { private ResourceProfiles getResourceProfiles(Element resource, NodeStack stack) {