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:20:15 +00:00
parent 5aaf4362b0
commit 24f1923ff4
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main/src/com/google/refine/expr/functions/ToDate.java
View File

@ -50,29 +50,30 @@ import com.google.refine.expr.EvalError;
import com.google.refine.expr.util.CalendarParser; import com.google.refine.expr.util.CalendarParser;
import com.google.refine.expr.util.CalendarParserException; import com.google.refine.expr.util.CalendarParserException;
import com.google.refine.grel.Function; import com.google.refine.grel.Function;
import com.google.refine.grel.ControlFunctionRegistry;
import com.google.refine.util.ParsingUtilities; import com.google.refine.util.ParsingUtilities;
public class ToDate implements Function { public class ToDate implements Function {
@Override @Override
public Object call(Properties bindings, Object[] args) { public Object call(Properties bindings, Object[] args) {
if (args.length == 0) {
// missing value, can this happen?
return null;
}
Object arg0 = args[0];
String o1; String o1;
if (args.length == 0) {
return new EvalError(ControlFunctionRegistry.getFunctionName(this) + " expects at least one argument");
} else {
Object arg0 = args[0];
if (arg0 instanceof Date) { if (arg0 instanceof Date) {
return arg0; return arg0;
} else if (arg0 instanceof Calendar) { } else if (arg0 instanceof Calendar) {
return ((Calendar) arg0).getTime(); return ((Calendar) arg0).getTime();
} else if (arg0 instanceof Long) { } else if (arg0 instanceof Long) {
o1 = ((Long) arg0).toString(); // treat integers as years o1 = ((Long) arg0).toString(); // treat integers as years
} else if (arg0 instanceof String) { } else if (arg0 instanceof String && arg0.toString().trim().length() > 0) {
o1 = (String) arg0; o1 = (String) arg0;
} else { } else {
// ignore cell values that aren't strings // ignore cell values that aren't Date, Calendar, Long or String
return new EvalError("Not a String - cannot parse to date"); return new EvalError("Unable to parse as date");
}
} }
// "o, boolean month_first (optional)" // "o, boolean month_first (optional)"
@ -98,13 +99,12 @@ public class ToDate implements Function {
// } catch (DatatypeConfigurationException e2) { // } catch (DatatypeConfigurationException e2) {
// } // }
} }
return new EvalError("Cannot parse to date"); return new EvalError("Unable to parse as date");
} }
} } else if (args.length>=2) {
// "o, format1, format2 (optional), ..." // "o, format1, format2 (optional), ..."
Locale locale = Locale.getDefault(); Locale locale = Locale.getDefault();
if (args.length>=2) {
for (int i=1;i<args.length;i++) { for (int i=1;i<args.length;i++) {
if (!(args[i] instanceof String)) { if (!(args[i] instanceof String)) {
// skip formats that aren't strings // skip formats that aren't strings
@ -156,9 +156,9 @@ public class ToDate implements Function {
} }
} }
return new EvalError("Unable to parse as date"); return new EvalError("Unable to parse as date");
} else {
return new EvalError("Unable to parse as date");
} }
return null;
} }