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

FIXED - task 576: Use relative paths so works under a Java server named context - patch supplied by sergio@wikier.org

Browse Source 
http://code.google.com/p/google-refine/issues/detail?id=576

git-svn-id: http://google-refine.googlecode.com/svn/trunk@2584 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Tom Morris 2012-10-13 17:47:08 +00:00
parent 068e0916a2
commit 03d997be8e
40 changed files with 101 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/freebase/build.xml
View File

@ -43,7 +43,7 @@
<property name="classes.dir" value="${modinf.dir}/classes" /> <property name="classes.dir" value="${modinf.dir}/classes" />
<path id="class.path"> <path id="class.path">
<fileset dir="${lib.dir}"> <fileset dir="${lib.dir}" erroronmissingdir="false">
<include name="**/*.jar" /> <include name="**/*.jar" />
</fileset> </fileset>
<fileset dir="${refine.lib.dir}"> <fileset dir="${refine.lib.dir}">

2
extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
View File

@ -168,7 +168,7 @@ ExtendDataPreviewDialog.prototype._update = function() {
}; };
$.post( $.post(
"/command/freebase/preview-extend-data?" + $.param(params), "command/freebase/preview-extend-data?" + $.param(params),
{ {
rowIndices: JSON.stringify(this._rowIndices), rowIndices: JSON.stringify(this._rowIndices),
extension: JSON.stringify(this._extension) extension: JSON.stringify(this._extension)

10
extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.js
View File

@ -47,7 +47,7 @@ FreebaseLoadingDialog.prototype._createDialog = function() {
var loadButton = this._elmts.loadButton; var loadButton = this._elmts.loadButton;
var check_authorization = function(cont) { var check_authorization = function(cont) {
var check_authorization_url = "/command/freebase/check-authorization/" + provider; var check_authorization_url = "command/freebase/check-authorization/" + provider;
$.get(check_authorization_url, function(data) { $.get(check_authorization_url, function(data) {
if ("status" in data && data.code == "/api/status/ok") { if ("status" in data && data.code == "/api/status/ok") {
authorization.html('Signed in as: <a target="_new" href="http://www.freebase.com/view/user/' + data.username + '">' + data.username + '</a> | <a href="javascript:{}" bind="signout">Sign Out</a>').show(); authorization.html('Signed in as: <a target="_new" href="http://www.freebase.com/view/user/' + data.username + '">' + data.username + '</a> | <a href="javascript:{}" bind="signout">Sign Out</a>').show();
@ -96,7 +96,7 @@ FreebaseLoadingDialog.prototype._createDialog = function() {
"guid": null "guid": null
}]; }];
$.post("/command/freebase/mqlwrite/" + provider, $.post("command/freebase/mqlwrite/" + provider,
{ "query" : JSON.stringify(mql_query) }, { "query" : JSON.stringify(mql_query) },
function(data) { function(data) {
if ("status" in data && data.code == "/api/status/ok") { if ("status" in data && data.code == "/api/status/ok") {
@ -112,7 +112,7 @@ FreebaseLoadingDialog.prototype._createDialog = function() {
var show_triples = function(cont) { var show_triples = function(cont) {
$.post( $.post(
"/command/freebase/preview-protograph?" + $.param({ project: theProject.id }), "command/freebase/preview-protograph?" + $.param({ project: theProject.id }),
{ {
protograph: JSON.stringify(theProject.overlayModels.freebaseProtograph || {}), protograph: JSON.stringify(theProject.overlayModels.freebaseProtograph || {}),
engine: JSON.stringify(ui.browsingEngine.getJSON()) engine: JSON.stringify(ui.browsingEngine.getJSON())
@ -144,7 +144,7 @@ FreebaseLoadingDialog.prototype._createDialog = function() {
}); });
$.getJSON( $.getJSON(
"/command/core/get-preference?" + $.param({ project: theProject.id, name: "freebase.load.jobName" }), "command/core/get-preference?" + $.param({ project: theProject.id, name: "freebase.load.jobName" }),
null, null,
function(data) { function(data) {
self._elmts.source_name[0].value = (data.value) ? data.value : theProject.metadata.name; self._elmts.source_name[0].value = (data.value) ? data.value : theProject.metadata.name;
@ -182,7 +182,7 @@ FreebaseLoadingDialog.prototype._load = function() {
var dismissBusy = DialogSystem.showBusy(); var dismissBusy = DialogSystem.showBusy();
$.post( $.post(
"/command/freebase/upload-data", "command/freebase/upload-data",
{ {
"project" : theProject.id, "project" : theProject.id,
"qa" : qa, "qa" : qa,

2
extensions/freebase/module/scripts/dialogs/schema-alignment/dialog.js
View File

@ -285,7 +285,7 @@ SchemaAlignmentDialog.prototype.preview = function(initial) {
var protograph = this.getJSON(); var protograph = this.getJSON();
$.post( $.post(
"/command/freebase/preview-protograph?" + $.param({ project: theProject.id }), "command/freebase/preview-protograph?" + $.param({ project: theProject.id }),
{ protograph: JSON.stringify(protograph), engine: JSON.stringify(ui.browsingEngine.getJSON()) }, { protograph: JSON.stringify(protograph), engine: JSON.stringify(ui.browsingEngine.getJSON()) },
function(data) { function(data) {
if ("mqllike" in data) { if ("mqllike" in data) {

4
extensions/freebase/module/scripts/extension.js
View File

@ -37,7 +37,7 @@ FreebaseExtension.handlers.setFreebaseApiKey = function() {
var value = window.prompt("Set Freebase API Key:"); var value = window.prompt("Set Freebase API Key:");
if (value !== null) { if (value !== null) {
$.post( $.post(
"/command/core/set-preference", "command/core/set-preference",
{ {
name : "freebase.api.key", name : "freebase.api.key",
value : JSON.stringify(value) value : JSON.stringify(value)
@ -75,7 +75,7 @@ FreebaseExtension.handlers.browseToDataLoad = function() {
var w = window.open("about:blank", "dataload"); var w = window.open("about:blank", "dataload");
$.getJSON( $.getJSON(
"/command/core/get-preference?" + $.param({ project: theProject.id, name: "freebase.load.jobID" }), "command/core/get-preference?" + $.param({ project: theProject.id, name: "freebase.load.jobID" }),
null, null,
function(data) { function(data) {
if (data.value == null) { if (data.value == null) {

4
extensions/gdata/module/scripts/index/gdata-source-ui.js
View File

@ -54,7 +54,7 @@ Refine.GDataSourceUI.prototype.attachUI = function(body) {
); );
}); });
this._body.find('.gdata-signout.button').click(function() { this._body.find('.gdata-signout.button').click(function() {
$.get("/command/gdata/deauthorize" ); $.get("command/gdata/deauthorize" );
self._body.find('.gdata-page').hide(); self._body.find('.gdata-page').hide();
self._elmts.signinPage.show(); self._elmts.signinPage.show();
}); });
@ -92,7 +92,7 @@ Refine.GDataSourceUI.prototype._listDocuments = function() {
var self = this; var self = this;
$.post( $.post(
"/command/core/importing-controller?" + $.param({ "command/core/importing-controller?" + $.param({
"controller": "gdata/gdata-importing-controller", "controller": "gdata/gdata-importing-controller",
"subCommand": "list-documents" "subCommand": "list-documents"
}), }),

12
extensions/gdata/module/scripts/index/importing-controller.js
View File

@ -49,11 +49,11 @@ Refine.GDataImportingController.prototype.startImportingDocument = function(doc)
var self = this; var self = this;
$.post( $.post(
"/command/core/create-importing-job", "command/core/create-importing-job",
null, null,
function(data) { function(data) {
$.post( $.post(
"/command/core/importing-controller?" + $.param({ "command/core/importing-controller?" + $.param({
"controller": "gdata/gdata-importing-controller", "controller": "gdata/gdata-importing-controller",
"subCommand": "initialize-parser-ui", "subCommand": "initialize-parser-ui",
"docUrl": doc.docSelfLink, "docUrl": doc.docSelfLink,
@ -272,7 +272,7 @@ Refine.GDataImportingController.prototype._updatePreview = function() {
this._parsingPanelElmts.progressPanel.show(); this._parsingPanelElmts.progressPanel.show();
$.post( $.post(
"/command/core/importing-controller?" + $.param({ "command/core/importing-controller?" + $.param({
"controller": "gdata/gdata-importing-controller", "controller": "gdata/gdata-importing-controller",
"jobID": this._jobID, "jobID": this._jobID,
"subCommand": "parse-preview" "subCommand": "parse-preview"
@ -303,7 +303,7 @@ Refine.GDataImportingController.prototype._getPreviewData = function(callback, n
var result = {}; var result = {};
$.post( $.post(
"/command/core/get-models?" + $.param({ "importingJobID" : this._jobID }), "command/core/get-models?" + $.param({ "importingJobID" : this._jobID }),
null, null,
function(data) { function(data) {
for (var n in data) { for (var n in data) {
@ -313,7 +313,7 @@ Refine.GDataImportingController.prototype._getPreviewData = function(callback, n
} }
$.post( $.post(
"/command/core/get-rows?" + $.param({ "command/core/get-rows?" + $.param({
"importingJobID" : self._jobID, "importingJobID" : self._jobID,
"start" : 0, "start" : 0,
"limit" : numRows || 100 // More than we parse for preview anyway "limit" : numRows || 100 // More than we parse for preview anyway
@ -342,7 +342,7 @@ Refine.GDataImportingController.prototype._createProject = function() {
var options = this.getOptions(); var options = this.getOptions();
options.projectName = projectName; options.projectName = projectName;
$.post( $.post(
"/command/core/importing-controller?" + $.param({ "command/core/importing-controller?" + $.param({
"controller": "gdata/gdata-importing-controller", "controller": "gdata/gdata-importing-controller",
"jobID": this._jobID, "jobID": this._jobID,
"subCommand": "create-project" "subCommand": "create-project"

2
extensions/gdata/module/scripts/project/exporters.js
View File

@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
if (name) { if (name) {
var dismiss = DialogSystem.showBusy('Uploading...'); var dismiss = DialogSystem.showBusy('Uploading...');
$.post( $.post(
"/command/gdata/upload", "command/gdata/upload",
{ {
"project" : theProject.id, "project" : theProject.id,
"engine" : exportAllRows ? '' : JSON.stringify(ui.browsingEngine.getJSON()), "engine" : exportAllRows ? '' : JSON.stringify(ui.browsingEngine.getJSON()),

2
extensions/sample/build.xml
View File

@ -43,7 +43,7 @@
<property name="classes.dir" value="${modinf.dir}/classes" /> <property name="classes.dir" value="${modinf.dir}/classes" />
<path id="class.path"> <path id="class.path">
<fileset dir="${lib.dir}"> <fileset dir="${lib.dir}" erroronmissingdir="false">
<include name="**/*.jar" /> <include name="**/*.jar" />
</fileset> </fileset>
<fileset dir="${refine.lib.dir}"> <fileset dir="${refine.lib.dir}">

2
main/webapp/WEB-INF/butterfly.properties
View File

@ -24,7 +24,7 @@ butterfly.default.mountpoint = /extension
# ---------- Module ------ # ---------- Module ------
butterfly.modules.path = modules butterfly.modules.path = modules
butterfly.modules.path = ../../extensions/ butterfly.modules.path = ../../extensions
# Add more paths here if your extensions live elsewhere. # Add more paths here if your extensions live elsewhere.
# Relative paths are relative to refine/main/webapp/ # Relative paths are relative to refine/main/webapp/

8
main/webapp/WEB-INF/web.xml
View File

@ -5,6 +5,8 @@
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"> "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
<web-app> <web-app>
<display-name>Google Refine</display-name>
<description>Google Refine Webapp</description>
<!--+ <!--+
| This forces all the session cookies to default to the root path. | This forces all the session cookies to default to the root path.
@ -29,6 +31,12 @@
<param-name>refine.revision</param-name> <param-name>refine.revision</param-name>
<param-value>$REVISION</param-value> <param-value>$REVISION</param-value>
</init-param> </init-param>
<!-- added by Wikier, unused by us
<init-param>
<param-name>refine.data</param-name>
<param-value>/tmp/refine</param-value>
</init-param>
-->
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>

6
main/webapp/modules/core/MOD-INF/controller.js
View File

@ -521,7 +521,7 @@ function process(path, request, response) {
); );
} else { } else {
if (path == "/" || path == "") { if (path == "/" || path == "") {
path = "/index"; path = "index";
} else if (path.endsWith("/")) { } else if (path.endsWith("/")) {
path = path.substring(0, path.length - 1); path = path.substring(0, path.length - 1);
} }
@ -585,7 +585,7 @@ function process(path, request, response) {
var styleInjection = []; var styleInjection = [];
for each (var qualifiedPath in styles) { for each (var qualifiedPath in styles) {
styleInjection.push( styleInjection.push(
'<link type="text/css" rel="stylesheet" href="' + qualifiedPath.fullPath + '" />'); '<link type="text/css" rel="stylesheet" href="' + qualifiedPath.fullPath.substring(1) + '" />');
} }
context.styleInjection = styleInjection.join("\n"); context.styleInjection = styleInjection.join("\n");
@ -596,7 +596,7 @@ function process(path, request, response) {
var scriptInjection = []; var scriptInjection = [];
for each (var qualifiedPath in scripts) { for each (var qualifiedPath in scripts) {
scriptInjection.push( scriptInjection.push(
'<script type="text/javascript" src="' + qualifiedPath.fullPath + '"></script>'); '<script type="text/javascript" src="' + qualifiedPath.fullPath.substring(1) + '"></script>');
} }
context.scriptInjection = scriptInjection.join("\n"); context.scriptInjection = scriptInjection.join("\n");
} }

4
main/webapp/modules/core/error.vt
View File

@ -38,11 +38,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<meta http-equiv="X-UA-Compatible" content="IE=8;IE=9;chrome=1;"> <meta http-equiv="X-UA-Compatible" content="IE=8;IE=9;chrome=1;">
<title>Error - Google Refine</title> <title>Error - Google Refine</title>
<link rel="icon" type="image/png" href="images/favicon.png"> <link rel="icon" type="image/png" href="images/favicon.png">
<link rel="stylesheet" href="/styles/common.less" /> <link rel="stylesheet" href="styles/common.less" />
</head> </head>
<body> <body>
<div id="header"> <div id="header">
<a id="app-home-button" href="/"><img alt="Google Refine" src="/images/logo-googlerefine-30.png" width="129" height="29" /></a> <a id="app-home-button" href="/"><img alt="Google Refine" src="images/logo-googlerefine-30.png" width="129" height="29" /></a>
</div> </div>
<div id="body-info"> <div id="body-info">
<h1>Something went wrong!</h1> <h1>Something went wrong!</h1>

2
main/webapp/modules/core/index.vt
View File

@ -59,7 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</div> </div>
<ul> <ul>
<li><a href="http://code.google.com/p/google-refine/wiki/DocumentationForUsers">Help</a></li> <li><a href="http://code.google.com/p/google-refine/wiki/DocumentationForUsers">Help</a></li>
<li><a href="/about.html">About</a></li> <li><a href="about.html">About</a></li>
</ul> </ul>
</div> </div>
</div></div> <!-- left-panel --> </div></div> <!-- left-panel -->

4
main/webapp/modules/core/scripts/dialogs/clustering-dialog.js
View File

@ -232,13 +232,13 @@ ClusteringDialog.prototype._cluster = function() {
var self = this; var self = this;
var container = this._elmts.tableContainer.html( var container = this._elmts.tableContainer.html(
'<div style="margin: 1em; font-size: 130%; color: #888;">Clustering... <img src="/images/small-spinner.gif"></div>' '<div style="margin: 1em; font-size: 130%; color: #888;">Clustering... <img src="images/small-spinner.gif"></div>'
); );
this._elmts.resultSummary.empty(); this._elmts.resultSummary.empty();
$.post( $.post(
"/command/core/compute-clusters?" + $.param({ project: theProject.id }), "command/core/compute-clusters?" + $.param({ project: theProject.id }),
{ {
engine: JSON.stringify(ui.browsingEngine.getJSON()), engine: JSON.stringify(ui.browsingEngine.getJSON()),
clusterer: JSON.stringify({ clusterer: JSON.stringify({

14
main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js
View File

@ -154,7 +154,7 @@ ExpressionPreviewDialog.Widget.prototype.getExpression = function(commit) {
s = this._getLanguage() + ":" + s; s = this._getLanguage() + ":" + s;
if (commit) { if (commit) {
$.post( $.post(
"/command/core/log-expression?" + $.param({ project: theProject.id, expression: s }), "command/core/log-expression?" + $.param({ project: theProject.id, expression: s }),
null, null,
function(data) { function(data) {
}, },
@ -172,7 +172,7 @@ ExpressionPreviewDialog.Widget.prototype._getLanguage = function() {
ExpressionPreviewDialog.Widget.prototype._renderHelpTab = function() { ExpressionPreviewDialog.Widget.prototype._renderHelpTab = function() {
var self = this; var self = this;
$.getJSON( $.getJSON(
"/command/core/get-expression-language-info", "command/core/get-expression-language-info",
null, null,
function(data) { function(data) {
self._renderHelp(data); self._renderHelp(data);
@ -253,7 +253,7 @@ ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) {
ExpressionPreviewDialog.Widget.prototype._renderExpressionHistoryTab = function() { ExpressionPreviewDialog.Widget.prototype._renderExpressionHistoryTab = function() {
var self = this; var self = this;
$.getJSON( $.getJSON(
"/command/core/get-expression-history?" + $.param({ project: theProject.id }), "command/core/get-expression-history?" + $.param({ project: theProject.id }),
null, null,
function(data) { function(data) {
self._renderExpressionHistory(data); self._renderExpressionHistory(data);
@ -280,7 +280,7 @@ ExpressionPreviewDialog.Widget.prototype._renderExpressionHistory = function(dat
.appendTo(tr.insertCell(0)) .appendTo(tr.insertCell(0))
.click(function() { .click(function() {
$.post( $.post(
"/command/core/toggle-starred-expression", "command/core/toggle-starred-expression",
{ expression: entry.code }, { expression: entry.code },
function(data) { function(data) {
entry.starred = !entry.starred; entry.starred = !entry.starred;
@ -319,7 +319,7 @@ ExpressionPreviewDialog.Widget.prototype._renderExpressionHistory = function(dat
ExpressionPreviewDialog.Widget.prototype._renderStarredExpressionsTab = function() { ExpressionPreviewDialog.Widget.prototype._renderStarredExpressionsTab = function() {
var self = this; var self = this;
$.getJSON( $.getJSON(
"/command/core/get-starred-expressions", "command/core/get-starred-expressions",
null, null,
function(data) { function(data) {
self._renderStarredExpressions(data); self._renderStarredExpressions(data);
@ -344,7 +344,7 @@ ExpressionPreviewDialog.Widget.prototype._renderStarredExpressions = function(da
$('<a href="javascript:{}">Remove</a>').appendTo(tr.insertCell(0)).click(function() { $('<a href="javascript:{}">Remove</a>').appendTo(tr.insertCell(0)).click(function() {
$.post( $.post(
"/command/core/toggle-starred-expression", "command/core/toggle-starred-expression",
{ expression: entry.code, returnList: true }, { expression: entry.code, returnList: true },
function(data) { function(data) {
self._renderStarredExpressions(data); self._renderStarredExpressions(data);
@ -394,7 +394,7 @@ ExpressionPreviewDialog.Widget.prototype.update = function() {
this._prepareUpdate(params); this._prepareUpdate(params);
$.post( $.post(
"/command/core/preview-expression?" + $.param(params), "command/core/preview-expression?" + $.param(params),
{ {
rowIndices: JSON.stringify(this._rowIndices) rowIndices: JSON.stringify(this._rowIndices)
}, },

6
main/webapp/modules/core/scripts/dialogs/scatterplot-dialog.js
View File

@ -78,14 +78,14 @@ ScatterplotDialog.prototype._renderMatrix = function() {
var self = this; var self = this;
var container = this._elmts.tableContainer.html( var container = this._elmts.tableContainer.html(
'<div style="margin: 1em; font-size: 130%; color: #888; background-color: white;">Processing... <img src="/images/small-spinner.gif"></div>' '<div style="margin: 1em; font-size: 130%; color: #888; background-color: white;">Processing... <img src="images/small-spinner.gif"></div>'
); );
if (theProject.columnModel.columns.length > 0) { if (theProject.columnModel.columns.length > 0) {
var params = { var params = {
project: theProject.id project: theProject.id
}; };
$.getJSON("/command/core/get-columns-info?" + $.param(params),function(data) { $.getJSON("command/core/get-columns-info?" + $.param(params),function(data) {
if (data === null || typeof data.length == 'undefined') { if (data === null || typeof data.length == 'undefined') {
container.html("Error calling 'get-columns-info'"); container.html("Error calling 'get-columns-info'");
return; return;
@ -122,7 +122,7 @@ ScatterplotDialog.prototype._renderMatrix = function() {
engine: JSON.stringify(ui.browsingEngine.getJSON()), engine: JSON.stringify(ui.browsingEngine.getJSON()),
plotter: JSON.stringify(plotter_params) plotter: JSON.stringify(plotter_params)
}; };
var url = "/command/core/get-scatterplot?" + $.param(params); var url = "command/core/get-scatterplot?" + $.param(params);
var attrs = [ var attrs = [
'width="' + self._plot_size + '"', 'width="' + self._plot_size + '"',

6
main/webapp/modules/core/scripts/dialogs/templating-exporter-dialog.js
View File

@ -60,7 +60,7 @@ TemplatingExporterDialog.prototype._createDialog = function() {
TemplatingExporterDialog.prototype._getSavedTemplate = function(f) { TemplatingExporterDialog.prototype._getSavedTemplate = function(f) {
$.getJSON( $.getJSON(
"/command/core/get-preference?" + $.param({ project: theProject.id, name: "exporters.templating.template" }), "command/core/get-preference?" + $.param({ project: theProject.id, name: "exporters.templating.template" }),
null, null,
function(data) { function(data) {
if (data.value !== null) { if (data.value !== null) {
@ -113,7 +113,7 @@ TemplatingExporterDialog.prototype._dismiss = function() {
TemplatingExporterDialog.prototype._updatePreview = function() { TemplatingExporterDialog.prototype._updatePreview = function() {
var self = this; var self = this;
$.post( $.post(
"/command/core/export-rows/preview.txt", "command/core/export-rows/preview.txt",
{ {
"project" : theProject.id, "project" : theProject.id,
"format" : "template", "format" : "template",
@ -139,7 +139,7 @@ TemplatingExporterDialog.prototype._export = function() {
$(form) $(form)
.css("display", "none") .css("display", "none")
.attr("method", "post") .attr("method", "post")
.attr("action", "/command/core/export-rows/" + name + ".txt") .attr("action", "command/core/export-rows/" + name + ".txt")
.attr("target", "refine-export"); .attr("target", "refine-export");
var appendField = function(name, value) { var appendField = function(name, value) {

2
main/webapp/modules/core/scripts/facets/list-facet.js
View File

@ -702,7 +702,7 @@ ListFacet.prototype._setChoiceCountLimit = function(choiceCount) {
if (!isNaN(n)) { if (!isNaN(n)) {
var self = this; var self = this;
$.post( $.post(
"/command/core/set-preference", "command/core/set-preference",
{ {
name : "ui.browsing.listFacet.limit", name : "ui.browsing.listFacet.limit",
value : n value : n

2
main/webapp/modules/core/scripts/facets/scatterplot-facet.js
View File

@ -273,7 +273,7 @@ ScatterplotFacet.prototype._formulateImageUrl = function(engineConfig, conf) {
engine: JSON.stringify(engineConfig), engine: JSON.stringify(engineConfig),
plotter: JSON.stringify(options) plotter: JSON.stringify(options)
}; };
return "/command/core/get-scatterplot?" + $.param(params); return "command/core/get-scatterplot?" + $.param(params);
}; };
ScatterplotFacet.prototype.updateState = function(data) { ScatterplotFacet.prototype.updateState = function(data) {

2
main/webapp/modules/core/scripts/index.js
View File

@ -70,7 +70,7 @@ $(function() {
var showVersion = function() { var showVersion = function() {
$.getJSON( $.getJSON(
"/command/core/get-version", "command/core/get-version",
null, null,
function(data) { function(data) {
GoogleRefineVersion = data; GoogleRefineVersion = data;

6
main/webapp/modules/core/scripts/index/create-project-ui.js
View File

@ -50,7 +50,7 @@ Refine.CreateProjectUI = function(elmt) {
this._errorPanel.html(DOM.loadHTML("core", "scripts/index/create-project-error-panel.html")); this._errorPanel.html(DOM.loadHTML("core", "scripts/index/create-project-error-panel.html"));
$.post( $.post(
"/command/core/get-importing-configuration", "command/core/get-importing-configuration",
null, null,
function(data) { function(data) {
Refine.importingConfig = data.config; Refine.importingConfig = data.config;
@ -177,7 +177,7 @@ Refine.CreateProjectUI.prototype.showImportProgressPanel = function(progressMess
Refine.CreateProjectUI.prototype.pollImportJob = function(start, jobID, timerID, checkDone, callback, onError) { Refine.CreateProjectUI.prototype.pollImportJob = function(start, jobID, timerID, checkDone, callback, onError) {
var self = this; var self = this;
$.post( $.post(
"/command/core/get-importing-job-status?" + $.param({ "jobID": jobID }), "command/core/get-importing-job-status?" + $.param({ "jobID": jobID }),
null, null,
function(data) { function(data) {
if (!(data)) { if (!(data)) {
@ -264,5 +264,5 @@ Refine.CreateProjectUI.composeErrorMessage = function(job) {
}; };
Refine.CreateProjectUI.cancelImportingJob = function(jobID) { Refine.CreateProjectUI.cancelImportingJob = function(jobID) {
$.post("/command/core/cancel-importing-job?" + $.param({ "jobID": jobID })); $.post("command/core/cancel-importing-job?" + $.param({ "jobID": jobID }));
}; };

14
main/webapp/modules/core/scripts/index/default-importing-controller/controller.js
View File

@ -74,7 +74,7 @@ Refine.DefaultImportingController.prototype._startOver = function() {
Refine.DefaultImportingController.prototype.startImportJob = function(form, progressMessage, callback) { Refine.DefaultImportingController.prototype.startImportJob = function(form, progressMessage, callback) {
var self = this; var self = this;
$.post( $.post(
"/command/core/create-importing-job", "command/core/create-importing-job",
null, null,
function(data) { function(data) {
var jobID = self._jobID = data.jobID; var jobID = self._jobID = data.jobID;
@ -83,7 +83,7 @@ Refine.DefaultImportingController.prototype.startImportJob = function(form, prog
.attr("enctype", "multipart/form-data") .attr("enctype", "multipart/form-data")
.attr("accept-charset", "UTF-8") .attr("accept-charset", "UTF-8")
.attr("target", "create-project-iframe") .attr("target", "create-project-iframe")
.attr("action", "/command/core/importing-controller?" + $.param({ .attr("action", "command/core/importing-controller?" + $.param({
"controller": "core/default-importing-controller", "controller": "core/default-importing-controller",
"jobID": jobID, "jobID": jobID,
"subCommand": "load-raw-data" "subCommand": "load-raw-data"
@ -176,7 +176,7 @@ Refine.DefaultImportingController.prototype._ensureFormatParserUIHasInitializati
var self = this; var self = this;
var dismissBusy = DialogSystem.showBusy("Inspecting selected files ..."); var dismissBusy = DialogSystem.showBusy("Inspecting selected files ...");
$.post( $.post(
"/command/core/importing-controller?" + $.param({ "command/core/importing-controller?" + $.param({
"controller": "core/default-importing-controller", "controller": "core/default-importing-controller",
"jobID": this._jobID, "jobID": this._jobID,
"subCommand": "initialize-parser-ui", "subCommand": "initialize-parser-ui",
@ -201,7 +201,7 @@ Refine.DefaultImportingController.prototype._ensureFormatParserUIHasInitializati
Refine.DefaultImportingController.prototype.updateFormatAndOptions = function(options, callback) { Refine.DefaultImportingController.prototype.updateFormatAndOptions = function(options, callback) {
var self = this; var self = this;
$.post( $.post(
"/command/core/importing-controller?" + $.param({ "command/core/importing-controller?" + $.param({
"controller": "core/default-importing-controller", "controller": "core/default-importing-controller",
"jobID": this._jobID, "jobID": this._jobID,
"subCommand": "update-format-and-options" "subCommand": "update-format-and-options"
@ -232,7 +232,7 @@ Refine.DefaultImportingController.prototype.getPreviewData = function(callback,
var result = {}; var result = {};
$.post( $.post(
"/command/core/get-models?" + $.param({ "importingJobID" : this._jobID }), "command/core/get-models?" + $.param({ "importingJobID" : this._jobID }),
null, null,
function(data) { function(data) {
for (var n in data) { for (var n in data) {
@ -242,7 +242,7 @@ Refine.DefaultImportingController.prototype.getPreviewData = function(callback,
} }
$.post( $.post(
"/command/core/get-rows?" + $.param({ "command/core/get-rows?" + $.param({
"importingJobID" : self._jobID, "importingJobID" : self._jobID,
"start" : 0, "start" : 0,
"limit" : numRows || 100 // More than we parse for preview anyway "limit" : numRows || 100 // More than we parse for preview anyway
@ -272,7 +272,7 @@ Refine.DefaultImportingController.prototype._createProject = function() {
var options = this._formatParserUI.getOptions(); var options = this._formatParserUI.getOptions();
options.projectName = projectName; options.projectName = projectName;
$.post( $.post(
"/command/core/importing-controller?" + $.param({ "command/core/importing-controller?" + $.param({
"controller": "core/default-importing-controller", "controller": "core/default-importing-controller",
"jobID": this._jobID, "jobID": this._jobID,
"subCommand": "create-project" "subCommand": "create-project"

2
main/webapp/modules/core/scripts/index/default-importing-controller/file-selection-panel.js
View File

@ -316,7 +316,7 @@ Refine.DefaultImportingController.prototype._commitFileSelection = function() {
var self = this; var self = this;
var dismissBusy = DialogSystem.showBusy("Inspecting<br/>selected files ..."); var dismissBusy = DialogSystem.showBusy("Inspecting<br/>selected files ...");
$.post( $.post(
"/command/core/importing-controller?" + $.param({ "command/core/importing-controller?" + $.param({
"controller": "core/default-importing-controller", "controller": "core/default-importing-controller",
"jobID": this._jobID, "jobID": this._jobID,
"subCommand": "update-file-selection" "subCommand": "update-file-selection"

2
main/webapp/modules/core/scripts/index/import-project-ui.html
View File

@ -1,4 +1,4 @@
<form id="project-upload-form" method="post" enctype="multipart/form-data" action="/command/core/import-project" accept-charset="UTF-8"> <form id="project-upload-form" method="post" enctype="multipart/form-data" action="command/core/import-project" accept-charset="UTF-8">
<div class="grid-layout layout-normal"><table> <div class="grid-layout layout-normal"><table>
<tr> <tr>
<td colspan="2">Locate an existing Google Refine project file (.tar or .tar.gz):</td> <td colspan="2">Locate an existing Google Refine project file (.tar or .tar.gz):</td>

14
main/webapp/modules/core/scripts/index/open-project-ui.js
View File

@ -60,7 +60,7 @@ Refine.OpenProjectUI = function(elmt) {
$('#projects-workspace-open').click(function() { $('#projects-workspace-open').click(function() {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "/command/core/open-workspace-dir", url: "command/core/open-workspace-dir",
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
if (data.code != "ok" && "message" in data) { if (data.code != "ok" && "message" in data) {
@ -89,7 +89,7 @@ Refine.OpenProjectUI.prototype.resize = function() {
Refine.OpenProjectUI.prototype._fetchProjects = function() { Refine.OpenProjectUI.prototype._fetchProjects = function() {
var self = this; var self = this;
$.getJSON( $.getJSON(
"/command/core/get-all-project-metadata", "command/core/get-all-project-metadata",
null, null,
function(data) { function(data) {
self._renderProjects(data); self._renderProjects(data);
@ -136,12 +136,12 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {
.attr("title","Delete this project") .attr("title","Delete this project")
.attr("href","") .attr("href","")
.css("visibility", "hidden") .css("visibility", "hidden")
.html("<img src='/images/close.png' />") .html("<img src='images/close.png' />")
.click(function() { .click(function() {
if (window.confirm("Are you sure you want to delete project \"" + project.name + "\"?")) { if (window.confirm("Are you sure you want to delete project \"" + project.name + "\"?")) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "/command/core/delete-project", url: "command/core/delete-project",
data: { "project" : project.id }, data: { "project" : project.id },
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
@ -174,7 +174,7 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "/command/core/rename-project", url: "command/core/rename-project",
data: { "project" : project.id, "name" : name }, data: { "project" : project.id, "name" : name },
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
@ -198,7 +198,7 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {
var nameLink = $('<a></a>') var nameLink = $('<a></a>')
.addClass("project-name") .addClass("project-name")
.text(project.name) .text(project.name)
.attr("href", "/project?project=" + project.id) .attr("href", "project?project=" + project.id)
.appendTo(tr.insertCell(tr.cells.length)); .appendTo(tr.insertCell(tr.cells.length));
$(tr).mouseenter(function() { $(tr).mouseenter(function() {
@ -227,7 +227,7 @@ Refine.OpenProjectUI.prototype._onClickUploadFileButton = function(evt) {
} else { } else {
$("#file-upload-form").attr("action", $("#file-upload-form").attr("action",
"/command/core/create-project-from-upload?" + [ "command/core/create-project-from-upload?" + [
"url=" + escape(dataURL), "url=" + escape(dataURL),
"split-into-columns=" + $("#split-into-columns-input")[0].checked, "split-into-columns=" + $("#split-into-columns-input")[0].checked,
"separator=" + $("#separator-input")[0].value, "separator=" + $("#separator-input")[0].value,

8
main/webapp/modules/core/scripts/preferences.js
View File

@ -49,7 +49,7 @@ function PreferenceUI(tr, key, value) {
if (newValue !== null) { if (newValue !== null) {
$(td1).text(newValue); $(td1).text(newValue);
$.post( $.post(
"/command/core/set-preference", "command/core/set-preference",
{ {
name : key, name : key,
value : JSON.stringify(newValue) value : JSON.stringify(newValue)
@ -67,7 +67,7 @@ function PreferenceUI(tr, key, value) {
$('<button class="button">').text("Delete").appendTo(td2).click(function() { $('<button class="button">').text("Delete").appendTo(td2).click(function() {
if (window.confirm("Delete preference key " + key + "?")) { if (window.confirm("Delete preference key " + key + "?")) {
$.post( $.post(
"/command/core/set-preference", "command/core/set-preference",
{ {
name : key name : key
}, },
@ -120,7 +120,7 @@ function populatePreferences(prefs) {
preferenceUIs.push(new PreferenceUI(tr, key, value)); preferenceUIs.push(new PreferenceUI(tr, key, value));
$.post( $.post(
"/command/core/set-preference", "command/core/set-preference",
{ {
name : key, name : key,
value : JSON.stringify(value) value : JSON.stringify(value)
@ -139,7 +139,7 @@ function populatePreferences(prefs) {
function onLoad() { function onLoad() {
$.post( $.post(
"/command/core/get-all-preferences", "command/core/get-all-preferences",
null, null,
populatePreferences, populatePreferences,
"json" "json"

10
main/webapp/modules/core/scripts/project.js
View File

@ -155,7 +155,7 @@ Refine.setTitle = function(status) {
Refine.reinitializeProjectData = function(f, fError) { Refine.reinitializeProjectData = function(f, fError) {
$.getJSON( $.getJSON(
"/command/core/get-project-metadata?" + $.param({ project: theProject.id }), null, "command/core/get-project-metadata?" + $.param({ project: theProject.id }), null,
function(data) { function(data) {
if (data.status == 'error') { if (data.status == 'error') {
alert(data.message); alert(data.message);
@ -165,7 +165,7 @@ Refine.reinitializeProjectData = function(f, fError) {
} else { } else {
theProject.metadata = data; theProject.metadata = data;
$.getJSON( $.getJSON(
"/command/core/get-models?" + $.param({ project: theProject.id }), null, "command/core/get-models?" + $.param({ project: theProject.id }), null,
function(data) { function(data) {
for (var n in data) { for (var n in data) {
if (data.hasOwnProperty(n)) { if (data.hasOwnProperty(n)) {
@ -195,7 +195,7 @@ Refine._renameProject = function() {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "/command/core/rename-project", url: "command/core/rename-project",
data: { "project" : theProject.id, "name" : name }, data: { "project" : theProject.id, "name" : name },
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
@ -339,7 +339,7 @@ Refine.postProcess = function(moduleName, command, params, body, updateOptions,
Refine.setAjaxInProgress(); Refine.setAjaxInProgress();
$.post( $.post(
"/command/" + moduleName + "/" + command + "?" + $.param(params), "command/" + moduleName + "/" + command + "?" + $.param(params),
body, body,
onDone, onDone,
"json" "json"
@ -404,7 +404,7 @@ Refine.fetchRows = function(start, limit, onDone, sorting) {
} }
$.post( $.post(
"/command/core/get-rows?" + $.param({ project: theProject.id, start: start, limit: limit }) + "&callback=?", "command/core/get-rows?" + $.param({ project: theProject.id, start: start, limit: limit }) + "&callback=?",
body, body,
function(data) { function(data) {
theProject.rowModel = data; theProject.rowModel = data;

2
main/webapp/modules/core/scripts/project/browsing-engine.js
View File

@ -243,7 +243,7 @@ BrowsingEngine.prototype.update = function(onDone) {
this._elmts.indicator.css("visibility", "visible"); this._elmts.indicator.css("visibility", "visible");
$.post( $.post(
"/command/core/compute-facets?" + $.param({ project: theProject.id }), "command/core/compute-facets?" + $.param({ project: theProject.id }),
{ engine: JSON.stringify(this.getJSON(true)) }, { engine: JSON.stringify(this.getJSON(true)) },
function(data) { function(data) {
var facetData = data.facets; var facetData = data.facets;

4
main/webapp/modules/core/scripts/project/exporters.js
View File

@ -139,7 +139,7 @@ ExporterManager.prepareExportRowsForm = function(format, includeEngine, ext) {
$(form) $(form)
.css("display", "none") .css("display", "none")
.attr("method", "post") .attr("method", "post")
.attr("action", "/command/core/export-rows/" + name + ((ext) ? ("." + ext) : "")) .attr("action", "command/core/export-rows/" + name + ((ext) ? ("." + ext) : ""))
.attr("target", "refine-export"); .attr("target", "refine-export");
$('<input />') $('<input />')
@ -166,7 +166,7 @@ ExporterManager.handlers.exportProject = function() {
$(form) $(form)
.css("display", "none") .css("display", "none")
.attr("method", "post") .attr("method", "post")
.attr("action", "/command/core/export-project/" + name + ".google-refine.tar.gz") .attr("action", "command/core/export-project/" + name + ".google-refine.tar.gz")
.attr("target", "refine-export"); .attr("target", "refine-export");
$('<input />') $('<input />')
.attr("name", "project") .attr("name", "project")

4
main/webapp/modules/core/scripts/project/history-panel.js
View File

@ -54,7 +54,7 @@ HistoryPanel.prototype.resize = function() {
HistoryPanel.prototype.update = function(onDone) { HistoryPanel.prototype.update = function(onDone) {
var self = this; var self = this;
Ajax.chainGetJSON( Ajax.chainGetJSON(
"/command/core/get-history?" + $.param({ project: theProject.id }), null, "command/core/get-history?" + $.param({ project: theProject.id }), null,
function(data) { function(data) {
self._data = data; self._data = data;
self._render(); self._render();
@ -171,7 +171,7 @@ HistoryPanel.prototype._onClickHistoryEntry = function(evt, entry, lastDoneID) {
HistoryPanel.prototype._extractOperations = function() { HistoryPanel.prototype._extractOperations = function() {
var self = this; var self = this;
$.getJSON( $.getJSON(
"/command/core/get-operations?" + $.param({ project: theProject.id }), "command/core/get-operations?" + $.param({ project: theProject.id }),
null, null,
function(data) { function(data) {
if ("entries" in data) { if ("entries" in data) {

6
main/webapp/modules/core/scripts/project/process-panel.js
View File

@ -81,7 +81,7 @@ ProcessPanel.prototype.update = function(updateOptions, onDone) {
var self = this; var self = this;
Ajax.chainGetJSON( Ajax.chainGetJSON(
"/command/core/get-processes?" + $.param({ project: theProject.id }), null, "command/core/get-processes?" + $.param({ project: theProject.id }), null,
function(data) { function(data) {
self._latestHistoryEntry = null; self._latestHistoryEntry = null;
self._render(data); self._render(data);
@ -120,7 +120,7 @@ ProcessPanel.prototype.undo = function() {
ProcessPanel.prototype._cancelAll = function() { ProcessPanel.prototype._cancelAll = function() {
var self = this; var self = this;
$.post( $.post(
"/command/core/cancel-processes?" + $.param({ project: theProject.id }), "command/core/cancel-processes?" + $.param({ project: theProject.id }),
null, null,
function(o) { function(o) {
self._data = null; self._data = null;
@ -195,7 +195,7 @@ ProcessPanel.prototype._render = function(newData) {
if (window.confirm('The last operation encountered some errors:\n' + messages + if (window.confirm('The last operation encountered some errors:\n' + messages +
'\n\nContinue with the remaining operations?')) { '\n\nContinue with the remaining operations?')) {
$.post( $.post(
"/command/core/apply-operations?" + $.param({ project: theProject.id }), "command/core/apply-operations?" + $.param({ project: theProject.id }),
{ operations: '[]' }, { operations: '[]' },
function(o) {}, function(o) {},
"json" "json"

4
main/webapp/modules/core/scripts/reconciliation/recon-manager.js
View File

@ -128,7 +128,7 @@ ReconciliationManager.save = function(f) {
$.ajax({ $.ajax({
async: false, async: false,
type: "POST", type: "POST",
url: "/command/core/set-preference?" + $.param({ url: "command/core/set-preference?" + $.param({
name: "reconciliation.standardServices" name: "reconciliation.standardServices"
}), }),
data: { "value" : JSON.stringify(ReconciliationManager.standardServices) }, data: { "value" : JSON.stringify(ReconciliationManager.standardServices) },
@ -147,7 +147,7 @@ ReconciliationManager.save = function(f) {
$.ajax({ $.ajax({
async: false, async: false,
url: "/command/core/get-preference?" + $.param({ url: "command/core/get-preference?" + $.param({
name: "reconciliation.standardServices" name: "reconciliation.standardServices"
}), }),
success: function(data) { success: function(data) {

2
main/webapp/modules/core/scripts/reconciliation/standard-service-panel.js
View File

@ -45,7 +45,7 @@ ReconStandardServicePanel.prototype._guessTypes = function(f) {
var dismissBusy = DialogSystem.showBusy(); var dismissBusy = DialogSystem.showBusy();
$.post( $.post(
"/command/core/guess-types-of-column?" + $.param({ "command/core/guess-types-of-column?" + $.param({
project: theProject.id, project: theProject.id,
columnName: this._column.name, columnName: this._column.name,
service: this._service.url service: this._service.url

2
main/webapp/modules/core/scripts/util/custom-suggest.js
View File

@ -164,7 +164,7 @@ CustomSuggest.setFreebaseAPIKey = function(freebaseAPIKey) {
); );
// Use Freebase API Key // Use Freebase API Key
$.ajax("/command/core/get-preference", $.ajax("command/core/get-preference",
{ {
async: false, async: false,
data: {name: "freebase.api.key"}, data: {name: "freebase.api.key"},

2
main/webapp/modules/core/scripts/util/dom.js
View File

@ -105,7 +105,7 @@ DOM._resolveIdInDOMChildren = function(elmt, idmap) {
DOM._loadedHTML = {}; DOM._loadedHTML = {};
DOM.loadHTML = function(module, path) { DOM.loadHTML = function(module, path) {
var fullPath = ModuleWirings[module] + path; var fullPath = (ModuleWirings[module] + path).substring(1);
if (!(fullPath in DOM._loadedHTML)) { if (!(fullPath in DOM._loadedHTML)) {
$.ajax({ $.ajax({
async: false, async: false,

2
main/webapp/modules/core/scripts/util/menu.js
View File

@ -153,7 +153,7 @@ MenuSystem.createAndShowStandardMenu = function(items, elmt, options) {
menuItem.html( menuItem.html(
'<table width="100%" cellspacing="0" cellpadding="0" class="menu-item-layout"><tr>' + '<table width="100%" cellspacing="0" cellpadding="0" class="menu-item-layout"><tr>' +
'<td>' + item.label + '</td>' + '<td>' + item.label + '</td>' +
'<td width="1%"><img src="/images/right-arrow.png" /></td>' + '<td width="1%"><img src="images/right-arrow.png" /></td>' +
'</tr></table>' '</tr></table>'
); );
menuItem.mouseenter(function() { menuItem.mouseenter(function() {

4
main/webapp/modules/core/scripts/util/sign.js
View File

@ -93,7 +93,7 @@ if (typeof window.Sign == 'undefined') {
}, },
signin : function(success, provider, check_authorization_url, width, height) { signin : function(success, provider, check_authorization_url, width, height) {
var newwin = window.Sign.popup("/command/core/authorize/" + provider, width, height); var newwin = window.Sign.popup("command/core/authorize/" + provider, width, height);
if (newwin !== null) { if (newwin !== null) {
newwin.opener = window; newwin.opener = window;
@ -123,7 +123,7 @@ if (typeof window.Sign == 'undefined') {
signout : function(success,provider) { signout : function(success,provider) {
$.ajax({ $.ajax({
url: "/command/core/deauthorize/" + provider, url: "command/core/deauthorize/" + provider,
success: function() { success: function() {
if (typeof success == 'undefined') { if (typeof success == 'undefined') {
window.location.reload(); window.location.reload();

2
main/webapp/modules/core/styles/common.less
View File

@ -162,7 +162,7 @@ a img {
} }
.button-menu, a.button-menu { .button-menu, a.button-menu {
background: url(/images/down-arrow.png) no-repeat right 6px; background: url(images/down-arrow.png) no-repeat right 6px;
padding-right: 12px; padding-right: 12px;
} }

2
main/webapp/modules/core/styles/project/sidebar.less
View File

@ -84,7 +84,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
padding: 20px 0 0 10px; padding: 20px 0 0 10px;
font-size: 1.15em; font-size: 1.15em;
font-weight: bold; font-weight: bold;
background: url(/images/logo-gem-40.png) no-repeat right top; background: url(../../images/logo-gem-40.png) no-repeat right top;
} }
.browsing-panel-help p, .history-panel-help p { .browsing-panel-help p, .history-panel-help p {