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

Merge pull request #1852 from sebg-mio42/fix-issue-1848 

Fix issue 1848
This commit is contained in:
Grahame Grieve 2024-12-11 05:08:41 +11:00 committed by GitHub
parent aef45e0ffa 5c1fac1a05
commit d111d045ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java
View File

@ -168,6 +168,7 @@ public class BaseValidator implements IValidationContextResourceLoader, IMessagi
protected final String TYPE = "type";
protected final String BUNDLE = "Bundle";
protected final String LAST_UPDATED = "lastUpdated";
protected final String VERSION_ID = "versionId";
protected BaseValidator parent;
protected IWorkerContext context;
@ -1048,8 +1049,9 @@ public class BaseValidator implements IValidationContextResourceLoader, IMessagi
if (resource != null) {
String et = resource.getType();
String eid = resource.getNamedChildValue(ID, false);
String rl = null;
if (eid != null) {
String rl = et+"/"+eid;
rl = et+"/"+eid;
list = relMap.get(rl);
if (list == null) {
list = new ArrayList<Element>();
@ -1057,6 +1059,30 @@ public class BaseValidator implements IValidationContextResourceLoader, IMessagi
}
list.add(entry);
}
boolean versionIdPresent = resource.hasChild(META, false)
&& resource.getNamedChild(META, false).hasChild(VERSION_ID, false)
&& resource.getNamedChild(META, false).getNamedChild(VERSION_ID, false).hasValue();
if (versionIdPresent){
String versionId = resource.getNamedChild(META).getNamedChild(VERSION_ID).getValue();
String fullUrlVersioned = fu + "/_history/" + versionId;
List<Element> listMapVersioned = null;
listMapVersioned = map.get(fullUrlVersioned);
if (listMapVersioned == null) {
listMapVersioned = new ArrayList<Element>();
map.put(fullUrlVersioned, listMapVersioned);
}
listMapVersioned.add(entry);
if (rl != null) {
String relativePathVersioned = rl + "/_history/" + versionId;
List<Element> listRelMapVersioned = null;
listRelMapVersioned = relMap.get(relativePathVersioned);
if (listRelMapVersioned == null) {
listRelMapVersioned = new ArrayList<Element>();
relMap.put(relativePathVersioned, listRelMapVersioned);
}
listRelMapVersioned.add(entry);
}
}
}
}
}