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

Fixed Issue 17: Conflated triples - all rows are producing triple with "s" :" $Name_0".

Browse Source 
Also exposed "id" field for recon objects.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@720 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2010-05-12 07:45:22 +00:00
parent 992cb964eb
commit 8412aa72dd
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,9 @@ public class Recon implements HasFields, Jsonizable {
} }
public Object getField(String name, Properties bindings) { public Object getField(String name, Properties bindings) {
if ("best".equals(name)) { if ("id".equals(name)) {
return id;
} else if ("best".equals(name)) {
return candidates != null && candidates.size() > 0 ? candidates.get(0) : null; return candidates != null && candidates.size() > 0 ? candidates.get(0) : null;
} else if ("candidates".equals(name)) { } else if ("candidates".equals(name)) {
return candidates; return candidates;

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

@ -75,7 +75,6 @@ public class ReconMarkNewTopicsOperation extends EngineDependentMassCellOperatio
int cellIndex; int cellIndex;
List<CellChange> cellChanges; List<CellChange> cellChanges;
Map<String, Recon> sharedRecons = new HashMap<String, Recon>(); Map<String, Recon> sharedRecons = new HashMap<String, Recon>();
Map<Long, Recon> dupReconMap = new HashMap<Long, Recon>();
long historyEntryID; long historyEntryID;
public RowVisitor init(int cellIndex, List<CellChange> cellChanges, long historyEntryID) { public RowVisitor init(int cellIndex, List<CellChange> cellChanges, long historyEntryID) {
@ -103,20 +102,12 @@ public class ReconMarkNewTopicsOperation extends EngineDependentMassCellOperatio
sharedRecons.put(s, recon); sharedRecons.put(s, recon);
} }
} else { } else {
long reconID = cell.recon == null ? 0 : cell.recon.id; recon = cell.recon == null ? new Recon(historyEntryID) : cell.recon.dup(historyEntryID);
if (dupReconMap.containsKey(reconID)) { recon.match = null;
recon = dupReconMap.get(reconID); recon.matchRank = -1;
recon.judgmentBatchSize++; recon.judgment = Judgment.New;
} else { recon.judgmentBatchSize = 1;
recon = cell.recon == null ? new Recon(historyEntryID) : cell.recon.dup(historyEntryID); recon.judgmentAction = "mass";
recon.match = null;
recon.matchRank = -1;
recon.judgment = Judgment.New;
recon.judgmentBatchSize = 1;
recon.judgmentAction = "mass";
dupReconMap.put(reconID, recon);
}
} }
Cell newCell = new Cell(cell.value, recon); Cell newCell = new Cell(cell.value, recon);