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

Merge pull request #894 from hapifhir/gg-202208-sp-render 

Improvements to SearchParameterRenderer
This commit is contained in:
Grahame Grieve 2022-08-11 20:25:52 +10:00 committed by GitHub
parent 84cb59683c 80ca7e31f9
commit 02da662bec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/SearchParameterRenderer.java
View File

@ -2,6 +2,7 @@ package org.hl7.fhir.r5.renderers;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.List;
import org.hl7.fhir.exceptions.DefinitionException;
import org.hl7.fhir.exceptions.FHIRException;
@ -37,7 +38,7 @@ public class SearchParameterRenderer extends TerminologyRenderer {
}
public boolean render(XhtmlNode x, Resource dr) throws IOException, FHIRException, EOperationOutcome {
return render(x, (OperationDefinition) dr);
return render(x, (SearchParameter) dr);
}
public boolean render(XhtmlNode x, SearchParameter spd) throws IOException, FHIRException, EOperationOutcome {
@ -56,7 +57,7 @@ public class SearchParameterRenderer extends TerminologyRenderer {
for (CodeType t : spd.getBase()) {
StructureDefinition sd = context.getWorker().fetchTypeDefinition(t.toString());
if (sd != null && sd.hasUserData("path")) {
td.sep(", ").ah(sd.getUserString("path")).tx(t.getCode());
td.ah(sd.getUserString("path")).sep(", ").tx(t.getCode());
} else {
td.sep(", ").tx(t.getCode());
}
@ -82,12 +83,18 @@ public class SearchParameterRenderer extends TerminologyRenderer {
tr = tbl.tr();
tr.td().tx(Utilities.pluralize("Target Resources", spd.getTarget().size()));
td = tr.td();
for (CodeType t : spd.getTarget()) {
StructureDefinition sd = context.getWorker().fetchTypeDefinition(t.toString());
if (sd != null && sd.hasUserData("path")) {
td.sep(", ").ah(sd.getUserString("path")).tx(t.getCode());
} else {
td.sep(", ").tx(t.getCode());
if (isAllConcreteResources(spd.getTarget())) {
td.ah(Utilities.pathURL(context.getSpecificationLink(), "resourcelist.html")).tx("All Resources");
} else {
for (CodeType t : spd.getTarget()) {
StructureDefinition sd = context.getWorker().fetchTypeDefinition(t.toString());
if (sd != null && sd.hasUserData("path")) {
td.sep(", ");
td.ah(sd.getUserString("path")).tx(t.getCode());
} else {
td.sep(", ");
td.tx(t.getCode());
}
}
}
}
@ -105,9 +112,11 @@ public class SearchParameterRenderer extends TerminologyRenderer {
if (spd.hasComparator()) {
tr = tbl.tr();
tr.td().tx("Comparators");
td = tr.td().tx("Allowed: ");
td = tr.td();
td.tx("Allowed: ");
for (Enumeration<SearchComparator> t : spd.getComparator()) {
td.sep(", ").tx(t.asStringValue());
td.sep(", ");
td.tx(t.asStringValue());
}
}
if (spd.hasModifier()) {
@ -115,7 +124,8 @@ public class SearchParameterRenderer extends TerminologyRenderer {
tr.td().tx("Modifiers");
td = tr.td().tx("Allowed: ");
for (Enumeration<SearchModifierCode> t : spd.getModifier()) {
td.sep(", ").tx(t.asStringValue());
td.sep(", ");
td.tx(t.asStringValue());
}
}
if (spd.hasChain()) {
@ -123,7 +133,8 @@ public class SearchParameterRenderer extends TerminologyRenderer {
tr.td().tx("Chains");
td = tr.td().tx("Allowed: ");
for (StringType t : spd.getChain()) {
td.sep(", ").tx(t.asStringValue());
td.sep(", ");
td.tx(t.asStringValue());
}
}
@ -144,6 +155,22 @@ public class SearchParameterRenderer extends TerminologyRenderer {
return false;
}
private boolean isAllConcreteResources(List<CodeType> target) {
for (String s : context.getWorker().getResourceNames()) {
StructureDefinition sd = context.getWorker().fetchTypeDefinition(s);
if (!sd.getAbstract() && !Utilities.existsInList(sd.getType(), "Parameters")) {
boolean found = false;
for (CodeType c : target) {
found = found || sd.getName().equals(c.getValue());
}
if (!found) {
return false;
}
}
}
return true;
}
public void describe(XhtmlNode x, OperationDefinition opd) {
x.tx(display(opd));
}

1
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java
View File

@ -158,6 +158,7 @@ public class ToolingExtensions {
public static final String EXT_SEC_CAT = "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category";
public static final String EXT_RESOURCE_CATEGORY = "http://hl7.org/fhir/StructureDefinition/structuredefinition-category";
public static final String EXT_RESOURCE_INTERFACE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-interface";
public static final String EXT_RESOURCE_IMPLEMENTS = "http://hl7.org/fhir/StructureDefinition/structuredefinition-implements";
public static final String EXT_TABLE_NAME = "http://hl7.org/fhir/StructureDefinition/structuredefinition-table-name";
public static final String EXT_OO_FILE = "http://hl7.org/fhir/StructureDefinition/operationoutcome-file";
public static final String EXT_WORKGROUP = "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg";

8
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
View File

@ -892,6 +892,14 @@ public class Utilities {
return false;
}
public static String stringJoin(String sep, String... array) {
CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(sep);
for (String s : array)
if (!noString(s))
b.append(s);
return b.toString();
}
public static String getFileNameForName(String name) {
return name.toLowerCase();