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 parsing FML metadata

This commit is contained in:
Grahame Grieve 2023-03-13 13:53:27 +11:00
parent a6466f4265
commit 46ed0157ce
1 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java
View File

@ -658,6 +658,9 @@ public class StructureMapUtilities {
case "title" :
result.setTitle(lexer.readConstant("title"));
break;
case "status" :
result.setStatus(PublicationStatus.fromCode(lexer.readConstant("status")));
break;
default:
lexer.readConstant("nothing");
// nothing
@ -666,7 +669,7 @@ public class StructureMapUtilities {
}
if (!result.hasId() && result.hasName()) {
String id = Utilities.makeId(result.getName());
if (Utilities.noString(id)) {
if (!Utilities.noString(id)) {
result.setId(id);
}
}
@ -2697,4 +2700,65 @@ public class StructureMapUtilities {
this.exceptionsForChecks = exceptionsForChecks;
}
public List<StructureMap> getMapsForUrl(List<StructureMap> maps, String url, StructureMapInputMode mode) {
List<StructureMap> res = new ArrayList<>();
for (StructureMap map : maps) {
if (mapIsForUrl(map, url, mode)) {
res.add(map);
}
}
return res;
}
private boolean mapIsForUrl(StructureMap map, String url, StructureMapInputMode mode) {
for (StructureMapGroupComponent grp : map.getGroup()) {
if (grp.getTypeMode() != StructureMapGroupTypeMode.NULL) {
for (StructureMapGroupInputComponent p : grp.getInput()) {
if (mode == null || mode == p.getMode()) {
String t = resolveInputType(p, map);
if (url.equals(t)) {
return true;
}
}
}
}
}
return false;
}
public List<StructureMap> getMapsForUrlPrefix(List<StructureMap> maps, String url, StructureMapInputMode mode) {
List<StructureMap> res = new ArrayList<>();
for (StructureMap map : maps) {
if (mapIsForUrlPrefix(map, url, mode)) {
res.add(map);
}
}
return res;
}
private boolean mapIsForUrlPrefix(StructureMap map, String url, StructureMapInputMode mode) {
for (StructureMapGroupComponent grp : map.getGroup()) {
if (grp.getTypeMode() != StructureMapGroupTypeMode.NULL) {
for (StructureMapGroupInputComponent p : grp.getInput()) {
if (mode == null || mode == p.getMode()) {
String t = resolveInputType(p, map);
if (t != null && t.startsWith(url)) {
return true;
}
}
}
}
}
return false;
}
private String resolveInputType(StructureMapGroupInputComponent p, StructureMap map) {
for (StructureMapStructureComponent struc : map.getStructure()) {
if (struc.hasAlias() && struc.getAlias().equals(p.getType())) {
return struc.getUrl();
}
}
return null;
}
}