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

Issue 328 - don't retry unsuccessful MQL key based reconciliation

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@1997 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Tom Morris 2011-02-04 00:56:31 +00:00
parent 1df3348b52
commit cccfbf9ad8
1 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
extensions/freebase/src/com/google/refine/freebase/model/recon/KeyBasedReconConfig.java
View File

@ -178,36 +178,38 @@ public class KeyBasedReconConfig extends StrictReconConfig {
try { try {
String s = ParsingUtilities.inputStreamToString(is); String s = ParsingUtilities.inputStreamToString(is);
JSONObject o = ParsingUtilities.evaluateJsonStringToObject(s); JSONObject o = ParsingUtilities.evaluateJsonStringToObject(s);
JSONArray results = o.getJSONArray("result"); if (o.has("result")) {
int count = results.length(); JSONArray results = o.getJSONArray("result");
int count = results.length();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
JSONObject result = results.getJSONObject(i); JSONObject result = results.getJSONObject(i);
String key = result.getJSONArray("key").getJSONObject(0).getString("value"); String key = result.getJSONArray("key").getJSONObject(0).getString("value");
JSONArray types = result.getJSONArray("type"); JSONArray types = result.getJSONArray("type");
String[] typeIDs = new String[types.length()]; String[] typeIDs = new String[types.length()];
for (int j = 0; j < typeIDs.length; j++) { for (int j = 0; j < typeIDs.length; j++) {
typeIDs[j] = types.getString(j); typeIDs[j] = types.getString(j);
} }
ReconCandidate candidate = new ReconCandidate( ReconCandidate candidate = new ReconCandidate(
result.getString("id"), result.getString("id"),
result.getString("name"), result.getString("name"),
typeIDs, typeIDs,
100 100
); );
Recon recon = Recon.makeFreebaseRecon(historyEntryID); Recon recon = Recon.makeFreebaseRecon(historyEntryID);
recon.addCandidate(candidate); recon.addCandidate(candidate);
recon.service = "mql"; recon.service = "mql";
recon.judgment = Judgment.Matched; recon.judgment = Judgment.Matched;
recon.judgmentAction = "auto"; recon.judgmentAction = "auto";
recon.match = candidate; recon.match = candidate;
recon.matchRank = 0; recon.matchRank = 0;
keyToRecon.put(key, recon); keyToRecon.put(key, recon);
}
} }
} finally { } finally {
is.close(); is.close();
@ -216,9 +218,16 @@ public class KeyBasedReconConfig extends StrictReconConfig {
e.printStackTrace(); e.printStackTrace();
} }
for (int i = 0; i < jobs.size(); i++) { for (ReconJob job : jobs) {
String key = ((KeyBasedReconJob) jobs.get(i)).key; String key = ((KeyBasedReconJob) job).key;
Recon recon = keyToRecon.get(key); Recon recon = keyToRecon.get(key);
if (recon == null) { // add a no-match recon if none
recon = Recon.makeFreebaseRecon(historyEntryID);
recon.service = "mql";
recon.judgment = Judgment.None;
recon.matchRank = -1;
keyToRecon.put(key, recon);
}
recons.add(recon); recons.add(recon);
} }