s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Return errors not nulls when: wrong number of arguments supplied; first argument zero length/empty string

Browse Source
This commit is contained in:
Owen Stephens 2018-02-21 23:19:54 +00:00
parent 2758633f32
commit 5aaf4362b0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/com/google/refine/expr/functions/ToNumber.java
View File

@ -39,6 +39,7 @@ import org.json.JSONException;
import org.json.JSONWriter; import org.json.JSONWriter;
import com.google.refine.expr.EvalError; import com.google.refine.expr.EvalError;
import com.google.refine.grel.ControlFunctionRegistry;
import com.google.refine.grel.Function; import com.google.refine.grel.Function;
public class ToNumber implements Function { public class ToNumber implements Function {
@ -58,12 +59,15 @@ public class ToNumber implements Function {
try { try {
return Double.parseDouble(s); return Double.parseDouble(s);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return new EvalError("Cannot parse to number"); return new EvalError("Unable to parse as number");
} }
} else {
return new EvalError("Unable to parse as number");
} }
} }
} else {
return new EvalError(ControlFunctionRegistry.getFunctionName(this) + " expects one non-null argument");
} }
return null;
} }
@Override @Override