Added a few more expression functions.

Bind row index when filtering rows, so we can create facets based on row indices.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@125 7d457c2a-affb-35e4-300a-418c747d4874

src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNominalRowGrouper.java

@@ -27,7 +27,7 @@ public class ExpressionNominalRowGrouper implements RowVisitor {
 		Cell cell = row.getCell(_cellIndex);
 
         Properties bindings = ExpressionUtils.createBindings(project);
-        ExpressionUtils.bind(bindings, row, cell);
+        ExpressionUtils.bind(bindings, row, rowIndex, cell);
 		
 		Object value = _evaluable.evaluate(bindings);
 		if (value != null) {

src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNumericRowBinner.java

@@ -27,7 +27,7 @@ public class ExpressionNumericRowBinner implements RowVisitor {
 		Cell cell = row.getCell(_cellIndex);
 
         Properties bindings = ExpressionUtils.createBindings(project);
-        ExpressionUtils.bind(bindings, row, cell);
+        ExpressionUtils.bind(bindings, row, rowIndex, cell);
 		
 		Object value = _evaluable.evaluate(bindings);
 		if (value != null) {

src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinIndex.java

@@ -27,7 +27,7 @@ public class NumericBinIndex {
 			Row row = project.rows.get(i);
 			Cell cell = row.getCell(cellIndex);
 
-            ExpressionUtils.bind(bindings, row, cell);
+            ExpressionUtils.bind(bindings, row, i, cell);
 			
 			Object value = eval.evaluate(bindings);
 			if (value != null) {

src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java

@@ -22,7 +22,7 @@ public class ExpressionEqualRowFilter implements RowFilter {
 	public boolean filterRow(Project project, int rowIndex, Row row) {
 		Cell cell = row.getCell(_cellIndex);
         Properties bindings = ExpressionUtils.createBindings(project);
-        ExpressionUtils.bind(bindings, row, cell);
+        ExpressionUtils.bind(bindings, row, rowIndex, cell);
 		
 		Object value = _evaluable.evaluate(bindings);
 		if (value != null) {

src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java

@@ -21,7 +21,7 @@ abstract public class ExpressionNumberComparisonRowFilter implements RowFilter {
 		Cell cell = row.getCell(_cellIndex);
 
         Properties bindings = ExpressionUtils.createBindings(project);
-        ExpressionUtils.bind(bindings, row, cell);
+        ExpressionUtils.bind(bindings, row, rowIndex, cell);
 		
 		Object value = _evaluable.evaluate(bindings);
 		if (value != null) {

src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java

@@ -20,7 +20,7 @@ abstract public class ExpressionStringComparisonRowFilter implements RowFilter {
 	public boolean filterRow(Project project, int rowIndex, Row row) {
 		Cell cell = row.getCell(_cellIndex);
         Properties bindings = ExpressionUtils.createBindings(project);
-        ExpressionUtils.bind(bindings, row, cell);
+        ExpressionUtils.bind(bindings, row, rowIndex, cell);
 		
 		Object value = _evaluable.evaluate(bindings);
 		if (value != null) {

src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java

@@ -59,7 +59,7 @@ public class PreviewExpressionCommand extends Command {
 						Row row = project.rows.get(rowIndex);
 						Cell cell = row.getCell(cellIndex);
 							
-					    ExpressionUtils.bind(bindings, row, cell);
+					    ExpressionUtils.bind(bindings, row, rowIndex, cell);
 						
 						try {
 							result = eval.evaluate(bindings);

src/main/java/com/metaweb/gridworks/expr/ExpressionUtils.java

@@ -18,8 +18,9 @@ public class ExpressionUtils {
         return bindings;
     }
     
-    static public void bind(Properties bindings, Row row, Cell cell) {
+    static public void bind(Properties bindings, Row row, int rowIndex, Cell cell) {
         bindings.put("row", row);
+        bindings.put("rowIndex", rowIndex);
         bindings.put("cells", row.getField("cells", bindings));
         
         if (cell == null) {

src/main/java/com/metaweb/gridworks/expr/Parser.java

@@ -13,7 +13,9 @@ import com.metaweb.gridworks.expr.controls.ForNonBlank;
 import com.metaweb.gridworks.expr.controls.If;
 import com.metaweb.gridworks.expr.controls.With;
 import com.metaweb.gridworks.expr.functions.And;
+import com.metaweb.gridworks.expr.functions.Ceil;
 import com.metaweb.gridworks.expr.functions.EndsWith;
+import com.metaweb.gridworks.expr.functions.Floor;
 import com.metaweb.gridworks.expr.functions.Get;
 import com.metaweb.gridworks.expr.functions.IndexOf;
 import com.metaweb.gridworks.expr.functions.IsBlank;
@@ -23,13 +25,17 @@ import com.metaweb.gridworks.expr.functions.IsNull;
 import com.metaweb.gridworks.expr.functions.Join;
 import com.metaweb.gridworks.expr.functions.LastIndexOf;
 import com.metaweb.gridworks.expr.functions.Length;
+import com.metaweb.gridworks.expr.functions.Mod;
 import com.metaweb.gridworks.expr.functions.Not;
 import com.metaweb.gridworks.expr.functions.Or;
 import com.metaweb.gridworks.expr.functions.Replace;
+import com.metaweb.gridworks.expr.functions.Round;
 import com.metaweb.gridworks.expr.functions.Slice;
 import com.metaweb.gridworks.expr.functions.Split;
 import com.metaweb.gridworks.expr.functions.StartsWith;
 import com.metaweb.gridworks.expr.functions.ToLowercase;
+import com.metaweb.gridworks.expr.functions.ToNumber;
+import com.metaweb.gridworks.expr.functions.ToString;
 import com.metaweb.gridworks.expr.functions.ToTitlecase;
 import com.metaweb.gridworks.expr.functions.ToUppercase;
 
@@ -42,6 +48,9 @@ public class Parser {
     static public Map<String, Control> controlTable = new HashMap<String, Control>();
     
 	static {
+		functionTable.put("toString", new ToString());
+		functionTable.put("toNumber", new ToNumber());
+		
 		functionTable.put("toUppercase", new ToUppercase());
 		functionTable.put("toLowercase", new ToLowercase());
 		functionTable.put("toTitlecase", new ToTitlecase());
@@ -59,6 +68,11 @@ public class Parser {
 		functionTable.put("endsWith", new EndsWith());
 		functionTable.put("join", new Join());
 		
+		functionTable.put("round", new Round());
+		functionTable.put("floor", new Floor());
+		functionTable.put("ceil", new Ceil());
+		functionTable.put("mod", new Mod());
+		
 		functionTable.put("and", new And());
 		functionTable.put("or", new Or());
 		functionTable.put("not", new Not());

src/main/java/com/metaweb/gridworks/expr/functions/Ceil.java

@@ -0,0 +1,16 @@
+package com.metaweb.gridworks.expr.functions;
+
+import java.util.Properties;
+
+import com.metaweb.gridworks.expr.Function;
+
+public class Ceil implements Function {
+
+	public Object call(Properties bindings, Object[] args) {
+		if (args.length == 1 && args[0] instanceof Number) {
+			return (long) Math.ceil(((Number) args[0]).doubleValue());
+		}
+		return null;
+	}
+
+}

src/main/java/com/metaweb/gridworks/expr/functions/Floor.java

@@ -0,0 +1,16 @@
+package com.metaweb.gridworks.expr.functions;
+
+import java.util.Properties;
+
+import com.metaweb.gridworks.expr.Function;
+
+public class Floor implements Function {
+
+	public Object call(Properties bindings, Object[] args) {
+		if (args.length == 1 && args[0] instanceof Number) {
+			return (long) Math.floor(((Number) args[0]).doubleValue());
+		}
+		return null;
+	}
+
+}

src/main/java/com/metaweb/gridworks/expr/functions/Mod.java

@@ -0,0 +1,19 @@
+package com.metaweb.gridworks.expr.functions;
+
+import java.util.Properties;
+
+import com.metaweb.gridworks.expr.Function;
+
+public class Mod implements Function {
+
+	public Object call(Properties bindings, Object[] args) {
+		if (args.length == 2 && args[0] instanceof Number && args[1] instanceof Number) {
+			int a = ((Number) args[0]).intValue();
+			int b = ((Number) args[0]).intValue();
+			
+			return a % b;
+		}
+		return null;
+	}
+
+}

src/main/java/com/metaweb/gridworks/expr/functions/Round.java

@@ -0,0 +1,16 @@
+package com.metaweb.gridworks.expr.functions;
+
+import java.util.Properties;
+
+import com.metaweb.gridworks.expr.Function;
+
+public class Round implements Function {
+
+	public Object call(Properties bindings, Object[] args) {
+		if (args.length == 1 && args[0] instanceof Number) {
+			return ((Number) args[0]).longValue();
+		}
+		return null;
+	}
+
+}

src/main/java/com/metaweb/gridworks/expr/functions/ToNumber.java

@@ -0,0 +1,16 @@
+package com.metaweb.gridworks.expr.functions;
+
+import java.util.Properties;
+
+import com.metaweb.gridworks.expr.Function;
+
+public class ToNumber implements Function {
+
+	public Object call(Properties bindings, Object[] args) {
+		if (args.length == 1) {
+			return args[0] instanceof Number ? args[0] : Double.parseDouble(args[0].toString());
+		}
+		return null;
+	}
+
+}

src/main/java/com/metaweb/gridworks/expr/functions/ToString.java

@@ -0,0 +1,16 @@
+package com.metaweb.gridworks.expr.functions;
+
+import java.util.Properties;
+
+import com.metaweb.gridworks.expr.Function;
+
+public class ToString implements Function {
+
+	public Object call(Properties bindings, Object[] args) {
+		if (args.length == 1) {
+			return args[0] instanceof String ? args[0] : args[0].toString();
+		}
+		return null;
+	}
+
+}

src/main/java/com/metaweb/gridworks/model/Row.java

@@ -42,6 +42,8 @@ public class Row implements Serializable, HasFields, Jsonizable {
 			return starred;
 		} else if ("cells".equals(name)) {
 			return new Cells();
+		} else if ("index".equals(name)) {
+			return bindings.get("rowIndex");
 		}
 		return null;
 	}

src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java

@@ -133,7 +133,7 @@ public class ColumnAdditionOperation extends EngineDependentOperation {
 			public boolean visit(Project project, int rowIndex, Row row, boolean contextual) {
 				Cell cell = row.getCell(cellIndex);
 
-                ExpressionUtils.bind(bindings, row, cell);
+                ExpressionUtils.bind(bindings, row, rowIndex, cell);
 				
                 Object v = eval.evaluate(bindings);
                 if (v != null) {

src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java

@@ -84,7 +84,7 @@ public class TextTransformOperation extends EngineDependentMassCellOperation {
 			public boolean visit(Project project, int rowIndex, Row row, boolean contextual) {
 				Cell cell = row.getCell(cellIndex);
 
-                ExpressionUtils.bind(bindings, row, cell);
+                ExpressionUtils.bind(bindings, row, rowIndex, cell);
 				
                 Object v = eval.evaluate(bindings);
                 if ((cell != null && cell.value != null) || v != null) {