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 error setting up mapping log 

* fix rendering of definitions in CodeSystems
* fix error rendering bundles in bundles
This commit is contained in:
Grahame Grieve 2020-10-01 12:39:10 +10:00
parent eda851f67f
commit e89da42514
5 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELEASE_NOTES.md
View File

@ -2,9 +2,12 @@ Validator:
* Add date addition/subtraction to FHIRPath + add parsing comments * Add date addition/subtraction to FHIRPath + add parsing comments
* Fix questionnaire mode parameter support for validator * Fix questionnaire mode parameter support for validator
* add extra debugging when valdiator can't fetch content to validate * add extra debugging when valdiator can't fetch content to validate
* fix error setting up mapping log
Other code changes: Other code changes:
* rename org.hl7.fhir.utilities.cache to org.hl7.fhir.utilities.npm * rename org.hl7.fhir.utilities.cache to org.hl7.fhir.utilities.npm
* report error locations for run time FHIRPath errors * report error locations for run time FHIRPath errors
* add search on IG registry to PackageClient * add search on IG registry to PackageClient
* add focus to FHIRPath function extensions * add focus to FHIRPath function extensions
* fix rendering of definitions in CodeSystems
* fix error rendering bundles in bundles

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/BundleRenderer.java
View File

@ -43,7 +43,9 @@ public class BundleRenderer extends ResourceRenderer {
@Override @Override
public boolean render(XhtmlNode x, Resource r) throws FHIRFormatError, DefinitionException, IOException, FHIRException, EOperationOutcome { public boolean render(XhtmlNode x, Resource r) throws FHIRFormatError, DefinitionException, IOException, FHIRException, EOperationOutcome {
return render(x, (Bundle) r); XhtmlNode n = render((Bundle) r);
x.addChildren(n.getChildNodes());
return false;
} }
@Override @Override

3
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/RendererFactory.java
View File

@ -78,6 +78,9 @@ public class RendererFactory {
if ("Parameters".equals(resourceName)) { if ("Parameters".equals(resourceName)) {
return new ParametersRenderer(context); return new ParametersRenderer(context);
} }
if ("Bundle".equals(resourceName)) {
return new BundleRenderer(context);
}
return new ProfileDrivenRenderer(context); return new ProfileDrivenRenderer(context);
} }

22
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java
View File

@ -829,7 +829,8 @@ public class ValueSetRenderer extends TerminologyRenderer {
boolean hasDefinition = false; boolean hasDefinition = false;
for (ConceptReferenceComponent c : inc.getConcept()) { for (ConceptReferenceComponent c : inc.getConcept()) {
hasComments = hasComments || ExtensionHelper.hasExtension(c, ToolingExtensions.EXT_VS_COMMENT); hasComments = hasComments || ExtensionHelper.hasExtension(c, ToolingExtensions.EXT_VS_COMMENT);
hasDefinition = hasDefinition || ExtensionHelper.hasExtension(c, ToolingExtensions.EXT_DEFINITION); ConceptDefinitionComponent cc = definitions.get(c.getCode());
hasDefinition = hasDefinition || ((cc != null && cc.hasDefinition()) || ExtensionHelper.hasExtension(c, ToolingExtensions.EXT_DEFINITION));
} }
if (hasComments || hasDefinition) if (hasComments || hasDefinition)
hasExtensions = true; hasExtensions = true;
@ -846,16 +847,19 @@ public class ValueSetRenderer extends TerminologyRenderer {
else if (cc != null && !Utilities.noString(cc.getDisplay())) else if (cc != null && !Utilities.noString(cc.getDisplay()))
td.addText(cc.getDisplay()); td.addText(cc.getDisplay());
if (ExtensionHelper.hasExtension(c, ToolingExtensions.EXT_DEFINITION)) { if (hasDefinition) {
td = tr.td(); td = tr.td();
smartAddText(td, ToolingExtensions.readStringExtension(c, ToolingExtensions.EXT_DEFINITION)); if (ExtensionHelper.hasExtension(c, ToolingExtensions.EXT_DEFINITION)) {
} else if (cc != null && !Utilities.noString(cc.getDefinition())) { smartAddText(td, ToolingExtensions.readStringExtension(c, ToolingExtensions.EXT_DEFINITION));
td = tr.td(); } else if (cc != null && !Utilities.noString(cc.getDefinition())) {
smartAddText(td, cc.getDefinition()); smartAddText(td, cc.getDefinition());
}
} }
if (hasComments) {
if (ExtensionHelper.hasExtension(c, ToolingExtensions.EXT_VS_COMMENT)) { td = tr.td();
smartAddText(tr.td(), "Note: "+ToolingExtensions.readStringExtension(c, ToolingExtensions.EXT_VS_COMMENT)); if (ExtensionHelper.hasExtension(c, ToolingExtensions.EXT_VS_COMMENT)) {
smartAddText(td, "Note: "+ToolingExtensions.readStringExtension(c, ToolingExtensions.EXT_VS_COMMENT));
}
} }
if (doLangs) { if (doLangs) {
addLangaugesToRow(c, langs, tr); addLangaugesToRow(c, langs, tr);

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java
View File

@ -1635,7 +1635,9 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
} }
public void setMapLog(String mapLog) throws FileNotFoundException { public void setMapLog(String mapLog) throws FileNotFoundException {
this.mapLog = new PrintWriter(mapLog); if (mapLog != null) {
this.mapLog = new PrintWriter(mapLog);
}
} }
public void prepare() { public void prepare() {