-
diff --git a/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-node.js b/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-node.js
index a0fb6f989..354ca3e7c 100644
--- a/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-node.js
+++ b/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-node.js
@@ -471,7 +471,7 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() {
});
if (column.name in columnMap) {
- radio.attr("checked", "true");
+ radio.prop("checked", true);
}
$('').text(column.name).appendTo(tr.insertCell(1));
diff --git a/extensions/freebase/module/scripts/extension.js b/extensions/freebase/module/scripts/extension.js
index a56faac14..f15d04cb6 100644
--- a/extensions/freebase/module/scripts/extension.js
+++ b/extensions/freebase/module/scripts/extension.js
@@ -39,11 +39,12 @@ var lang = navigator.language.split("-")[0]
|| navigator.userLanguage.split("-")[0];
var dictionary = "";
$.ajax({
- url : "/command/freebase/load-language?",
+ url : "/command/core/load-language?",
type : "POST",
async : false,
data : {
- lng : lang
+ module : "freebase",
+// lang : lang
},
success : function(data) {
dictionary = data;
diff --git a/extensions/freebase/src/com/google/refine/freebase/commands/LoadLanguageCommand.java b/extensions/freebase/src/com/google/refine/freebase/commands/LoadLanguageCommand.java
deleted file mode 100644
index bbb5661e3..000000000
--- a/extensions/freebase/src/com/google/refine/freebase/commands/LoadLanguageCommand.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package com.google.refine.freebase.commands;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.google.refine.ProjectManager;
-import com.google.refine.commands.Command;
-
-public class LoadLanguageCommand extends Command {
-
- public LoadLanguageCommand() {
- // TODO Auto-generated constructor stub
- }
-
- @Override
- public void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- doPost(request, response);
- }
-
- public void doPost(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
-
- String rawDirectoryFile = request.getSession().getServletContext()
- .getRealPath("extensions/freebase/module/langs/");
- String cleanedDirectory = rawDirectoryFile.replace("main" + File.separator + "webapp" + File.separator, "");
-
- BufferedReader reader = null;String param = null;
- try {
- param = (String) ProjectManager.singleton.getPreferenceStore().get("userLang");
- } catch (NullPointerException e) {
- }
- if (param == null) param = request.getParameter("lng");
-
- String[] langs = param.split(" ");
- try {
- String file = cleanedDirectory + File.separator + "translation-" + langs[0] + ".json";
- reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));
- } catch (FileNotFoundException e1) {
- try {
- String file = cleanedDirectory + File.separator + "translation-default.json";
- reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));
- } catch (FileNotFoundException e3) {
- e3.printStackTrace();
- }
- }
-
- String line = null;
- String message = new String();
- if (reader != null) {
- while ((line = reader.readLine()) != null) {
- // buffer.append(line);
- message += line + System.getProperty("line.separator");
- }
- }
-
- response.setCharacterEncoding("UTF-8");
- response.setContentType("application/json");
- response.getWriter().println(message);
- response.getWriter().flush();
- response.getWriter().close();
- }
-
-}
diff --git a/extensions/freebase/src/com/google/refine/freebase/util/FreebaseUtils.java b/extensions/freebase/src/com/google/refine/freebase/util/FreebaseUtils.java
index 82f98ac66..a805e9210 100644
--- a/extensions/freebase/src/com/google/refine/freebase/util/FreebaseUtils.java
+++ b/extensions/freebase/src/com/google/refine/freebase/util/FreebaseUtils.java
@@ -430,6 +430,9 @@ public class FreebaseUtils {
/**
* This RPC call works for the Reconcile API, but MQLread is not supported over JSONRPC
+ *
+ * NOTE: JSONRPC has been deprecated and replaced by HTTP Batch (which also
+ * doesn't support MQLread, so perhaps we should just remove this))
*/
@SuppressWarnings("unused")
static private JSONObject mqlreadRpc(String query) throws JSONException, UnsupportedEncodingException, IOException {
diff --git a/extensions/gdata/build.xml b/extensions/gdata/build.xml
index 0a344cbf2..5f52bda74 100644
--- a/extensions/gdata/build.xml
+++ b/extensions/gdata/build.xml
@@ -63,7 +63,9 @@
- 
+
+
| + | ||