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

set id when parsing StructureMap

This commit is contained in:
Grahame Grieve 2020-03-02 09:04:16 +11:00
parent f5e2d3405d
commit 137506f37f
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/utils/StructureMapUtilities.java
View File

@ -326,6 +326,7 @@ public class StructureMapUtilities {
lexer.token("map"); lexer.token("map");
StructureMap result = new StructureMap(); StructureMap result = new StructureMap();
result.setUrl(lexer.readConstant("url")); result.setUrl(lexer.readConstant("url"));
result.setId(tail(result.getUrl()));
lexer.token("="); lexer.token("=");
result.setName(lexer.readConstant("name")); result.setName(lexer.readConstant("name"));
lexer.skipComments(); lexer.skipComments();
@ -344,9 +345,14 @@ public class StructureMapUtilities {
parseGroup(result, lexer); parseGroup(result, lexer);
} }
return result; return result;
} }
private String tail(String url) {
return url.substring(url.lastIndexOf("/")+1);
}
private void parseConceptMap(StructureMap result, FHIRLexer lexer) throws FHIRLexerException { private void parseConceptMap(StructureMap result, FHIRLexer lexer) throws FHIRLexerException {
lexer.token("conceptmap"); lexer.token("conceptmap");
ConceptMap map = new ConceptMap(); ConceptMap map = new ConceptMap();

1
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/StructureMapUtilities.java
View File

@ -655,6 +655,7 @@ public class StructureMapUtilities {
lexer.token("map"); lexer.token("map");
StructureMap result = new StructureMap(); StructureMap result = new StructureMap();
result.setUrl(lexer.readConstant("url")); result.setUrl(lexer.readConstant("url"));
result.setId(tail(result.getUrl()));
lexer.token("="); lexer.token("=");
result.setName(lexer.readConstant("name")); result.setName(lexer.readConstant("name"));
lexer.skipComments(); lexer.skipComments();

1
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/StructureMapUtilities.java
View File

@ -712,6 +712,7 @@ public class StructureMapUtilities {
lexer.token("map"); lexer.token("map");
StructureMap result = new StructureMap(); StructureMap result = new StructureMap();
result.setUrl(lexer.readConstant("url")); result.setUrl(lexer.readConstant("url"));
result.setId(tail(result.getUrl()));
lexer.token("="); lexer.token("=");
result.setName(lexer.readConstant("name")); result.setName(lexer.readConstant("name"));
lexer.skipComments(); lexer.skipComments();