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 problem with value set anchor generation when rendering

This commit is contained in:
Grahame Grieve 2024-07-17 13:27:51 +09:30
parent 128f3733e2
commit 980f88ea49
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,10 +278,11 @@ public class DataRenderer extends Renderer implements CodeResolver {
String s = codeSystem+'-'+code;
StringBuilder b = new StringBuilder();
for (char c : s.toCharArray()) {
if (Character.isAlphabetic(c) || Character.isDigit(c) || c == '.')
b.append(c);
else
b.append('-');
if (Utilities.isValidHtmlAnchorChar(c)) {
b.append(c);
} else {
b.append("|"+Integer.toHexString(c)); // not % to save double coding confusing users
}
}
return b.toString();
}

3
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java
View File

@ -809,7 +809,8 @@ public class ValueSetRenderer extends TerminologyRenderer {
XhtmlNode td = tr.td();
String tgt = makeAnchor(c.getSystem(), c.getCode());
td.an(res.getScopedId()+"-"+context.prefixAnchor(tgt));
String pfx = res.getScopedId();
td.an((context.prefixAnchor(pfx == null ? "" : pfx+"-")+tgt));
if (doLevel) {
td.addText(Integer.toString(i));

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

@ -2254,4 +2254,34 @@ public class Utilities {
}
}
public static boolean isValidHtmlAnchorChar(char c) {
if ( (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')) {
return true;
}
switch (c) {
case '!':
case '$':
case '&':
case '\'':
case '(':
case ')':
case '*':
case '+':
case ',':
case ';':
case '=':
case '.':
case '_':
case '-':
case '~':
case ':':
case '@':
case '/':
case '?':
return true;
default:
return false;
}
}
}