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

Add support for rendering logical URIs

This commit is contained in:
Grahame Grieve 2024-04-12 22:11:55 +10:00
parent eb553df2df
commit 16c5317ccb
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -811,6 +811,10 @@ public class DataRenderer extends Renderer implements CodeResolver {
} else {
x.ah(r.getWebPath()).addText(uri.getValue());
}
} else {
String url = context.getResolver() != null ? context.getResolver().resolveUri(context, uri.getValue()) : null;
if (url != null) {
x.ah(url).addText(uri.getValue());
} else if (Utilities.isAbsoluteUrlLinkable(uri.getValue()) && !(uri instanceof IdType)) {
x.ah(uri.getValue()).addText(uri.getValue());
} else {
@ -818,27 +822,33 @@ public class DataRenderer extends Renderer implements CodeResolver {
}
}
}
}
protected void renderUri(XhtmlNode x, UriType uri, String path, String id, Resource src) {
protected void renderUri(XhtmlNode x, UriType uriD, String path, String id, Resource src) {
String uri = uriD.getValue();
if (isCanonical(path)) {
x.code().tx(uri.getValue());
x.code().tx(uri);
} else {
String url = uri.getValue();
if (url == null) {
x.b().tx(uri.getValue());
} else if (uri.getValue().startsWith("mailto:")) {
x.ah(uri.getValue()).addText(uri.getValue().substring(7));
if (uri == null) {
x.b().tx(uri);
} else if (uri.startsWith("mailto:")) {
x.ah(uri).addText(uri.substring(7));
} else {
Resource target = context.getContext().fetchResource(Resource.class, uri.getValue(), src);
Resource target = context.getContext().fetchResource(Resource.class, uri, src);
if (target != null && target.hasWebPath()) {
String title = target instanceof CanonicalResource ? crPresent((CanonicalResource) target) : uri.getValue();
String title = target instanceof CanonicalResource ? crPresent((CanonicalResource) target) : uri;
x.ah(target.getWebPath()).addText(title);
} else if (uri.getValue().contains("|")) {
x.ah(uri.getValue().substring(0, uri.getValue().indexOf("|"))).addText(uri.getValue());
} else if (url.startsWith("http:") || url.startsWith("https:") || url.startsWith("ftp:")) {
x.ah(uri.getValue()).addText(uri.getValue());
} else {
x.code().addText(uri.getValue());
String url = context.getResolver() != null ? context.getResolver().resolveUri(context, uri) : null;
if (url != null) {
x.ah(url).addText(uri);
} else if (uri.contains("|")) {
x.ah(uri.substring(0, uri.indexOf("|"))).addText(uri);
} else if (uri.startsWith("http:") || uri.startsWith("https:") || uri.startsWith("ftp:")) {
x.ah(uri).addText(uri);
} else {
x.code().addText(uri);
}
}
}
}

8
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/Resolver.java
View File

@ -18,6 +18,14 @@ public class Resolver {
// returns null if contained resource is inlined
String urlForContained(RenderingContext context, String containingType, String containingId, String containedType, String containedId);
/**
* returns the correct literal URL for the specified logical uri
* @param context
* @param value
* @return
*/
String resolveUri(RenderingContext context, String uri);
}
public static class ResourceContext {

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

@ -271,6 +271,7 @@ public class ToolingExtensions {
public static final String EXT_WEB_SOURCE = "http://hl7.org/fhir/tools/StructureDefinition/web-source";
public static final String EXT_APPLICABLE_VERSION = "http://hl7.org/fhir/StructureDefinition/version-specific-use";
public static final String EXT_APPLICABLE_VERSION_VALUE = "http://hl7.org/fhir/StructureDefinition/version-specific-value";
public static final String EXT_IG_URL = "http://hl7.org/fhir/tools/StructureDefinition/implementationguide-resource-uri";
// specific extension helpers