From 9b8206da297a717e75f81990f302ad0c323c5588 Mon Sep 17 00:00:00 2001 From: David Huynh Date: Wed, 20 Oct 2010 04:52:35 +0000 Subject: [PATCH] Fixed new bug for query-based reconciliation introduced by factoring out the freebase extension git-svn-id: http://google-refine.googlecode.com/svn/trunk@1611 7d457c2a-affb-35e4-300a-418c747d4874 --- main/src/com/google/refine/model/recon/ReconConfig.java | 2 +- main/webapp/modules/core/scripts/project/history-panel.js | 2 +- .../core/scripts/reconciliation/freebase-query-panel.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main/src/com/google/refine/model/recon/ReconConfig.java b/main/src/com/google/refine/model/recon/ReconConfig.java index aacef0b73..43b57d748 100644 --- a/main/src/com/google/refine/model/recon/ReconConfig.java +++ b/main/src/com/google/refine/model/recon/ReconConfig.java @@ -45,7 +45,7 @@ abstract public class ReconConfig implements Jsonizable { String mode = obj.getString("mode"); // Backward compatibility - if ("extend".equals(mode) || "strict".equals("mode")) { + if ("extend".equals(mode) || "strict".equals(mode)) { mode = "freebase/" + mode; } else if ("heuristic".equals(mode)) { mode = "core/standard-service"; // legacy diff --git a/main/webapp/modules/core/scripts/project/history-panel.js b/main/webapp/modules/core/scripts/project/history-panel.js index 2322dfa80..3e7cd6239 100644 --- a/main/webapp/modules/core/scripts/project/history-panel.js +++ b/main/webapp/modules/core/scripts/project/history-panel.js @@ -7,7 +7,7 @@ function HistoryPanel(div, tabHeader) { HistoryPanel.prototype.resize = function() { var body = this._div.find(".history-panel-body"); var controls = this._div.find(".history-panel-controls"); - var bodyControls = this._div.find(".history-panel-body-controls"); + var bodyControls = this._div.find(".history-panel-filter"); var nowDiv = this._div.find(".history-now"); var bodyPaddings = body.outerHeight(true) - body.height(); diff --git a/main/webapp/modules/core/scripts/reconciliation/freebase-query-panel.js b/main/webapp/modules/core/scripts/reconciliation/freebase-query-panel.js index b3ce5a75e..bf1f96ef1 100644 --- a/main/webapp/modules/core/scripts/reconciliation/freebase-query-panel.js +++ b/main/webapp/modules/core/scripts/reconciliation/freebase-query-panel.js @@ -68,7 +68,7 @@ ReconFreebaseQueryPanel.prototype.start = function() { bodyParams = { columnName: this._column.name, config: JSON.stringify({ - mode: "strict", + mode: "freebase/strict", match: "key", namespace: namespace }) @@ -77,7 +77,7 @@ ReconFreebaseQueryPanel.prototype.start = function() { bodyParams = { columnName: this._column.name, config: JSON.stringify({ - mode: "strict", + mode: "freebase/strict", match: "id" }) }; @@ -85,7 +85,7 @@ ReconFreebaseQueryPanel.prototype.start = function() { bodyParams = { columnName: this._column.name, config: JSON.stringify({ - mode: "strict", + mode: "freebase/strict", match: "guid" }) };