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

Fixed bug in saving recon changes.

Browse Source 
Fixed bug in discard recon judgment operation.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@218 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2010-03-06 08:03:29 +00:00
parent 78b1eb7e73
commit db824bffeb
8 changed files with 61 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/metaweb/gridworks/model/Cell.java
View File

@ -75,7 +75,7 @@ public class Cell implements Serializable, HasFields, Jsonizable {
} }
static public Cell load(String s) throws Exception { static public Cell load(String s) throws Exception {
return load(ParsingUtilities.evaluateJsonStringToObject(s)); return s.length() == 0 ? null : load(ParsingUtilities.evaluateJsonStringToObject(s));
} }
static public Cell load(JSONObject obj) throws Exception { static public Cell load(JSONObject obj) throws Exception {

2
src/main/java/com/metaweb/gridworks/model/Column.java
View File

@ -118,7 +118,7 @@ public class Column implements Serializable, Jsonizable {
column._reconConfig = ReconConfig.reconstruct(obj.getJSONObject("reconConfig")); column._reconConfig = ReconConfig.reconstruct(obj.getJSONObject("reconConfig"));
} }
if (obj.has("reconStats")) { if (obj.has("reconStats")) {
column._reconStats = ReconStats.reconstruct(obj.getJSONObject("reconStats")); column._reconStats = ReconStats.load(obj.getJSONObject("reconStats"));
} }
return column; return column;

2
src/main/java/com/metaweb/gridworks/model/Recon.java
View File

@ -82,8 +82,10 @@ public class Recon implements Serializable, HasFields, Jsonizable {
if (candidates != null) { if (candidates != null) {
r.candidates = new ArrayList<ReconCandidate>(candidates); r.candidates = new ArrayList<ReconCandidate>(candidates);
} }
r.judgment = judgment; r.judgment = judgment;
r.match = match; r.match = match;
return r; return r;
} }

2
src/main/java/com/metaweb/gridworks/model/ReconStats.java
View File

@ -15,7 +15,7 @@ import com.metaweb.gridworks.model.Recon.Judgment;
public class ReconStats implements Serializable, Jsonizable { public class ReconStats implements Serializable, Jsonizable {
private static final long serialVersionUID = -4831409797104437854L; private static final long serialVersionUID = -4831409797104437854L;
static public ReconStats reconstruct(JSONObject obj) throws Exception { static public ReconStats load(JSONObject obj) throws Exception {
return new ReconStats( return new ReconStats(
obj.getInt("nonBlanks"), obj.getInt("nonBlanks"),
obj.getInt("newTopics"), obj.getInt("newTopics"),

6
src/main/java/com/metaweb/gridworks/model/Row.java
View File

@ -162,8 +162,10 @@ public class Row implements Serializable, HasFields, Jsonizable {
} }
static public Row load(String s) throws Exception { static public Row load(String s) throws Exception {
JSONObject obj = ParsingUtilities.evaluateJsonStringToObject(s); return s.length() == 0 ? null : load(ParsingUtilities.evaluateJsonStringToObject(s));
}
static public Row load(JSONObject obj) throws Exception {
JSONArray a = obj.getJSONArray("cells"); JSONArray a = obj.getJSONArray("cells");
int count = a.length(); int count = a.length();

8
src/main/java/com/metaweb/gridworks/model/changes/CellChange.java
View File

@ -66,9 +66,13 @@ public class CellChange implements Change {
} else if ("cell".equals(field)) { } else if ("cell".equals(field)) {
cellIndex = Integer.parseInt(value); cellIndex = Integer.parseInt(value);
} else if ("new".equals(field)) { } else if ("new".equals(field)) {
newCell = Cell.load(value); if (value.length() > 0) {
newCell = Cell.load(value);
}
} else if ("old".equals(field)) { } else if ("old".equals(field)) {
oldCell = Cell.load(value); if (value.length() > 0) {
oldCell = Cell.load(value);
}
} }
} }

44
src/main/java/com/metaweb/gridworks/model/changes/ReconChange.java
View File

@ -87,10 +87,30 @@ public class ReconChange extends MassCellChange {
} }
public void save(Writer writer, Properties options) throws IOException { public void save(Writer writer, Properties options) throws IOException {
writer.write("newReconConfig="); _newReconConfig.save(writer); writer.write('\n'); writer.write("newReconConfig=");
writer.write("newReconStats="); _newReconStats.save(writer); writer.write('\n'); if (_newReconConfig != null) {
writer.write("oldReconConfig="); _oldReconConfig.save(writer); writer.write('\n'); _newReconConfig.save(writer);
writer.write("oldReconStats="); _oldReconStats.save(writer); writer.write('\n'); }
writer.write('\n');
writer.write("newReconStats=");
if (_newReconStats != null) {
_newReconStats.save(writer);
}
writer.write('\n');
writer.write("oldReconConfig=");
if (_oldReconConfig != null) {
_oldReconConfig.save(writer);
}
writer.write('\n');
writer.write("oldReconStats=");
if (_oldReconStats != null) {
_oldReconStats.save(writer);
}
writer.write('\n');
super.save(writer, options); super.save(writer, options);
} }
@ -111,13 +131,21 @@ public class ReconChange extends MassCellChange {
String value = line.substring(equal + 1); String value = line.substring(equal + 1);
if ("newReconConfig".equals(field)) { if ("newReconConfig".equals(field)) {
newReconConfig = ReconConfig.reconstruct(ParsingUtilities.evaluateJsonStringToObject(value)); if (value.length() > 0) {
newReconConfig = ReconConfig.reconstruct(ParsingUtilities.evaluateJsonStringToObject(value));
}
} else if ("newReconStats".equals(field)) { } else if ("newReconStats".equals(field)) {
newReconStats = ReconStats.reconstruct(ParsingUtilities.evaluateJsonStringToObject(value)); if (value.length() > 0) {
newReconStats = ReconStats.load(ParsingUtilities.evaluateJsonStringToObject(value));
}
} else if ("oldReconConfig".equals(field)) { } else if ("oldReconConfig".equals(field)) {
oldReconConfig = ReconConfig.reconstruct(ParsingUtilities.evaluateJsonStringToObject(value)); if (value.length() > 0) {
oldReconConfig = ReconConfig.reconstruct(ParsingUtilities.evaluateJsonStringToObject(value));
}
} else if ("oldReconStats".equals(field)) { } else if ("oldReconStats".equals(field)) {
oldReconStats = ReconStats.reconstruct(ParsingUtilities.evaluateJsonStringToObject(value)); if (value.length() > 0) {
oldReconStats = ReconStats.load(ParsingUtilities.evaluateJsonStringToObject(value));
}
} else if ("commonColumnName".equals(field)) { } else if ("commonColumnName".equals(field)) {
commonColumnName = value; commonColumnName = value;
} else if ("cellChangeCount".equals(field)) { } else if ("cellChangeCount".equals(field)) {

21
src/main/java/com/metaweb/gridworks/operations/ReconDiscardJudgmentsOperation.java
View File

@ -72,17 +72,16 @@ public class ReconDiscardJudgmentsOperation extends EngineDependentMassCellOpera
} }
public boolean visit(Project project, int rowIndex, Row row, boolean contextual) { public boolean visit(Project project, int rowIndex, Row row, boolean contextual) {
if (cellIndex < row.cells.size()) { Cell cell = row.getCell(cellIndex);
Cell cell = row.cells.get(cellIndex); if (cell != null && cell.recon != null) {
if (cell.recon != null) { Recon recon = cell.recon.dup();
Recon recon = cell.recon.dup(); recon.judgment = Judgment.None;
recon.judgment = Judgment.None; recon.match = null;
Cell newCell = new Cell(cell.value, recon); Cell newCell = new Cell(cell.value, recon);
CellChange cellChange = new CellChange(rowIndex, cellIndex, cell, newCell); CellChange cellChange = new CellChange(rowIndex, cellIndex, cell, newCell);
cellChanges.add(cellChange); cellChanges.add(cellChange);
}
} }
return false; return false;
} }