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

rendering improvements for xver IG

This commit is contained in:
Grahame Grieve 2024-03-14 16:47:23 +11:00
parent 3c39cafbcb
commit 93c98b551a
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
View File

@ -159,10 +159,15 @@ public class DataRenderer extends Renderer implements CodeResolver {
parts[0] = parts[0].substring(0, parts[0].indexOf(".")); parts[0] = parts[0].substring(0, parts[0].indexOf("."));
} }
StructureDefinition p = getContext().getWorker().fetchResource(StructureDefinition.class, parts[0]); StructureDefinition p = getContext().getWorker().fetchResource(StructureDefinition.class, parts[0]);
if (p == null) if (p == null) {
p = getContext().getWorker().fetchTypeDefinition(parts[0]); p = getContext().getWorker().fetchTypeDefinition(parts[0]);
if (p == null) }
if (context.getTypeMap().containsKey(parts[0])) {
p = getContext().getWorker().fetchTypeDefinition(context.getTypeMap().get(parts[0]));
}
if (p == null) {
p = getContext().getWorker().fetchResource(StructureDefinition.class, link); p = getContext().getWorker().fetchResource(StructureDefinition.class, link);
}
if (p != null) { if (p != null) {
if ("Extension".equals(p.getType())) { if ("Extension".equals(p.getType())) {
path = null; path = null;
@ -175,9 +180,10 @@ public class DataRenderer extends Renderer implements CodeResolver {
if (url == null) { if (url == null) {
url = p.getUserString("filename"); url = p.getUserString("filename");
} }
} else } else {
throw new DefinitionException("Unable to resolve markdown link "+link); throw new DefinitionException("Unable to resolve markdown link "+link);
}
text = left+"["+link+"]("+url+(path == null ? "" : "#"+path)+")"+right; text = left+"["+link+"]("+url+(path == null ? "" : "#"+path)+")"+right;
} }
@ -1201,19 +1207,25 @@ public class DataRenderer extends Renderer implements CodeResolver {
protected String displayIdentifier(Identifier ii) { protected String displayIdentifier(Identifier ii) {
String s = Utilities.noString(ii.getValue()) ? "?ngen-9?" : ii.getValue(); String s = Utilities.noString(ii.getValue()) ? "?ngen-9?" : ii.getValue();
NamingSystem ns = context.getContext().getNSUrlMap().get(ii.getSystem()); if ("urn:ietf:rfc:3986".equals(ii.getSystem()) && s.startsWith("urn:oid:")) {
if (ns != null) { s = "OID:"+s.substring(8);
s = ns.present()+"#"+s; } else if ("urn:ietf:rfc:3986".equals(ii.getSystem()) && s.startsWith("urn:uuid:")) {
} s = "UUID:"+s.substring(9);
if (ii.hasType()) { } else {
if (ii.getType().hasText()) NamingSystem ns = context.getContext().getNSUrlMap().get(ii.getSystem());
s = ii.getType().getText()+":\u00A0"+s; if (ns != null) {
else if (ii.getType().hasCoding() && ii.getType().getCoding().get(0).hasDisplay()) s = ns.present()+"#"+s;
s = ii.getType().getCoding().get(0).getDisplay()+": "+s; }
else if (ii.getType().hasCoding() && ii.getType().getCoding().get(0).hasCode()) if (ii.hasType()) {
s = lookupCode(ii.getType().getCoding().get(0).getSystem(), ii.getType().getCoding().get(0).getVersion(), ii.getType().getCoding().get(0).getCode())+": "+s; if (ii.getType().hasText())
} else if (ii.hasSystem()) { s = ii.getType().getText()+":\u00A0"+s;
s = ii.getSystem()+"#"+s; else if (ii.getType().hasCoding() && ii.getType().getCoding().get(0).hasDisplay())
s = ii.getType().getCoding().get(0).getDisplay()+": "+s;
else if (ii.getType().hasCoding() && ii.getType().getCoding().get(0).hasCode())
s = lookupCode(ii.getType().getCoding().get(0).getSystem(), ii.getType().getCoding().get(0).getVersion(), ii.getType().getCoding().get(0).getCode())+": "+s;
} else if (ii.hasSystem()) {
s = ii.getSystem()+"#"+s;
}
} }
if (ii.hasUse() || ii.hasPeriod()) { if (ii.hasUse() || ii.hasPeriod()) {

6
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java
View File

@ -216,6 +216,7 @@ public class RenderingContext {
private Map<KnownLinkType, String> links = new HashMap<>(); private Map<KnownLinkType, String> links = new HashMap<>();
private Map<String, String> namedLinks = new HashMap<>(); private Map<String, String> namedLinks = new HashMap<>();
private boolean addName = false; private boolean addName = false;
private Map<String, String> typeMap = new HashMap<>(); // type aliases that can be resolved in Markdown type links (mainly for cross-version usage)
/** /**
* *
@ -281,6 +282,7 @@ public class RenderingContext {
res.changeVersion = changeVersion; res.changeVersion = changeVersion;
res.terminologyServiceOptions = terminologyServiceOptions.copy(); res.terminologyServiceOptions = terminologyServiceOptions.copy();
res.typeMap.putAll(typeMap);
return res; return res;
} }
@ -739,5 +741,9 @@ public class RenderingContext {
return this; return this;
} }
public Map<String, String> getTypeMap() {
return typeMap;
}
} }