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 join implementation to make separator parameter optional

This commit is contained in:
Grahame Grieve 2023-10-03 16:10:48 +03:00
parent 0adc364b8a
commit ee819e3f08
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -536,6 +536,13 @@ public class FHIRPathEngine {
return res; return res;
} }
public TypeDetails checkOnTypes(Object appContext, String resourceType, TypeDetails types, ExpressionNode expr, List<String> warnings) throws FHIRLexerException, PathEngineException, DefinitionException {
typeWarnings.clear();
TypeDetails res = executeType(new ExecutionTypeContext(appContext, resourceType, types, types), types, expr, null, true, false);
warnings.addAll(typeWarnings);
return res;
}
/** /**
* check that paths referred to in the ExpressionNode are valid * check that paths referred to in the ExpressionNode are valid
* *
@ -1361,7 +1368,7 @@ public class FHIRPathEngine {
case Unescape: return checkParamCount(lexer, location, exp, 1); case Unescape: return checkParamCount(lexer, location, exp, 1);
case Trim: return checkParamCount(lexer, location, exp, 0); case Trim: return checkParamCount(lexer, location, exp, 0);
case Split: return checkParamCount(lexer, location, exp, 1); case Split: return checkParamCount(lexer, location, exp, 1);
case Join: return checkParamCount(lexer, location, exp, 1); case Join: return checkParamCount(lexer, location, exp, 0, 1);
case HtmlChecks1: return checkParamCount(lexer, location, exp, 0); case HtmlChecks1: return checkParamCount(lexer, location, exp, 0);
case HtmlChecks2: return checkParamCount(lexer, location, exp, 0); case HtmlChecks2: return checkParamCount(lexer, location, exp, 0);
case Comparable: return checkParamCount(lexer, location, exp, 1); case Comparable: return checkParamCount(lexer, location, exp, 1);
@ -4209,12 +4216,16 @@ public class FHIRPathEngine {
} }
private List<Base> funcJoin(ExecutionContext context, List<Base> focus, ExpressionNode exp) { private List<Base> funcJoin(ExecutionContext context, List<Base> focus, ExpressionNode exp) {
List<Base> nl = execute(context, focus, exp.getParameters().get(0), true); List<Base> nl = exp.getParameters().size() > 0 ? execute(context, focus, exp.getParameters().get(0), true) : new ArrayList<Base>();
String param = nl.get(0).primitiveValue(); String param = "";
String param2 = param; String param2 = "";
if (exp.getParameters().size() == 2) { if (exp.getParameters().size() > 0) {
nl = execute(context, focus, exp.getParameters().get(1), true); param = nl.get(0).primitiveValue();
param2 = nl.get(0).primitiveValue(); param2 = param;
if (exp.getParameters().size() == 2) {
nl = execute(context, focus, exp.getParameters().get(1), true);
param2 = nl.get(0).primitiveValue();
}
} }
List<Base> result = new ArrayList<Base>(); List<Base> result = new ArrayList<Base>();