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

Color-code date values in data table.

Browse Source 
Fixed Issue 426: filter with custom facet adds zero lines choice

git-svn-id: http://google-refine.googlecode.com/svn/trunk@2251 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2011-09-20 01:36:47 +00:00
parent 59d6020979
commit e1184003df
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/jython/src/com/google/refine/jython/JythonEvaluable.java
View File

@ -41,7 +41,10 @@ import java.util.Properties;
import org.python.core.Py; import org.python.core.Py;
import org.python.core.PyException; import org.python.core.PyException;
import org.python.core.PyFloat;
import org.python.core.PyFunction; import org.python.core.PyFunction;
import org.python.core.PyInteger;
import org.python.core.PyLong;
import org.python.core.PyNone; import org.python.core.PyNone;
import org.python.core.PyObject; import org.python.core.PyObject;
import org.python.core.PyString; import org.python.core.PyString;
@ -137,6 +140,12 @@ public class JythonEvaluable implements Evaluable {
return ((JythonHasFieldsWrapper) result)._obj; return ((JythonHasFieldsWrapper) result)._obj;
} else if (result instanceof PyString) { } else if (result instanceof PyString) {
return ((PyString) result).asString(); return ((PyString) result).asString();
} else if (result instanceof PyInteger) {
return (long) ((PyInteger) result).asInt();
} else if (result instanceof PyLong) {
return ((PyLong) result).getLong(Long.MIN_VALUE, Long.MAX_VALUE);
} else if (result instanceof PyFloat) {
return ((PyFloat) result).asDouble();
} else if (result instanceof PyObject) { } else if (result instanceof PyObject) {
return unwrap((PyObject) result); return unwrap((PyObject) result);
} }

2
main/src/com/google/refine/browsing/util/ExpressionNominalValueGrouper.java
View File

@ -183,7 +183,7 @@ public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor
facetChoice.count++; facetChoice.count++;
} }
} else { } else {
String label = value.toString(); String label = valueString;
DecoratedValue dValue = new DecoratedValue(value, label); DecoratedValue dValue = new DecoratedValue(value, label);
IndexedNominalFacetChoice choice = IndexedNominalFacetChoice choice =
new IndexedNominalFacetChoice(dValue, index); new IndexedNominalFacetChoice(dValue, index);

2
main/webapp/modules/core/scripts/views/data-table/cell-ui.js
View File

@ -64,7 +64,7 @@ DataTableCellUI.prototype._render = function() {
} else if ("e" in cell) { } else if ("e" in cell) {
$('<span>').addClass("data-table-error").text(cell.e).appendTo(divContent); $('<span>').addClass("data-table-error").text(cell.e).appendTo(divContent);
} else if (!("r" in cell) || !cell.r) { } else if (!("r" in cell) || !cell.r) {
if (typeof cell.v !== "string") { if (typeof cell.v !== "string" || "t" in cell) {
if (typeof cell.v == "number") { if (typeof cell.v == "number") {
divContent.addClass("data-table-cell-content-numeric"); divContent.addClass("data-table-cell-content-numeric");
} }