fix errors rendering mapping file

This commit is contained in:
Grahame Grieve 2023-03-11 18:53:53 +11:00
parent 939d1d06c0
commit 83f608597a
1 changed files with 7 additions and 5 deletions

View File

@ -87,7 +87,7 @@ public class StructureMapRenderer extends TerminologyRenderer {
renderMetadata(x, "url", map.getUrlElement()); renderMetadata(x, "url", map.getUrlElement());
renderMetadata(x, "name", map.getNameElement()); renderMetadata(x, "name", map.getNameElement());
renderMetadata(x, "title", map.getTitleElement()); renderMetadata(x, "title", map.getTitleElement());
renderMetadata(x, "url", map.getStatusElement(), "draft"); renderMetadata(x, "status", map.getStatusElement());
x.tx("\r\n"); x.tx("\r\n");
} else { } else {
x.b().tx("map"); x.b().tx("map");
@ -109,7 +109,9 @@ public class StructureMapRenderer extends TerminologyRenderer {
} }
private void renderMetadata(XhtmlNode x, String name, DataType value) { private void renderMetadata(XhtmlNode x, String name, DataType value) {
renderMetadata(x, name, value, null); if (!value.isEmpty()) {
renderMetadata(x, name, value, null);
}
} }
private void renderMetadata(XhtmlNode x, String name, DataType value, String def) { private void renderMetadata(XhtmlNode x, String name, DataType value, String def) {
@ -151,16 +153,16 @@ public class StructureMapRenderer extends TerminologyRenderer {
if (!prefixesSrc.containsKey(cg.getSource())) { if (!prefixesSrc.containsKey(cg.getSource())) {
prefixesSrc.put(cg.getSource(), String.valueOf(prefix)); prefixesSrc.put(cg.getSource(), String.valueOf(prefix));
x.b().tx(" prefix "); x.b().tx(" prefix ");
x.tx(prefix); x.tx(""+prefix);
x.color(COLOR_SYNTAX).tx(" = \""); x.color(COLOR_SYNTAX).tx(" = \"");
x.tx(""+cg.getSource()); x.tx(cg.getSource());
x.color(COLOR_SYNTAX).tx("\"\r\n"); x.color(COLOR_SYNTAX).tx("\"\r\n");
prefix++; prefix++;
} }
if (!prefixesTgt.containsKey(cg.getTarget())) { if (!prefixesTgt.containsKey(cg.getTarget())) {
prefixesTgt.put(cg.getTarget(), String.valueOf(prefix)); prefixesTgt.put(cg.getTarget(), String.valueOf(prefix));
x.b().tx(" prefix "); x.b().tx(" prefix ");
x.tx(prefix); x.tx(""+prefix);
x.color(COLOR_SYNTAX).tx(" = \""); x.color(COLOR_SYNTAX).tx(" = \"");
x.tx(""+cg.getTarget()); x.tx(""+cg.getTarget());
x.color(COLOR_SYNTAX).tx("\"\r\n"); x.color(COLOR_SYNTAX).tx("\"\r\n");