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 rendering for conditional references

This commit is contained in:
Grahame Grieve 2023-02-21 16:46:02 +11:00
parent 76a3129b30
commit 3eda8580fc
3 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/ContextUtilities.java
View File

@ -43,6 +43,8 @@ public class ContextUtilities implements ProfileKnowledgeProvider {
private XVerExtensionManager xverManager; private XVerExtensionManager xverManager;
private Map<String, String> oidCache = new HashMap<>(); private Map<String, String> oidCache = new HashMap<>();
private List<StructureDefinition> allStructuresList = new ArrayList<StructureDefinition>(); private List<StructureDefinition> allStructuresList = new ArrayList<StructureDefinition>();
private List<String> canonicalResourceNames;
private List<String> concreteResourceNames;
public ContextUtilities(IWorkerContext context) { public ContextUtilities(IWorkerContext context) {
super(); super();
@ -197,15 +199,19 @@ public class ContextUtilities implements ProfileKnowledgeProvider {
* @return a list of the resource names that are canonical resources defined for this version * @return a list of the resource names that are canonical resources defined for this version
*/ */
public List<String> getCanonicalResourceNames() { public List<String> getCanonicalResourceNames() {
List<String> names = new ArrayList<>(); if (canonicalResourceNames == null) {
for (StructureDefinition sd : allStructures()) { canonicalResourceNames = new ArrayList<>();
if (sd.getKind() == StructureDefinitionKind.RESOURCE && !sd.getAbstract() && hasUrlProperty(sd)) { Set<String> names = new HashSet<>();
names.add(sd.getType()); for (StructureDefinition sd : allStructures()) {
if (sd.getKind() == StructureDefinitionKind.RESOURCE && !sd.getAbstract() && hasUrlProperty(sd)) {
names.add(sd.getType());
}
} }
canonicalResourceNames.addAll(Utilities.sorted(names));
} }
return names; return canonicalResourceNames;
} }
/** /**
* @return a list of all structure definitions, with snapshots generated (if possible) * @return a list of all structure definitions, with snapshots generated (if possible)
*/ */
@ -370,5 +376,19 @@ public class ContextUtilities implements ProfileKnowledgeProvider {
return null; return null;
} }
public List<String> getConcreteResources() {
if (concreteResourceNames == null) {
concreteResourceNames = new ArrayList<>();
Set<String> names = new HashSet<>();
for (StructureDefinition sd : allStructures()) {
if (sd.getKind() == StructureDefinitionKind.RESOURCE && !sd.getAbstract()) {
names.add(sd.getType());
}
}
concreteResourceNames.addAll(Utilities.sorted(names));
}
return concreteResourceNames;
}
} }

9
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java
View File

@ -223,12 +223,15 @@ public abstract class ResourceRenderer extends DataRenderer {
tr = resolveReference(rw, r.getReference()); tr = resolveReference(rw, r.getReference());
if (!r.getReference().startsWith("#")) { if (!r.getReference().startsWith("#")) {
if (tr != null && tr.getReference() != null) if (tr != null && tr.getReference() != null) {
c = x.ah(tr.getReference()); c = x.ah(tr.getReference());
else } else if (r.getReference().contains("?")) {
x.tx("Conditional Reference: ");
c = x.code("");
} else {
c = x.ah(r.getReference()); c = x.ah(r.getReference());
}
} else { } else {
c = x.ah(r.getReference()); c = x.ah(r.getReference());
} }
} else { } else {

4
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlFluent.java
View File

@ -150,7 +150,9 @@ public abstract class XhtmlFluent {
public XhtmlNode code(String text) { public XhtmlNode code(String text) {
return addTag("code").tx(text); XhtmlNode code = addTag("code");
code.tx(text);
return code;
} }
public XhtmlNode code() { public XhtmlNode code() {