Merge pull request #1969 from OpenRefine/revert-1888-fix-reconcile-facets
Revert "Fix Reconcile facets affected by change to list facet boolean handling"
This commit is contained in:
Antonin Delpeuch
GitHub
commit
7f6831523e
@ -95,12 +95,6 @@ public class ListFacet implements Facet {
|
||||
|
||||
@JsonIgnore
|
||||
public List<DecoratedValue> selection = new LinkedList<>();
|
||||
@JsonProperty("selectNumber")
|
||||
public boolean selectNumber;
|
||||
@JsonProperty("selectDateTime")
|
||||
public boolean selectDateTime;
|
||||
@JsonProperty("selectBoolean")
|
||||
public boolean selectBoolean;
|
||||
@JsonProperty("selectBlank")
|
||||
public boolean selectBlank;
|
||||
@JsonProperty("selectError")
|
||||
@ -162,9 +156,6 @@ public class ListFacet implements Facet {
|
||||
* Computed results
|
||||
*/
|
||||
protected List<NominalFacetChoice> _choices = new LinkedList<NominalFacetChoice>();
|
||||
protected int _numberCount;
|
||||
protected int _datetimeCount;
|
||||
protected int _booleanCount;
|
||||
protected int _blankCount;
|
||||
protected int _errorCount;
|
||||
|
||||
@ -278,16 +269,13 @@ public class ListFacet implements Facet {
|
||||
return
|
||||
_eval == null ||
|
||||
_errorMessage != null ||
|
||||
(_config.selection.size() == 0 && !_config.selectBlank && !_config.selectError && !_config.selectNumber && !_config.selectDateTime && !_config.selectBoolean) ?
|
||||
(_config.selection.size() == 0 && !_config.selectBlank && !_config.selectError) ?
|
||||
null :
|
||||
new ExpressionEqualRowFilter(
|
||||
_eval,
|
||||
_config.columnName,
|
||||
_cellIndex,
|
||||
createMatches(),
|
||||
_config.selectNumber,
|
||||
_config.selectDateTime,
|
||||
_config.selectBoolean,
|
||||
_config.selectBlank,
|
||||
_config.selectError,
|
||||
_config.invert);
|
||||
@ -353,9 +341,6 @@ public class ListFacet implements Facet {
|
||||
}
|
||||
}
|
||||
|
||||
_numberCount = grouper.numberCount;
|
||||
_datetimeCount = grouper.datetimeCount;
|
||||
_booleanCount = grouper.booleanCount;
|
||||
_blankCount = grouper.blankCount;
|
||||
_errorCount = grouper.errorCount;
|
||||
}
|
||||
|
||||
@ -33,7 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
package com.google.refine.browsing.filters;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.Properties;
|
||||
|
||||
@ -58,10 +57,8 @@ public class ExpressionEqualRowFilter implements RowFilter {
|
||||
final protected int _cellIndex; // the expression is based on this column;
|
||||
// -1 if based on no column in particular,
|
||||
// for expression such as "row.starred".
|
||||
|
||||
final protected Object[] _matches;
|
||||
final protected boolean _selectNumber;
|
||||
final protected boolean _selectDateTime;
|
||||
final protected boolean _selectBoolean;
|
||||
final protected boolean _selectBlank;
|
||||
final protected boolean _selectError;
|
||||
final protected boolean _invert;
|
||||
@ -71,9 +68,6 @@ public class ExpressionEqualRowFilter implements RowFilter {
|
||||
String columnName,
|
||||
int cellIndex,
|
||||
Object[] matches,
|
||||
boolean selectNumber,
|
||||
boolean selectDateTime,
|
||||
boolean selectBoolean,
|
||||
boolean selectBlank,
|
||||
boolean selectError,
|
||||
boolean invert
|
||||
@ -82,9 +76,6 @@ public class ExpressionEqualRowFilter implements RowFilter {
|
||||
_columnName = columnName;
|
||||
_cellIndex = cellIndex;
|
||||
_matches = matches;
|
||||
_selectNumber = selectNumber;
|
||||
_selectDateTime = selectDateTime;
|
||||
_selectBoolean = selectBoolean;
|
||||
_selectBlank = selectBlank;
|
||||
_selectError = selectError;
|
||||
_invert = invert;
|
||||
@ -178,12 +169,6 @@ public class ExpressionEqualRowFilter implements RowFilter {
|
||||
protected boolean testValue(Object v) {
|
||||
if (ExpressionUtils.isError(v)) {
|
||||
return _selectError;
|
||||
} else if (v instanceof Number) {
|
||||
return _selectNumber;
|
||||
} else if (v instanceof OffsetDateTime) {
|
||||
return _selectDateTime;
|
||||
} else if (v instanceof Boolean) {
|
||||
return _selectBoolean;
|
||||
} else if (ExpressionUtils.isNonBlankData(v)) {
|
||||
for (Object match : _matches) {
|
||||
if (testValue(v, match)) {
|
||||
|
||||
@ -57,6 +57,15 @@ import com.google.refine.util.StringUtils;
|
||||
* from a given expression.
|
||||
*/
|
||||
public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor {
|
||||
static public class IndexedNominalFacetChoice extends NominalFacetChoice {
|
||||
int _latestIndex;
|
||||
|
||||
public IndexedNominalFacetChoice(DecoratedValue decoratedValue, int latestIndex) {
|
||||
super(decoratedValue);
|
||||
_latestIndex = latestIndex;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Configuration
|
||||
*/
|
||||
@ -68,30 +77,15 @@ public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor
|
||||
* Computed results
|
||||
*/
|
||||
final public Map<Object, IndexedNominalFacetChoice> choices = new HashMap<Object, IndexedNominalFacetChoice>();
|
||||
public int numberCount = 0;
|
||||
public int datetimeCount = 0;
|
||||
public int booleanCount = 0;
|
||||
public int blankCount = 0;
|
||||
public int errorCount = 0;
|
||||
|
||||
/*
|
||||
* Scratch pad variables
|
||||
*/
|
||||
protected boolean hasNumber;
|
||||
protected boolean hasDateTime;
|
||||
protected boolean hasBoolean;
|
||||
protected boolean hasBlank;
|
||||
protected boolean hasError;
|
||||
|
||||
static public class IndexedNominalFacetChoice extends NominalFacetChoice {
|
||||
int _latestIndex;
|
||||
|
||||
public IndexedNominalFacetChoice(DecoratedValue decoratedValue, int latestIndex) {
|
||||
super(decoratedValue);
|
||||
_latestIndex = latestIndex;
|
||||
}
|
||||
}
|
||||
|
||||
public ExpressionNominalValueGrouper(Evaluable evaluable, String columnName, int cellIndex) {
|
||||
_evaluable = evaluable;
|
||||
_columnName = columnName;
|
||||
@ -110,9 +104,6 @@ public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor
|
||||
|
||||
@Override
|
||||
public boolean visit(Project project, int rowIndex, Row row) {
|
||||
hasNumber = false;
|
||||
hasDateTime = false;
|
||||
hasBoolean = false;
|
||||
hasError = false;
|
||||
hasBlank = false;
|
||||
|
||||
@ -120,15 +111,6 @@ public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor
|
||||
|
||||
visitRow(project, rowIndex, row, bindings, rowIndex);
|
||||
|
||||
if (hasNumber) {
|
||||
numberCount++;
|
||||
}
|
||||
if (hasDateTime) {
|
||||
datetimeCount++;
|
||||
}
|
||||
if (hasBoolean) {
|
||||
booleanCount++;
|
||||
}
|
||||
if (hasError) {
|
||||
errorCount++;
|
||||
}
|
||||
@ -141,9 +123,6 @@ public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor
|
||||
|
||||
@Override
|
||||
public boolean visit(Project project, Record record) {
|
||||
hasNumber = false;
|
||||
hasDateTime = false;
|
||||
hasBoolean = false;
|
||||
hasError = false;
|
||||
hasBlank = false;
|
||||
|
||||
@ -154,15 +133,6 @@ public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor
|
||||
visitRow(project, r, row, bindings, record.recordIndex);
|
||||
}
|
||||
|
||||
if (hasNumber) {
|
||||
numberCount++;
|
||||
}
|
||||
if (hasDateTime) {
|
||||
datetimeCount++;
|
||||
}
|
||||
if (hasBoolean) {
|
||||
booleanCount++;
|
||||
}
|
||||
if (hasError) {
|
||||
errorCount++;
|
||||
}
|
||||
@ -204,12 +174,6 @@ public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor
|
||||
protected void processValue(Object value, int index) {
|
||||
if (ExpressionUtils.isError(value)) {
|
||||
hasError = true;
|
||||
} else if (ExpressionUtils.isNumber(value)) {
|
||||
hasNumber = true;
|
||||
} else if (ExpressionUtils.isDateTime(value)) {
|
||||
hasDateTime = true;
|
||||
} else if (ExpressionUtils.isBoolean(value)) {
|
||||
hasBoolean = true;
|
||||
} else if (ExpressionUtils.isNonBlankData(value)) {
|
||||
String valueString = StringUtils.toString(value);
|
||||
IndexedNominalFacetChoice facetChoice = choices.get(valueString);
|
||||
@ -272,12 +236,6 @@ public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor
|
||||
public Integer getChoiceValueCount(Object choiceValue) {
|
||||
if (ExpressionUtils.isError(choiceValue)) {
|
||||
return errorCount;
|
||||
} else if (ExpressionUtils.isNumber(choiceValue)) {
|
||||
return numberCount;
|
||||
} else if (ExpressionUtils.isDateTime(choiceValue)) {
|
||||
return datetimeCount;
|
||||
} else if (ExpressionUtils.isBoolean(choiceValue)) {
|
||||
return booleanCount;
|
||||
} else if (ExpressionUtils.isNonBlankData(choiceValue)) {
|
||||
IndexedNominalFacetChoice choice = choices.get(StringUtils.toString(choiceValue));
|
||||
return choice != null ? choice.count : 0;
|
||||
|
||||
@ -102,19 +102,11 @@ public class ExpressionUtils {
|
||||
static public boolean isError(Object o) {
|
||||
return o instanceof EvalError;
|
||||
}
|
||||
|
||||
static public boolean isNumber(Object v) {
|
||||
return v != null && (v instanceof Number);
|
||||
/*
|
||||
static public boolean isBlank(Object o) {
|
||||
return o == null || (o instanceof String && ((String) o).length() == 0);
|
||||
}
|
||||
|
||||
static public boolean isBoolean(Object v) {
|
||||
return v != null && v instanceof Boolean;
|
||||
}
|
||||
|
||||
static public boolean isDateTime(Object v) {
|
||||
return v != null && v instanceof OffsetDateTime;
|
||||
}
|
||||
|
||||
*/
|
||||
static public boolean isNonBlankData(Object o) {
|
||||
return
|
||||
o != null &&
|
||||
|
||||
@ -45,14 +45,11 @@ public class ListFacetTests extends RefineTest {
|
||||
private static String jsonConfig = "{"
|
||||
+ "\"type\":\"list\","
|
||||
+ "\"name\":\"facet A\","
|
||||
+ "\"expression\":\"value+\\\"bar\\\"\","
|
||||
+ "\"columnName\":\"Column A\","
|
||||
+ "\"expression\":\"value+\\\"bar\\\"\","
|
||||
+ "\"omitBlank\":false,"
|
||||
+ "\"omitError\":false,"
|
||||
+ "\"selection\":[{\"v\":{\"v\":\"foobar\",\"l\":\"true\"}}],"
|
||||
+ "\"selectNumber\":false,"
|
||||
+ "\"selectDateTime\":false,"
|
||||
+ "\"selectBoolean\":false,"
|
||||
+ "\"selectBlank\":false,"
|
||||
+ "\"selectError\":false,"
|
||||
+ "\"invert\":false"
|
||||
|
||||
@ -1,435 +0,0 @@
|
||||
/*
|
||||
|
||||
Copyright 2018, Owen Stephens
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the following disclaimer
|
||||
in the documentation and/or other materials provided with the
|
||||
distribution.
|
||||
* Neither the name of the copyright holder nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
*/
|
||||
|
||||
package com.google.refine.tests.browsing.facets;
|
||||
|
||||
import com.google.refine.model.Cell;
|
||||
import com.google.refine.model.Row;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.testng.Assert;
|
||||
import org.testng.annotations.BeforeMethod;
|
||||
import org.testng.annotations.BeforeTest;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import com.google.refine.model.ModelException;
|
||||
import com.google.refine.model.Project;
|
||||
import com.google.refine.browsing.RowFilter;
|
||||
import com.google.refine.browsing.facets.Facet;
|
||||
import com.google.refine.browsing.facets.ListFacet.ListFacetConfig;
|
||||
import com.google.refine.tests.RefineTest;
|
||||
import com.google.refine.util.ParsingUtilities;
|
||||
|
||||
|
||||
public class TextListFacetTests extends RefineTest {
|
||||
// dependencies
|
||||
private Project project;
|
||||
private RowFilter rowfilter;
|
||||
|
||||
// Variables
|
||||
private static OffsetDateTime dateTimeValue = OffsetDateTime.parse("2017-05-12T05:45:00+00:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
|
||||
private static int integerValue = 1;
|
||||
private static String stringValue = "a";
|
||||
private static String emptyStringValue = "";
|
||||
private static Boolean booleanValue = true;
|
||||
|
||||
private static final String projectName = "TextListFacet";
|
||||
private static final String columnName = "Col1";
|
||||
private static final int numberOfRows = 5;
|
||||
|
||||
@Override
|
||||
@BeforeTest
|
||||
public void init() {
|
||||
logger = LoggerFactory.getLogger(this.getClass());
|
||||
}
|
||||
|
||||
@BeforeMethod
|
||||
public void setUp() throws IOException, ModelException {
|
||||
project = createProjectWithColumns(projectName, columnName);
|
||||
for (int i = 0; i < numberOfRows; i++) {
|
||||
Row row = new Row(1);
|
||||
row.setCell(0, new Cell(stringValue, null));
|
||||
project.rows.add(row);
|
||||
}
|
||||
for (int i = 0; i < numberOfRows; i++) {
|
||||
Row row = new Row(1);
|
||||
row.setCell(0, new Cell(dateTimeValue, null));
|
||||
project.rows.add(row);
|
||||
}
|
||||
for (int i = 0; i < numberOfRows; i++) {
|
||||
Row row = new Row(1);
|
||||
row.setCell(0, new Cell(integerValue, null));
|
||||
project.rows.add(row);
|
||||
}
|
||||
for (int i = 0; i < numberOfRows; i++) {
|
||||
Row row = new Row(1);
|
||||
row.setCell(0, new Cell(booleanValue, null));
|
||||
project.rows.add(row);
|
||||
}
|
||||
for (int i = 0; i < numberOfRows; i++) {
|
||||
Row row = new Row(1);
|
||||
row.setCell(0, new Cell(null, null));
|
||||
project.rows.add(row);
|
||||
}
|
||||
for (int i = 0; i < numberOfRows; i++) {
|
||||
Row row = new Row(1);
|
||||
row.setCell(0, new Cell(emptyStringValue, null));
|
||||
project.rows.add(row);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testTextSelection() throws Exception {
|
||||
//Need to work out the correct facet config for these tests to work
|
||||
//Also need all rows in all tests so can check that rows aren't being selected when they shouldn't be
|
||||
String jsonConfig = "{"
|
||||
+ "\"type\": \"list\","
|
||||
+ "\"name\": \"Value\","
|
||||
+ "\"columnName\": \"" + columnName + "\","
|
||||
+ "\"expression\": \"value\","
|
||||
+ "\"omitBlank\": false,"
|
||||
+ "\"omitError\": false,"
|
||||
+ "\"selection\": ["
|
||||
+ " {"
|
||||
+ "\"v\": {"
|
||||
+ "\"v\": \"a\","
|
||||
+ "\"l\": \"a\""
|
||||
+ "}"
|
||||
+ "}"
|
||||
+ "],"
|
||||
+ "\"selectNumber\": false,"
|
||||
+ "\"selectDateTime\": false,"
|
||||
+ "\"selectBoolean\": false,"
|
||||
+ "\"selectBlank\": false,"
|
||||
+ "\"selectError\": false,"
|
||||
+ "\"invert\": false"
|
||||
+ "}";
|
||||
|
||||
//Add the facet to the project and create a row filter
|
||||
ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);
|
||||
Facet facet = facetConfig.apply(project);
|
||||
rowfilter = facet.getRowFilter(project);
|
||||
|
||||
//Check each row in the project against the filter
|
||||
//Rows 1-5 are strings
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 4, project.rows.get(4)),true);
|
||||
//Rows 6-10 are DateTimes
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 5, project.rows.get(5)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 6, project.rows.get(6)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 7, project.rows.get(7)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 8, project.rows.get(8)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 9, project.rows.get(9)),false);
|
||||
//Rows 11-15 are integers
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 10, project.rows.get(10)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 11, project.rows.get(11)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 12, project.rows.get(12)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 13, project.rows.get(13)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 14, project.rows.get(14)),false);
|
||||
//Rows 16-20 are booleans
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 15, project.rows.get(15)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 16, project.rows.get(16)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 17, project.rows.get(17)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 18, project.rows.get(18)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 19, project.rows.get(19)),false);
|
||||
//Rows 21-25 are nulls
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 20, project.rows.get(20)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 21, project.rows.get(21)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 22, project.rows.get(22)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 23, project.rows.get(23)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 24, project.rows.get(24)),false);
|
||||
//Rows 26-30 are empty strings
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 25, project.rows.get(25)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 26, project.rows.get(26)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 27, project.rows.get(27)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 28, project.rows.get(28)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 29, project.rows.get(29)),false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDateSelection() throws Exception {
|
||||
String jsonConfig = "{"
|
||||
+ "\"type\": \"list\","
|
||||
+ "\"name\": \"Value\","
|
||||
+ "\"columnName\": \"" + columnName + "\","
|
||||
+ "\"expression\": \"value\","
|
||||
+ "\"omitBlank\": false,"
|
||||
+ "\"omitError\": false,"
|
||||
+ "\"selection\": [],"
|
||||
+ "\"selectNumber\": false,"
|
||||
+ "\"selectDateTime\": true,"
|
||||
+ "\"selectBoolean\": false,"
|
||||
+ "\"selectBlank\": false,"
|
||||
+ "\"selectError\": false,"
|
||||
+ "\"invert\": false"
|
||||
+ "}";
|
||||
|
||||
//Add the facet to the project and create a row filter
|
||||
ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);
|
||||
Facet facet = facetConfig.apply(project);
|
||||
rowfilter = facet.getRowFilter(project);
|
||||
|
||||
//Check each row in the project against the filter
|
||||
//Rows 1-5 are strings
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 4, project.rows.get(4)),false);
|
||||
//Rows 6-10 are DateTimes
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 5, project.rows.get(5)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 6, project.rows.get(6)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 7, project.rows.get(7)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 8, project.rows.get(8)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 9, project.rows.get(9)),true);
|
||||
//Rows 11-15 are integers
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 10, project.rows.get(10)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 11, project.rows.get(11)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 12, project.rows.get(12)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 13, project.rows.get(13)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 14, project.rows.get(14)),false);
|
||||
//Rows 16-20 are booleans
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 15, project.rows.get(15)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 16, project.rows.get(16)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 17, project.rows.get(17)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 18, project.rows.get(18)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 19, project.rows.get(19)),false);
|
||||
//Rows 21-25 are nulls
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 20, project.rows.get(20)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 21, project.rows.get(21)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 22, project.rows.get(22)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 23, project.rows.get(23)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 24, project.rows.get(24)),false);
|
||||
//Rows 26-30 are empty strings
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 25, project.rows.get(25)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 26, project.rows.get(26)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 27, project.rows.get(27)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 28, project.rows.get(28)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 29, project.rows.get(29)),false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testIntegerSelection() throws Exception {
|
||||
String jsonConfig = "{"
|
||||
+ "\"type\": \"list\","
|
||||
+ "\"name\": \"Value\","
|
||||
+ "\"columnName\": \"" + columnName + "\","
|
||||
+ "\"expression\": \"value\","
|
||||
+ "\"omitBlank\": false,"
|
||||
+ "\"omitError\": false,"
|
||||
+ "\"selection\": [],"
|
||||
+ "\"selectNumber\": true,"
|
||||
+ "\"selectDateTime\": false,"
|
||||
+ "\"selectBoolean\": false,"
|
||||
+ "\"selectBlank\": false,"
|
||||
+ "\"selectError\": false,"
|
||||
+ "\"invert\": false"
|
||||
+ "}";
|
||||
|
||||
//Add the facet to the project and create a row filter
|
||||
ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);
|
||||
Facet facet = facetConfig.apply(project);
|
||||
rowfilter = facet.getRowFilter(project);
|
||||
|
||||
//Check each row in the project against the filter
|
||||
//Rows 1-5 are strings
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 4, project.rows.get(4)),false);
|
||||
//Rows 6-10 are DateTimes
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 5, project.rows.get(5)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 6, project.rows.get(6)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 7, project.rows.get(7)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 8, project.rows.get(8)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 9, project.rows.get(9)),false);
|
||||
//Rows 11-15 are integers
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 10, project.rows.get(10)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 11, project.rows.get(11)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 12, project.rows.get(12)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 13, project.rows.get(13)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 14, project.rows.get(14)),true);
|
||||
//Rows 16-20 are booleans
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 15, project.rows.get(15)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 16, project.rows.get(16)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 17, project.rows.get(17)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 18, project.rows.get(18)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 19, project.rows.get(19)),false);
|
||||
//Rows 21-25 are nulls
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 20, project.rows.get(20)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 21, project.rows.get(21)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 22, project.rows.get(22)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 23, project.rows.get(23)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 24, project.rows.get(24)),false);
|
||||
//Rows 26-30 are empty strings
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 25, project.rows.get(25)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 26, project.rows.get(26)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 27, project.rows.get(27)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 28, project.rows.get(28)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 29, project.rows.get(29)),false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBooleanSelection() throws Exception {
|
||||
String jsonConfig = "{"
|
||||
+ "\"type\": \"list\","
|
||||
+ "\"name\": \"Value\","
|
||||
+ "\"columnName\": \"" + columnName + "\","
|
||||
+ "\"expression\": \"value\","
|
||||
+ "\"omitBlank\": false,"
|
||||
+ "\"omitError\": false,"
|
||||
+ "\"selection\": [],"
|
||||
+ "\"selectNumber\": false,"
|
||||
+ "\"selectDateTime\": false,"
|
||||
+ "\"selectBoolean\": true,"
|
||||
+ "\"selectBlank\": false,"
|
||||
+ "\"selectError\": false,"
|
||||
+ "\"invert\": false"
|
||||
+ "}";
|
||||
|
||||
//Add the facet to the project and create a row filter
|
||||
ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);
|
||||
Facet facet = facetConfig.apply(project);
|
||||
rowfilter = facet.getRowFilter(project);
|
||||
|
||||
//Check each row in the project against the filter
|
||||
//Rows 1-5 are strings
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 4, project.rows.get(4)),false);
|
||||
//Rows 6-10 are DateTimes
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 5, project.rows.get(5)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 6, project.rows.get(6)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 7, project.rows.get(7)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 8, project.rows.get(8)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 9, project.rows.get(9)),false);
|
||||
//Rows 11-15 are integers
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 10, project.rows.get(10)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 11, project.rows.get(11)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 12, project.rows.get(12)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 13, project.rows.get(13)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 14, project.rows.get(14)),false);
|
||||
//Rows 16-20 are booleans
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 15, project.rows.get(15)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 16, project.rows.get(16)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 17, project.rows.get(17)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 18, project.rows.get(18)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 19, project.rows.get(19)),true);
|
||||
//Rows 21-25 are nulls
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 20, project.rows.get(20)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 21, project.rows.get(21)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 22, project.rows.get(22)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 23, project.rows.get(23)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 24, project.rows.get(24)),false);
|
||||
//Rows 26-30 are empty strings
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 25, project.rows.get(25)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 26, project.rows.get(26)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 27, project.rows.get(27)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 28, project.rows.get(28)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 29, project.rows.get(29)),false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBlankSelection() throws Exception {
|
||||
String jsonConfig = "{"
|
||||
+ "\"type\": \"list\","
|
||||
+ "\"name\": \"Value\","
|
||||
+ "\"columnName\": \"" + columnName + "\","
|
||||
+ "\"expression\": \"value\","
|
||||
+ "\"omitBlank\": false,"
|
||||
+ "\"omitError\": false,"
|
||||
+ "\"selection\": [],"
|
||||
+ "\"selectNumber\": false,"
|
||||
+ "\"selectDateTime\": false,"
|
||||
+ "\"selectBoolean\": false,"
|
||||
+ "\"selectBlank\": true,"
|
||||
+ "\"selectError\": false,"
|
||||
+ "\"invert\": false"
|
||||
+ "}";
|
||||
|
||||
//Add the facet to the project and create a row filter
|
||||
ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);
|
||||
Facet facet = facetConfig.apply(project);
|
||||
rowfilter = facet.getRowFilter(project);
|
||||
|
||||
//Check each row in the project against the filter
|
||||
//Rows 1-5 are strings
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 4, project.rows.get(4)),false);
|
||||
//Rows 6-10 are DateTimes
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 5, project.rows.get(5)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 6, project.rows.get(6)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 7, project.rows.get(7)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 8, project.rows.get(8)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 9, project.rows.get(9)),false);
|
||||
//Rows 11-15 are integers
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 10, project.rows.get(10)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 11, project.rows.get(11)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 12, project.rows.get(12)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 13, project.rows.get(13)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 14, project.rows.get(14)),false);
|
||||
//Rows 16-20 are booleans
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 15, project.rows.get(15)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 16, project.rows.get(16)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 17, project.rows.get(17)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 18, project.rows.get(18)),false);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 19, project.rows.get(19)),false);
|
||||
//Rows 21-25 are nulls
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 20, project.rows.get(20)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 21, project.rows.get(21)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 22, project.rows.get(22)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 23, project.rows.get(23)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 24, project.rows.get(24)),true);
|
||||
//Rows 26-30 are empty strings
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 25, project.rows.get(25)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 26, project.rows.get(26)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 27, project.rows.get(27)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 28, project.rows.get(28)),true);
|
||||
Assert.assertEquals(rowfilter.filterRow(project, 29, project.rows.get(29)),true);
|
||||
}
|
||||
|
||||
// should add tests for errors as well
|
||||
}
|
||||
@ -59,9 +59,10 @@ public class ExpressionNominalValueGrouperTests extends RefineTest {
|
||||
private static Properties bindings;
|
||||
|
||||
private static OffsetDateTime dateTimeValue = OffsetDateTime.parse("2017-05-12T05:45:00+00:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
|
||||
private static String dateTimeStringValue = "2017-05-12T05:45:00Z";
|
||||
private static int integerValue = 1;
|
||||
private static String integerStringValue = "1";
|
||||
private static String stringStringValue = "a";
|
||||
private static Boolean booleanValue = true;
|
||||
|
||||
private static ExpressionNominalValueGrouper grouper;
|
||||
private static Evaluable eval;
|
||||
@ -139,7 +140,11 @@ public class ExpressionNominalValueGrouperTests extends RefineTest {
|
||||
grouper.end(project);
|
||||
}
|
||||
|
||||
Assert.assertEquals(grouper.choices.size(),0);
|
||||
Assert.assertEquals(grouper.choices.size(),1);
|
||||
|
||||
Assert.assertTrue(grouper.choices.containsKey(integerStringValue));
|
||||
Assert.assertEquals(grouper.choices.get(integerStringValue).decoratedValue.label,integerStringValue);
|
||||
Assert.assertEquals(grouper.choices.get(integerStringValue).decoratedValue.value.toString(),integerStringValue);
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -163,30 +168,10 @@ public class ExpressionNominalValueGrouperTests extends RefineTest {
|
||||
grouper.end(project);
|
||||
}
|
||||
|
||||
Assert.assertEquals(grouper.choices.size(),0);
|
||||
}
|
||||
Assert.assertEquals(grouper.choices.size(),1);
|
||||
|
||||
@Test
|
||||
public void expressionNominalValueGrouperBooleans() throws Exception {
|
||||
//populate project
|
||||
for (int i = 0; i < numberOfRows; i++) {
|
||||
Row row = new Row(1);
|
||||
row.setCell(0, new Cell(booleanValue, null));
|
||||
project.rows.add(row);
|
||||
}
|
||||
//create grouper
|
||||
eval = MetaParser.parse("value");
|
||||
grouper = new ExpressionNominalValueGrouper(eval, columnName, cellIndex);
|
||||
try {
|
||||
grouper.start(project);
|
||||
for (int rowIndex = 0; rowIndex < numberOfRows; rowIndex++) {
|
||||
Row row = project.rows.get(rowIndex);
|
||||
grouper.visit(project, rowIndex, row);
|
||||
}
|
||||
} finally {
|
||||
grouper.end(project);
|
||||
}
|
||||
|
||||
Assert.assertEquals(grouper.choices.size(),0);
|
||||
Assert.assertTrue(grouper.choices.containsKey(dateTimeStringValue));
|
||||
Assert.assertEquals(grouper.choices.get(dateTimeStringValue).decoratedValue.label,dateTimeStringValue);
|
||||
Assert.assertEquals(grouper.choices.get(dateTimeStringValue).decoratedValue.value.toString(),dateTimeStringValue);
|
||||
}
|
||||
}
|
||||
|
||||
@ -59,7 +59,7 @@ import com.google.refine.tests.RefineTest;
|
||||
public class CacheTests extends RefineTest {
|
||||
|
||||
// Equivalent to duplicate facet on Column A with true selected
|
||||
static private final String ENGINE_JSON_DUPLICATES = "{\"facets\":[{\"type\":\"list\",\"name\":\"facet A\",\"columnName\":\"Column A\",\"expression\":\"(facetCount(value, 'value', 'Column A') > 1).toString()\",\"omitBlank\":false,\"omitError\":false,\"selection\":[{\"v\":{\"v\":\"true\",\"l\":\"true\"}}],\"selectBlank\":false,\"selectError\":false,\"invert\":false}],\"mode\":\"row-based\"}}";
|
||||
static final String ENGINE_JSON_DUPLICATES = "{\"facets\":[{\"type\":\"list\",\"name\":\"facet A\",\"columnName\":\"Column A\",\"expression\":\"facetCount(value, 'value', 'Column A') > 1\",\"omitBlank\":false,\"omitError\":false,\"selection\":[{\"v\":{\"v\":true,\"l\":\"true\"}}],\"selectBlank\":false,\"selectError\":false,\"invert\":false}],\"mode\":\"row-based\"}}";
|
||||
|
||||
@Override
|
||||
@BeforeTest
|
||||
|
||||
@ -44,9 +44,6 @@ function ListFacet(div, config, options, selection) {
|
||||
}
|
||||
|
||||
this._selection = selection || [];
|
||||
this._numberChoice = (config.selectNumber) ? { s : true, c : 0 } : null;
|
||||
this._datetimeChoice = (config.selectDateTime) ? { s : true, c : 0 } : null;
|
||||
this._booleanChoice = (config.selecBoolean) ? { s : true, c : 0 } : null;
|
||||
this._blankChoice = (config.selectBlank) ? { s : true, c : 0 } : null;
|
||||
this._errorChoice = (config.selectError) ? { s : true, c : 0 } : null;
|
||||
|
||||
@ -65,9 +62,6 @@ ListFacet.prototype.dispose = function() {
|
||||
|
||||
ListFacet.prototype.reset = function() {
|
||||
this._selection = [];
|
||||
this._numberChoice = null;
|
||||
this._datetimeChoice = null;
|
||||
this._booleanChoice = null;
|
||||
this._blankChoice = null;
|
||||
this._errorChoice = null;
|
||||
};
|
||||
@ -91,14 +85,11 @@ ListFacet.prototype.getJSON = function() {
|
||||
columnName: this._config.columnName,
|
||||
expression: this._config.expression,
|
||||
omitBlank: "omitBlank" in this._config ? this._config.omitBlank : false,
|
||||
omitError: "omitError" in this._config ? this._config.omitError : false,
|
||||
selection: [],
|
||||
selectNumber: this._numberChoice !== null && this._numberChoice.s,
|
||||
selectDateTime: this._datetimeChoice !== null && this._datetimeChoice.s,
|
||||
selectBoolean: this._booleanChoice !== null && this._booleanChoice.s,
|
||||
selectBlank: this._blankChoice !== null && this._blankChoice.s,
|
||||
selectError: this._errorChoice !== null && this._errorChoice.s,
|
||||
invert: this._config.invert
|
||||
omitError: "omitError" in this._config ? this._config.omitError : false,
|
||||
selection: [],
|
||||
selectBlank: this._blankChoice !== null && this._blankChoice.s,
|
||||
selectError: this._errorChoice !== null && this._errorChoice.s,
|
||||
invert: this._config.invert
|
||||
};
|
||||
for (var i = 0; i < this._selection.length; i++) {
|
||||
var choice = {
|
||||
@ -111,11 +102,8 @@ ListFacet.prototype.getJSON = function() {
|
||||
|
||||
ListFacet.prototype.hasSelection = function() {
|
||||
return this._selection.length > 0 ||
|
||||
( this._numberChoice !== null && this._numberChoice.s ) ||
|
||||
( this._datetimeChoice !== null && this._datetimeChoice.s ) ||
|
||||
( this._booleanChoice !== null && this._booleanChoice.s ) ||
|
||||
( this._blankChoice !== null && this._blankChoice.s ) ||
|
||||
( this._errorChoice !== null && this._errorChoice.s );
|
||||
(this._blankChoice !== null && this._blankChoice.s) ||
|
||||
(this._errorChoice !== null && this._errorChoice.s);
|
||||
};
|
||||
|
||||
ListFacet.prototype.updateState = function(data) {
|
||||
@ -133,9 +121,6 @@ ListFacet.prototype.updateState = function(data) {
|
||||
this._selection = selection;
|
||||
this._reSortChoices();
|
||||
|
||||
this._numberChoice = data.numberChoice || null;
|
||||
this._datetimeChoice = data.datetimeChoice || null;
|
||||
this._booleanChoice = data.booleanChoice || null;
|
||||
this._blankChoice = data.blankChoice || null;
|
||||
this._errorChoice = data.errorChoice || null;
|
||||
}
|
||||
@ -254,15 +239,6 @@ ListFacet.prototype._copyChoices = function() {
|
||||
var choice = this._data.choices[i];
|
||||
lines.push(choice.v.l + "\t" + choice.c);
|
||||
}
|
||||
if (this._numberChoice) {
|
||||
lines.push("(number)\t" + this._numberChoice.c);
|
||||
}
|
||||
if (this._datetimeChoice) {
|
||||
lines.push("(date)\t" + this._datetimeChoice.c);
|
||||
}
|
||||
if (this._booleanChoice) {
|
||||
lines.push("(boolean)\t" + this._booleanChoice.c);
|
||||
}
|
||||
if (this._blankChoice) {
|
||||
lines.push("(blank)\t" + this._blankChoice.c);
|
||||
}
|
||||
@ -359,9 +335,6 @@ ListFacet.prototype._update = function(resetScroll) {
|
||||
|
||||
var choices = this._data.choices;
|
||||
var selectionCount = this._selection.length +
|
||||
(this._numberChoice !== null && this._numberChoice.s ? 1 : 0) +
|
||||
(this._datetimeChoice !== null && this._datetimeChoice.s ? 1 : 0) +
|
||||
(this._booleanChoice !== null && this._booleanChoice.s ? 1 : 0) +
|
||||
(this._blankChoice !== null && this._blankChoice.s ? 1 : 0) +
|
||||
(this._errorChoice !== null && this._errorChoice.s ? 1 : 0);
|
||||
|
||||
@ -416,24 +389,10 @@ ListFacet.prototype._update = function(resetScroll) {
|
||||
for (var i = 0; i < choices.length; i++) {
|
||||
renderChoice(i, choices[i]);
|
||||
}
|
||||
if (this._numberChoice !== null) {
|
||||
renderEdit = false;
|
||||
renderChoice(-5, this._numberChoice, "(number)");
|
||||
}
|
||||
if (this._datetimeChoice !== null) {
|
||||
renderEdit = false;
|
||||
renderChoice(-4, this._datetimeChoice, "(date)");
|
||||
}
|
||||
if (this._booleanChoice !== null) {
|
||||
renderEdit = false;
|
||||
renderChoice(-3, this._booleanChoice, "(boolean)");
|
||||
}
|
||||
if (this._blankChoice !== null) {
|
||||
renderEdit = false;
|
||||
renderChoice(-1, this._blankChoice, "(blank)");
|
||||
}
|
||||
if (this._errorChoice !== null) {
|
||||
renderEdit = false;
|
||||
renderChoice(-2, this._errorChoice, "(error)");
|
||||
}
|
||||
|
||||
@ -447,12 +406,6 @@ ListFacet.prototype._update = function(resetScroll) {
|
||||
return self._blankChoice;
|
||||
} else if (index === -2) {
|
||||
return self._errorChoice;
|
||||
} else if (index === -3) {
|
||||
return self._booleanChoice;
|
||||
} else if (index === -4) {
|
||||
return self._datetimeChoice;
|
||||
} else if (index === -5) {
|
||||
return self._numberChoice;
|
||||
} else {
|
||||
return choices[index];
|
||||
}
|
||||
@ -589,12 +542,6 @@ ListFacet.prototype._editChoice = function(choice, choiceDiv) {
|
||||
originalContent = "(blank)";
|
||||
} else if (choice === this._errorChoice) {
|
||||
originalContent = "(error)";
|
||||
} else if (choice === this._booleanChoice) {
|
||||
originalContent = "(boolean)";
|
||||
} else if (choice === this._datetimeChoice) {
|
||||
originalContent = "(date)";
|
||||
} else if (choice === this._numberChoice) {
|
||||
originalContent = "(number)";
|
||||
} else {
|
||||
originalContent = choice.v.v;
|
||||
}
|
||||
@ -670,15 +617,6 @@ ListFacet.prototype._editChoice = function(choice, choiceDiv) {
|
||||
ListFacet.prototype._select = function(choice, only) {
|
||||
if (only) {
|
||||
this._selection = [];
|
||||
if (this._numberChoice !== null) {
|
||||
this._numberChoice.s = false;
|
||||
}
|
||||
if (this._datetimeChoice !== null) {
|
||||
this._datetimeChoice.s = false;
|
||||
}
|
||||
if (this._booleanChoice !== null) {
|
||||
this._booleanChoice.s = false;
|
||||
}
|
||||
if (this._blankChoice !== null) {
|
||||
this._blankChoice.s = false;
|
||||
}
|
||||
@ -688,11 +626,7 @@ ListFacet.prototype._select = function(choice, only) {
|
||||
}
|
||||
|
||||
choice.s = true;
|
||||
if (choice !== this._errorChoice &&
|
||||
choice !== this._blankChoice &&
|
||||
choice !== this._numberChoice &&
|
||||
choice !== this._datetimeChoice &&
|
||||
choice !== this._booleanChoice ) {
|
||||
if (choice !== this._errorChoice && choice !== this._blankChoice) {
|
||||
this._selection.push(choice);
|
||||
}
|
||||
|
||||
@ -700,7 +634,7 @@ ListFacet.prototype._select = function(choice, only) {
|
||||
};
|
||||
|
||||
ListFacet.prototype._deselect = function(choice) {
|
||||
if (choice === this._errorChoice || choice === this._blankChoice || choice === this._numberChoice || choice === this._datetimeChoice || choice === this._booleanChoice) {
|
||||
if (choice === this._errorChoice || choice === this._blankChoice) {
|
||||
choice.s = false;
|
||||
} else {
|
||||
for (var i = this._selection.length - 1; i >= 0; i--) {
|
||||
@ -715,9 +649,6 @@ ListFacet.prototype._deselect = function(choice) {
|
||||
|
||||
ListFacet.prototype._reset = function() {
|
||||
this._selection = [];
|
||||
this._numberChoice = null;
|
||||
this._datetimeChoice = null;
|
||||
this._booleanChoice = null;
|
||||
this._blankChoice = null;
|
||||
this._errorChoice = null;
|
||||
this._config.invert = false;
|
||||
@ -738,9 +669,6 @@ ListFacet.prototype._remove = function() {
|
||||
this._config = null;
|
||||
|
||||
this._selection = null;
|
||||
this._numberChoice = null;
|
||||
this._datetimeChoice = null;
|
||||
this._booleanChoice = null;
|
||||
this._blankChoice = null;
|
||||
this._errorChoice = null;
|
||||
this._data = null;
|
||||
|
||||
@ -626,7 +626,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
|
||||
{
|
||||
"name" : $.i18n('core-views/starred-rows'),
|
||||
"columnName" : "",
|
||||
"expression" : "row.starred.toString()"
|
||||
"expression" : "row.starred"
|
||||
},
|
||||
{
|
||||
"scroll" : false
|
||||
@ -643,7 +643,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
|
||||
{
|
||||
"name" : $.i18n('core-views/flagged-rows'),
|
||||
"columnName" : "",
|
||||
"expression" : "row.flagged.toString()"
|
||||
"expression" : "row.flagged"
|
||||
},
|
||||
{
|
||||
"scroll" : false
|
||||
|
||||
@ -147,8 +147,8 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
|
||||
{
|
||||
"name": column.name,
|
||||
"columnName": column.name,
|
||||
"expression": "(facetCount(value, 'value', '" +
|
||||
column.name + "') > 1).toString()"
|
||||
"expression": "facetCount(value, 'value', '" +
|
||||
column.name + "') > 1"
|
||||
}
|
||||
);
|
||||
}
|
||||
@ -240,7 +240,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
|
||||
{
|
||||
"name": column.name,
|
||||
"columnName": column.name,
|
||||
"expression": "isError(value).toString()"
|
||||
"expression": "isError(value)"
|
||||
}
|
||||
);
|
||||
}
|
||||
@ -254,7 +254,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
|
||||
{
|
||||
"name": column.name,
|
||||
"columnName": column.name,
|
||||
"expression": "isNull(value).toString()"
|
||||
"expression": "isNull(value)"
|
||||
}
|
||||
);
|
||||
}
|
||||
@ -268,7 +268,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
|
||||
{
|
||||
"name": column.name,
|
||||
"columnName": column.name,
|
||||
"expression": "isEmptyString(value).toString()"
|
||||
"expression": "isEmptyString(value)"
|
||||
}
|
||||
);
|
||||
}
|
||||
@ -282,7 +282,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
|
||||
{
|
||||
"name": column.name,
|
||||
"columnName": column.name,
|
||||
"expression": "isBlank(value).toString()"
|
||||
"expression": "isBlank(value)"
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@ -297,7 +297,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
|
||||
{
|
||||
"name" : column.name + " "+$.i18n('core-views/hist-entries'),
|
||||
"columnName" : column.name,
|
||||
"expression" : "cell.recon.judgmentHistoryEntry.toString()"
|
||||
"expression" : "cell.recon.judgmentHistoryEntry"
|
||||
}
|
||||
);
|
||||
}
|
||||
@ -329,7 +329,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
|
||||
{
|
||||
"name" : column.name + ": "+$.i18n('core-views/best-cand-type-match'),
|
||||
"columnName" : column.name,
|
||||
"expression" : 'forNonBlank(cell.recon.features.typeMatch, v, v, if(isNonBlank(value), if(cell.recon != null, "(no type)", "(unreconciled)"), "(blank)")).toString()'
|
||||
"expression" : 'forNonBlank(cell.recon.features.typeMatch, v, v, if(isNonBlank(value), if(cell.recon != null, "(no type)", "(unreconciled)"), "(blank)"))'
|
||||
},
|
||||
{
|
||||
"scroll" : false
|
||||
@ -346,7 +346,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
|
||||
{
|
||||
"name" : column.name + ": "+ $.i18n('core-views/best-cand-name'),
|
||||
"columnName" : column.name,
|
||||
"expression" : 'forNonBlank(cell.recon.features.nameMatch, v, v, if(isNonBlank(value), if(cell.recon.new,"(new)","(unreconciled)"), "(blank)")).toString()'
|
||||
"expression" : 'forNonBlank(cell.recon.features.nameMatch, v, v, if(isNonBlank(value), "(unreconciled)", "(blank)"))'
|
||||
},
|
||||
{
|
||||
"scroll" : false
|
||||
|
||||
Loading…
Reference in New Issue
Block a user