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

Fix rendering of integers in Wikidata extension. Closes #1775

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-10-27 21:43:22 +02:00
parent 3fb282852d
commit e1014bfeed
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/wikidata/src/org/openrefine/wikidata/schema/WbStringVariable.java
View File

@ -58,7 +58,11 @@ public class WbStringVariable extends WbVariableExpr<StringValue> {
public StringValue fromCell(Cell cell, ExpressionContext ctxt)
throws SkipSchemaExpressionException {
if (!cell.value.toString().isEmpty()) {
return Datamodel.makeStringValue(cell.value.toString());
String stringValue = cell.value.toString();
if (cell.value instanceof Double && ((Double)cell.value) % 1 == 0) {
stringValue = Integer.toString(((Double)cell.value).intValue());
}
return Datamodel.makeStringValue(stringValue);
}
throw new SkipSchemaExpressionException();
}

19
extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStringVariableTest.java
View File

@ -27,6 +27,8 @@ import org.testng.annotations.Test;
import org.wikidata.wdtk.datamodel.helpers.Datamodel;
import org.wikidata.wdtk.datamodel.interfaces.StringValue;
import com.google.refine.model.Cell;
public class WbStringVariableTest extends WbVariableTest<StringValue> {
@Override
@ -53,6 +55,23 @@ public class WbStringVariableTest extends WbVariableTest<StringValue> {
evaluatesTo(Datamodel.makeStringValue("dirty \t"), "dirty \t");
}
/**
* Test that integers are correctly converted to strings
*/
@Test
public void testInteger() {
evaluatesTo(Datamodel.makeStringValue("45"), new Cell(45,null));
}
/**
* Test that floating point numbers with no decimal part are also converted
*/
@Test
public void testDoubleInteger() {
evaluatesTo(Datamodel.makeStringValue("45"), new Cell(45.0,null));
}
@Test
public void testLeadingWhitespace() {
evaluatesTo(Datamodel.makeStringValue(" dirty"), " dirty");