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 #1253 from hapifhir/gg-202305-fhirpath 

Fix FHIRPath split function
This commit is contained in:
Grahame Grieve 2023-05-06 11:18:28 -05:00 committed by GitHub
parent 24b0cc2ee4 d35b881cf1
commit 974ecfb794
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java
View File

@ -16,6 +16,7 @@ import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
import org.fhir.ucum.Decimal; import org.fhir.ucum.Decimal;
import org.fhir.ucum.Pair; import org.fhir.ucum.Pair;
import org.fhir.ucum.UcumException; import org.fhir.ucum.UcumException;
@ -4224,7 +4225,8 @@ public class FHIRPathEngine {
List<Base> result = new ArrayList<Base>(); List<Base> result = new ArrayList<Base>();
if (focus.size() == 1) { if (focus.size() == 1) {
String cnt = focus.get(0).primitiveValue(); String cnt = focus.get(0).primitiveValue();
for (String s : cnt.split(param)) { String[] sl = Pattern.compile(param, Pattern.LITERAL).split(cnt);
for (String s : sl) {
result.add(new StringType(s)); result.add(new StringType(s));
} }
} }

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/settings/FhirSettings.java
View File

@ -52,7 +52,7 @@ public class FhirSettings {
getInstance(); getInstance();
return instance.fhirSettings.getApiKeys() != null return instance.fhirSettings.getApiKeys() != null
? instance.fhirSettings.getApiKeys().get(key) != null ? instance.fhirSettings.getApiKeys().get(key) != null
: null; : false;
} }
public static String getNpmPath() { public static String getNpmPath() {