diff --git a/src/main/java/com/metaweb/gridworks/model/Cell.java b/src/main/java/com/metaweb/gridworks/model/Cell.java index 14140cc93..e711fa480 100644 --- a/src/main/java/com/metaweb/gridworks/model/Cell.java +++ b/src/main/java/com/metaweb/gridworks/model/Cell.java @@ -137,11 +137,9 @@ public class Cell implements HasFields, Jsonizable { } } - if (value != null) { - if (type != null) { - if ("date".equals(type)) { - value = ParsingUtilities.stringToDate((String) value); - } + if (value != null && type != null) { + if ("date".equals(type)) { + value = ParsingUtilities.stringToDate((String) value); } return new Cell(value, recon); } else { diff --git a/src/main/java/com/metaweb/gridworks/model/recon/HeuristicReconConfig.java b/src/main/java/com/metaweb/gridworks/model/recon/HeuristicReconConfig.java index 15a97f4b5..d8633ee10 100644 --- a/src/main/java/com/metaweb/gridworks/model/recon/HeuristicReconConfig.java +++ b/src/main/java/com/metaweb/gridworks/model/recon/HeuristicReconConfig.java @@ -310,15 +310,11 @@ public class HeuristicReconConfig extends ReconConfig { for (String typeID : candidate.typeIDs) { if (this.typeID.equals(typeID)) { recon.setFeature(Recon.Feature_typeMatch, true); - if (autoMatch && candidate.score >= 100) { - if (count == 1 || - candidate.score / recon.candidates.get(1).score >= 1.5) { - - recon.match = candidate; - recon.matchRank = 0; - recon.judgment = Judgment.Matched; - recon.judgmentAction = "auto"; - } + if (autoMatch && candidate.score >= 100 && (count == 1 || candidate.score / recon.candidates.get(1).score >= 1.5)) { + recon.match = candidate; + recon.matchRank = 0; + recon.judgment = Judgment.Matched; + recon.judgmentAction = "auto"; } break; } diff --git a/src/main/java/com/metaweb/gridworks/operations/ColumnSplitOperation.java b/src/main/java/com/metaweb/gridworks/operations/ColumnSplitOperation.java index cfd874820..ad21d5194 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ColumnSplitOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/ColumnSplitOperation.java @@ -153,7 +153,7 @@ public class ColumnSplitOperation extends EngineDependentOperation { FilteredRows filteredRows = engine.getAllFilteredRows(false); RowVisitor rowVisitor; if ("lengths".equals(_mode)) { - rowVisitor = new ColumnSplitRowVisitor(project, column.getCellIndex(), columnNames, rowIndices, tuples) { + rowVisitor = new ColumnSplitRowVisitor(column.getCellIndex(), columnNames, rowIndices, tuples) { protected java.util.List split(String s) { List results = new ArrayList(_fieldLengths.length + 1); @@ -174,7 +174,7 @@ public class ColumnSplitOperation extends EngineDependentOperation { } else if (_regex) { Pattern pattern = Pattern.compile(_separator); - rowVisitor = new ColumnSplitRowVisitor(project, column.getCellIndex(), columnNames, rowIndices, tuples) { + rowVisitor = new ColumnSplitRowVisitor(column.getCellIndex(), columnNames, rowIndices, tuples) { Pattern _pattern; protected java.util.List split(String s) { @@ -187,7 +187,7 @@ public class ColumnSplitOperation extends EngineDependentOperation { } }.init(pattern); } else { - rowVisitor = new ColumnSplitRowVisitor(project, column.getCellIndex(), columnNames, rowIndices, tuples) { + rowVisitor = new ColumnSplitRowVisitor(column.getCellIndex(), columnNames, rowIndices, tuples) { protected java.util.List split(String s) { return stringArrayToValueList( StringUtils.splitByWholeSeparatorPreserveAllTokens(s, _separator, _maxColumns)); @@ -225,7 +225,6 @@ public class ColumnSplitOperation extends EngineDependentOperation { int columnNameIndex = 1; ColumnSplitRowVisitor( - Project project, int cellIndex, List columnNames, List rowIndices, diff --git a/src/main/java/com/metaweb/gridworks/protograph/transpose/TripleLoaderTransposedNodeFactory.java b/src/main/java/com/metaweb/gridworks/protograph/transpose/TripleLoaderTransposedNodeFactory.java index 8ff1b3ced..e2745cc85 100644 --- a/src/main/java/com/metaweb/gridworks/protograph/transpose/TripleLoaderTransposedNodeFactory.java +++ b/src/main/java/com/metaweb/gridworks/protograph/transpose/TripleLoaderTransposedNodeFactory.java @@ -82,8 +82,8 @@ public class TripleLoaderTransposedNodeFactory implements TransposedNodeFactory JSONObject.quote((String) object) : object.toString(); StringBuffer sb = new StringBuffer(); - sb.append("{ \"s\" : \""); sb.append(subject); sb.append("\""); - sb.append(", \"p\" : \""); sb.append(predicate); sb.append("\""); + sb.append("{ \"s\" : \""); sb.append(subject); sb.append('"'); + sb.append(", \"p\" : \""); sb.append(predicate); sb.append('"'); sb.append(", \"o\" : "); sb.append(s); if (subjectCell != null || objectCell != null) { sb.append(", \"meta\" : { "); @@ -114,8 +114,8 @@ public class TripleLoaderTransposedNodeFactory implements TransposedNodeFactory JSONObject.quote((String) object) : object.toString(); StringBuffer sb = new StringBuffer(); - sb.append("{ \"s\" : \""); sb.append(subject); sb.append("\""); - sb.append(", \"p\" : \""); sb.append(predicate); sb.append("\""); + sb.append("{ \"s\" : \""); sb.append(subject); sb.append('"'); + sb.append(", \"p\" : \""); sb.append(predicate); sb.append('"'); sb.append(", \"o\" : "); sb.append(s); sb.append(", \"lang\" : "); sb.append(lang);