honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New structures all included now

This commit is contained in:
jamesagnew 2014-12-20 12:28:04 -05:00
parent 9f67bbb9c7
commit 94bef8d254
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hapi-fhir-structures-dev/pom.xml
View File

@ -313,9 +313,9 @@
<baseResourceName>securityevent</baseResourceName> <baseResourceName>securityevent</baseResourceName>
<baseResourceName>securitygroup</baseResourceName> <baseResourceName>securitygroup</baseResourceName>
<baseResourceName>securityprincipal</baseResourceName> <baseResourceName>securityprincipal</baseResourceName>
<baseResourceName>sequence</baseResourceName> <!--<baseResourceName>sequence</baseResourceName>
<baseResourceName>sequencinganalysis</baseResourceName> <baseResourceName>sequencinganalysis</baseResourceName>
<baseResourceName>sequencinglab</baseResourceName> <baseResourceName>sequencinglab</baseResourceName>-->
<baseResourceName>slot</baseResourceName> <baseResourceName>slot</baseResourceName>
<baseResourceName>specimen</baseResourceName> <baseResourceName>specimen</baseResourceName>
<baseResourceName>statusrequest</baseResourceName> <baseResourceName>statusrequest</baseResourceName>
@ -328,8 +328,8 @@
<!--<baseResourceName>test</baseResourceName>--> <!--<baseResourceName>test</baseResourceName>-->
<baseResourceName>user</baseResourceName> <baseResourceName>user</baseResourceName>
<baseResourceName>valueset</baseResourceName> <baseResourceName>valueset</baseResourceName>
<baseResourceName>vcfmeta</baseResourceName> <!--<baseResourceName>vcfmeta</baseResourceName>
<baseResourceName>vcfvariant</baseResourceName> <baseResourceName>vcfvariant</baseResourceName>-->
<baseResourceName>visionclaim</baseResourceName> <baseResourceName>visionclaim</baseResourceName>
<baseResourceName>visionprescription</baseResourceName> <baseResourceName>visionprescription</baseResourceName>
<!--<baseResourceName>visit</baseResourceName>--> <!--<baseResourceName>visit</baseResourceName>-->

9
hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureSpreadsheetParser.java
View File

@ -85,7 +85,7 @@ public abstract class BaseStructureSpreadsheetParser extends BaseStructureParser
BaseRootType resource = createRootType(); BaseRootType resource = createRootType();
addResource(resource); addResource(resource);
parseBasicElements(resourceRow, resource); parseBasicElements(resourceRow, resource, null);
parseParameters(file, resource); parseParameters(file, resource);
@ -133,7 +133,7 @@ public abstract class BaseStructureSpreadsheetParser extends BaseStructureParser
elem = new SimpleChild(); elem = new SimpleChild();
} }
parseBasicElements(nextRow, elem); parseBasicElements(nextRow, elem, type);
elements.put(elem.getName(), elem); elements.put(elem.getName(), elem);
BaseElement parent = elements.get(elem.getElementParentName()); BaseElement parent = elements.get(elem.getElementParentName());
@ -337,7 +337,7 @@ public abstract class BaseStructureSpreadsheetParser extends BaseStructureParser
} }
} }
protected void parseBasicElements(Element theRowXml, BaseElement theTarget) { private void parseBasicElements(Element theRowXml, BaseElement theTarget, String theTypeOrNull) {
String name = cellValue(theRowXml, myColName); String name = cellValue(theRowXml, myColName);
theTarget.setName(name); theTarget.setName(name);
@ -350,9 +350,8 @@ public abstract class BaseStructureSpreadsheetParser extends BaseStructureParser
theTarget.setCardMax(split[1]); theTarget.setCardMax(split[1]);
} }
String type = cellValue(theRowXml, myColType); String type = theTypeOrNull != null ? theTypeOrNull : cellValue(theRowXml, myColType);
theTarget.setTypeFromString(type); theTarget.setTypeFromString(type);
theTarget.setBinding(cellValue(theRowXml, myColBinding)); theTarget.setBinding(cellValue(theRowXml, myColBinding));
theTarget.setShortName(cellValue(theRowXml, myColShortName)); theTarget.setShortName(cellValue(theRowXml, myColShortName));
theTarget.setDefinition(cellValue(theRowXml, myColDefinition)); theTarget.setDefinition(cellValue(theRowXml, myColDefinition));