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 analysing types

This commit is contained in:
Grahame Grieve 2020-01-16 23:36:18 +11:00
parent 98df625435
commit e0add75d2f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
View File

@ -2405,9 +2405,9 @@ public class ProfileUtilities extends TranslatingUtilities {
if (ok && ts.hasTargetProfile()) { if (ok && ts.hasTargetProfile()) {
// check that any derived target has a reference chain back to one of the base target profiles // check that any derived target has a reference chain back to one of the base target profiles
for (UriType u : ts.getTargetProfile()) { for (UriType u : ts.getTargetProfile()) {
boolean tgtOk = false;
String url = u.getValue(); String url = u.getValue();
while (url != null && !td.hasTargetProfile(url)) { boolean tgtOk = !td.hasTargetProfile() || td.hasTargetProfile(url);
while (url != null && !tgtOk) {
StructureDefinition sd = context.fetchResource(StructureDefinition.class, url); StructureDefinition sd = context.fetchResource(StructureDefinition.class, url);
if (sd == null) { if (sd == null) {
if (messages != null) { if (messages != null) {
@ -2417,13 +2417,14 @@ public class ProfileUtilities extends TranslatingUtilities {
tgtOk = true; // suppress error message tgtOk = true; // suppress error message
} else { } else {
url = sd.getBaseDefinition(); url = sd.getBaseDefinition();
tgtOk = td.hasTargetProfile(url);
} }
} }
if (!tgtOk) { if (!tgtOk) {
if (messages == null) { if (messages == null) {
throw new FHIRException("Error at "+purl+"#"+derived.getPath()+": The target profile "+url+" is not valid constraint on the base ("+td.getTargetProfile()+")"); throw new FHIRException("Error at "+purl+"#"+derived.getPath()+": The target profile "+url+" is not valid constraint on the base ("+td.getTargetProfile()+")");
} else { } else {
messages.add(new ValidationMessage(Source.InstanceValidator, IssueType.BUSINESSRULE, pn+"."+derived.getPath(), "The target profile "+url+" is not valid constraint on the base ("+td.getTargetProfile()+")", IssueSeverity.ERROR)); messages.add(new ValidationMessage(Source.InstanceValidator, IssueType.BUSINESSRULE, pn+"."+derived.getPath(), "The target profile "+url+" is not a valid constraint on the base ("+td.getTargetProfile()+")", IssueSeverity.ERROR));
} }
} }
} }