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

add backward compatility for cross function

Browse Source
This commit is contained in:
jackyq2015 2017-07-23 19:19:58 -04:00
parent ef8b5ffce3
commit 4950d29074
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/src/com/google/refine/expr/functions/Cross.java
View File

@ -51,13 +51,13 @@ public class Cross implements Function {
@Override @Override
public Object call(Properties bindings, Object[] args) { public Object call(Properties bindings, Object[] args) {
if (args.length == 3) { if (args.length == 3) {
// from project is implied // 1st argument can take either value or cell(for backward compatibility)
Object v = args[0];
Object v = args[0]; // from cell
Object toProjectName = args[1]; Object toProjectName = args[1];
Object toColumnName = args[2]; Object toColumnName = args[2];
if (v != null && v instanceof String && if (v != null &&
( v instanceof String || v instanceof WrappedCell ) &&
toProjectName != null && toProjectName instanceof String && toProjectName != null && toProjectName instanceof String &&
toColumnName != null && toColumnName instanceof String) { toColumnName != null && toColumnName instanceof String) {
@ -68,10 +68,12 @@ public class Cross implements Function {
(String) toColumnName (String) toColumnName
); );
return join.getRows((String)v); String srcValue = v instanceof String ? (String)v : (String)((WrappedCell) v).cell.value;
return join.getRows(srcValue);
} }
} }
return new EvalError(ControlFunctionRegistry.getFunctionName(this) + " expects a string, a project name to join with, and a column name in that project"); return new EvalError(ControlFunctionRegistry.getFunctionName(this) + " expects a string or cell, a project name to join with, and a column name in that project");
} }
@Override @Override