honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-03-09 14:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix problems doing CCDA snapshots

Browse Source
This commit is contained in:
Grahame Grieve 2020-07-22 12:28:01 +10:00
parent 88ea3f45b4
commit a4374bf671
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -645,7 +645,7 @@ public class ProfileUtilities extends TranslatingUtilities {
wt = "OperationOutcome";
}
if (!sd.getType().equals(wt)) {
boolean ok = isCompatibleType(wt, sd.getType());
boolean ok = isCompatibleType(wt, sd);
if (!ok) {
String smsg = "The profile "+u.getValue()+" has type "+sd.getType()+" which is not consistent with the stated type "+wt;
if (exception)
@ -714,10 +714,17 @@ public class ProfileUtilities extends TranslatingUtilities {
}
private boolean isCompatibleType(String base, String type) {
StructureDefinition sd = context.fetchTypeDefinition(type);
private boolean isCompatibleType(String base, StructureDefinition sdt) {
StructureDefinition sdb = context.fetchTypeDefinition(base);
if (sdb.getType().equals(sdt.getType())) {
return true;
}
StructureDefinition sd = context.fetchTypeDefinition(sdt.getType());
while (sd != null) {
if (sd.getType().equals(base)) {
if (sd.getType().equals(sdb.getType())) {
return true;
}
if (sd.getUrl().equals(sdb.getUrl())) {
return true;
}
sd = context.fetchResource(StructureDefinition.class, sd.getBaseDefinition());
@ -4608,6 +4615,9 @@ public class ProfileUtilities extends TranslatingUtilities {
this.snapshot = snapshot;
this.prefixLength = prefixLength;
this.base = base;
if (Utilities.isAbsoluteUrl(base)) {
throw new Error("Wrong!");
}
this.name = name;
}
@ -4654,9 +4664,9 @@ public class ProfileUtilities extends TranslatingUtilities {
}
if (mandatory) {
if (prefixLength == 0)
errors.add("Differential contains path "+path+" which is not found in the base");
errors.add("Differential contains path "+path+" which is not found in the in base "+name);
else
errors.add("Differential contains path "+path+" which is actually "+actual+", which is not found in the base");
errors.add("Differential contains path "+path+" which is actually "+actual+", which is not found in the in base "+name);
}
return 0;
}
@ -4812,12 +4822,12 @@ public class ProfileUtilities extends TranslatingUtilities {
if (profile==null)
ccmp = null; // this might happen before everything is loaded. And we don't so much care about sot order in this case
else
ccmp = new ElementDefinitionComparer(true, profile.getSnapshot().getElement(), ed.getType().get(0).getWorkingCode(), child.getSelf().getPath().length(), cmp.name);
ccmp = new ElementDefinitionComparer(true, profile.getSnapshot().getElement(), resolveType(ed.getType().get(0).getWorkingCode()), child.getSelf().getPath().length(), cmp.name);
} else if (ed.getType().size() == 1 && !ed.getType().get(0).getWorkingCode().equals("*")) {
StructureDefinition profile = context.fetchResource(StructureDefinition.class, sdNs(ed.getType().get(0).getWorkingCode()));
if (profile==null)
throw new FHIRException(context.formatMessage(I18nConstants.UNABLE_TO_RESOLVE_PROFILE__IN_ELEMENT_, sdNs(ed.getType().get(0).getWorkingCode()), ed.getPath()));
ccmp = new ElementDefinitionComparer(false, profile.getSnapshot().getElement(), ed.getType().get(0).getWorkingCode(), child.getSelf().getPath().length(), cmp.name);
ccmp = new ElementDefinitionComparer(false, profile.getSnapshot().getElement(), resolveType(ed.getType().get(0).getWorkingCode()), child.getSelf().getPath().length(), cmp.name);
} else if (child.getSelf().getType().size() == 1) {
StructureDefinition profile = context.fetchResource(StructureDefinition.class, sdNs(child.getSelf().getType().get(0).getWorkingCode()));
if (profile==null)
@ -4860,6 +4870,16 @@ public class ProfileUtilities extends TranslatingUtilities {
return ccmp;
}
private String resolveType(String code) {
if (Utilities.isAbsoluteUrl(code)) {
StructureDefinition sd = context.fetchResource(StructureDefinition.class, code);
if (sd != null) {
return sd.getType();
}
}
return code;
}
private static String sdNs(String type) {
return sdNs(type, null);
}