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

Issue 541 - add support for constraints on key queries in Freebase

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2449 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Tom Morris 2012-03-02 22:36:08 +00:00
parent 8ff6c5617f
commit b784046b18
1 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
extensions/freebase/src/com/google/refine/freebase/util/FreebaseDataExtensionJob.java
View File

@ -139,6 +139,20 @@ public class FreebaseDataExtensionJob {
return new DataExtension(data); return new DataExtension(data);
} }
protected void storeKey(
List<Object[]> rows,
int row,
int col,
JSONObject key,
Map<String, ReconCandidate> reconCandidateMap
) throws JSONException {
String keyval = key.getString("value");
while (row >= rows.size()) {
rows.add(new Object[columnCount]);
}
rows.get(row)[col] = keyval;
}
protected void storeCell( protected void storeCell(
List<Object[]> rows, List<Object[]> rows,
@ -191,8 +205,21 @@ public class FreebaseDataExtensionJob {
JSONArray a = resultNode != null && resultNode.has(propertyID) && !resultNode.isNull(propertyID) ? JSONArray a = resultNode != null && resultNode.has(propertyID) && !resultNode.isNull(propertyID) ?
resultNode.getJSONArray(propertyID) : null; resultNode.getJSONArray(propertyID) : null;
if ("/type/key".equals(expectedTypeID)) {
if (a != null) {
int l = a.length();
for (int r = 0; r < l; r++) {
Object o = a.isNull(r) ? null : a.get(r);
if (o instanceof JSONObject) {
storeKey(rows, startRowIndex++, startColumnIndex, (JSONObject) o, reconCandidateMap);
}
}
}
if (expectedTypeID.startsWith("/type/")) { // note that we still take up a column even if we don't have any data
return new int[] { startRowIndex, startColumnIndex + 1 };
} else if (expectedTypeID.startsWith("/type/")) {
if (a != null) { if (a != null) {
int l = a.length(); int l = a.length();
for (int r = 0; r < l; r++) { for (int r = 0; r < l; r++) {
@ -340,7 +367,8 @@ public class FreebaseDataExtensionJob {
writer.key(propertyID); writer.key(propertyID);
writer.array(); writer.array();
{ {
if (!expectedTypeID.startsWith("/type/")) { // not literal if (!expectedTypeID.startsWith("/type/") // not literal
|| "/type/key".equals(expectedTypeID)) {
writer.object(); writer.object();
writer.key("optional"); writer.value(true); writer.key("optional"); writer.value(true);
@ -374,13 +402,10 @@ public class FreebaseDataExtensionJob {
if (sortKey.startsWith("-")) { if (sortKey.startsWith("-")) {
sortKey = sortKey.substring(1); sortKey = sortKey.substring(1);
} }
writer.key(sortKey); writer.key(sortKey); writer.value(null);
writer.value(null); writer.key(name); writer.value(value);
writer.key(name);
writer.value(value);
} else { } else {
writer.key(name); writer.key(name); writer.value(value);
writer.value(value);
} }
} }
} }
@ -392,8 +417,12 @@ public class FreebaseDataExtensionJob {
boolean hasSubProperties = (node.has("properties") && !node.isNull("properties")); boolean hasSubProperties = (node.has("properties") && !node.isNull("properties"));
if (!hasSubProperties || (node.has("included") && node.getBoolean("included"))) { if (!hasSubProperties || (node.has("included") && node.getBoolean("included"))) {
writer.key("name"); writer.value(null); if ("/type/key".equals(expectedTypeID)) {
writer.key("id"); writer.value(null); writer.key("value"); writer.value(null);
} else {
writer.key("name"); writer.value(null);
writer.key("id"); writer.value(null);
}
writer.key("type"); writer.array(); writer.endArray(); writer.key("type"); writer.array(); writer.endArray();
} }