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

Renamed in client-side code. Refine should start and existing projects should still work.

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@1293 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2010-09-22 22:55:28 +00:00
parent 22cbcddd78
commit d15fe661fa
42 changed files with 194 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IDEs/eclipse/README.txt
View File

@ -1,26 +1,26 @@
Gridworks Helpers for Eclipse Google Refine for Eclipse
----------------------------- -------------------------
This file contains Eclipse-specific help files that can get simplify your life This file contains Eclipse-specific help files that can get simplify your life
developing Gridworks with Eclipse (http://www.eclipse.org/). developing Google Refine with Eclipse (http://www.eclipse.org/).
Launch Files (*.launch) Launch Files (*.launch)
----------------------- -----------------------
These are files that help you running Gridworks directly from eclipse without having to execute These are files that help you running Google Refine directly from eclipse without having to execute
the shell scripts. the shell scripts.
To run, right click on the files directly from Eclipse, then do "Run As -> <name>". To run, right click on the files directly from Eclipse, then do "Run As -> <name>".
Code Style Format Configurations (Gridworks.style.xml) Code Style Format Configurations (Refine.style.xml)
------------------------------------------------------ ------------------------------------------------------
This is the code formatting configurations that all Gridworks developers should follow. This is the code formatting configurations that all Google Refine developers should follow.
To import, open the Eclipse preferences, then follow to "Java > Code Style > Formatter" To import, open the Eclipse preferences, then follow to "Java > Code Style > Formatter"
and click the "Import" button and load the file. and click the "Import" button and load the file.
@ -33,6 +33,6 @@
Thank you for your interest. Thank you for your interest.
The Freebase Gridworks Development Team The Google Refine Development Team
http://code.google.com/p/freebase-gridworks/ http://code.google.com/p/google-refine/

2
IDEs/eclipse/Gridworks.style.xml → IDEs/eclipse/Refine.style.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<profiles version="11"> <profiles version="11">
<profile kind="CodeFormatterProfile" name="Gridworks" version="11"> <profile kind="CodeFormatterProfile" name="Google Refine" version="11">
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>

2
LICENSE.txt
View File

@ -39,7 +39,7 @@ Apache License 2.0
------------------ ------------------
licenses/apache2.0.LICENSE.txt licenses/apache2.0.LICENSE.txt
calendar-parser (package com.google.gridworks.expr.util) calendar-parser (package com.google.refine.expr.util)
ant-tools ant-tools
commons-lang commons-lang
commons-codec commons-codec

4
extensions/build.xml
View File

@ -2,11 +2,11 @@
<!--+ <!--+
| |
| Gridworks Extensions Build File | Google Refine Extensions Build File
| |
+--> +-->
<project name="gridworks-extensions" default="build" basedir="."> <project name="google-refine-extensions" default="build" basedir=".">
<target name="build"> <target name="build">
<echo message="Building extensions" /> <echo message="Building extensions" />
<ant dir="sample-extension/" target="build" /> <ant dir="sample-extension/" target="build" />

2
main/tests/client/src/facets.js
View File

@ -7,7 +7,7 @@ var test_facets = new function() {
// test opening Food project // test opening Food project
test = newTest(); test = newTest();
assert (test, "assertText", { jquery: '("h1")[0]', validator: "Welcome to Gridworks" }); assert (test, "assertText", { jquery: '("h1")[0]', validator: "Welcome to Google Refine" });
this.test_home_page = test; this.test_home_page = test;
// make sure the dataset was loaded properly // make sure the dataset was loaded properly

35
main/webapp/modules/core/about.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html> <html>
<head> <head>
<title>About Freebase Gridworks</title> <title>About 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.css" /> <link rel="stylesheet" href="/styles/common.css" />
<link rel="stylesheet" href="/styles/index.css" /> <link rel="stylesheet" href="/styles/index.css" />
@ -9,9 +9,9 @@
<script type="text/javascript" src="externals/jquery-1.4.2.min.js"></script> <script type="text/javascript" src="externals/jquery-1.4.2.min.js"></script>
<script> <script>
$(function() { $(function() {
if (GridworksVersion && GridworksVersion.version) { if (GoogleRefineVersion && GoogleRefineVersion.version) {
if (GridworksVersion.version != "$VERSION") { if (GoogleRefineVersion.version != "$VERSION") {
$("#version").text("Version " + GridworksVersion.version + " [" + GridworksVersion.revision + "]").show(); $("#version").text("Version " + GoogleRefineVersion.version + " [" + GoogleRefineVersion.revision + "]").show();
} }
} }
}); });
@ -66,29 +66,30 @@
<body> <body>
<div id="header"> <div id="header">
<a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a> <a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a>
<div id="path"><span class="app-path-section"><a href="./">Gridworks</a></span></div> <div id="path"><span class="app-path-section"><a href="./">Google Refine</a></span></div>
</div> </div>
<div id="body"> <div id="body">
<h1>About Free<b>base</b> Grid<b>works</b></h1> <h1>About Google Refine</h1>
<h2 id="version" style="display: none"></h2> <h2 id="version" style="display: none"></h2>
<div id="about"> <div id="about">
<p> <p>
Freebase Gridworks is a power tool that allows you to load data, Google Refine is a power tool that allows you to load data,
understand it, clean it up, reconcile it internally, and augment it understand it, clean it up, reconcile it internally, and augment it
with data coming from Freebase. All with the comfort and privacy of with data coming from Freebase and other web sources. All with the comfort and privacy of
your own computer.</p> your own computer.</p>
<p> <p>
It was originally developed by <a href="http://www.metaweb.com/">Metaweb Technologies, Inc.</a> It was originally developed by <a href="http://www.metaweb.com/">Metaweb Technologies, Inc.</a>.
Metaweb was acquired by <a href="http://www.google.com/">Google, Inc.</a>, in July 2010.
</p> </p>
<h2>License</h2> <h2>License</h2>
<pre class="license">/* <pre class="license">/*
* Copyright (c) 2010, Metaweb Technologies, Inc. All rights reserved. * Copyright (c) 2010, Google, Inc. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -102,11 +103,11 @@
* disclaimer in the documentation and/or other materials provided * disclaimer in the documentation and/or other materials provided
* with the distribution. * with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY METAWEB TECHNOLOGIES AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY GOOGLE, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METAWEB * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE,
* TECHNOLOGIES OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
@ -123,7 +124,7 @@
------------------ ------------------
licenses/apache2.0.LICENSE.txt licenses/apache2.0.LICENSE.txt
calendar-parser (package com.google.gridworks.expr.util) calendar-parser (package com.google.refine.expr.util)
ant-tools ant-tools
commons-lang commons-lang
commons-codec commons-codec
@ -220,11 +221,5 @@ Flag icon
</ul> </ul>
</div> </div>
</div> </div>
<div id="footer">
<a href="about.html">About Freebase Gridworks</a>
&bull;
&copy; 2010 <a href="http://www.metaweb.com/">Metaweb Technologies, Inc.</a>
</div>
</body> </body>
</html> </html>

10
main/webapp/modules/core/error.html
View File

@ -3,7 +3,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Error - Gridworks</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">
@ -27,19 +27,19 @@
<body> <body>
<div id="header"> <div id="header">
<a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a> <a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a>
<div id="path"><span class="app-path-section"><a href="./">Gridworks</a></span></div> <div id="path"><span class="app-path-section"><a href="./">Google Refine</a></span></div>
</div> </div>
<div id="body"> <div id="body">
<h1>Oops, something went wrong!</h1> <h1>Oops, something went wrong!</h1>
<p id="message"></p> <p id="message"></p>
<p>Redirecting you back to <a href="index.html">Gridworks' home page</a> in 20 seconds ...</p> <p>Redirecting you back to <a href="index.html">Google Refine' home page</a> in 20 seconds ...</p>
</div> </div>
<div id="footer"> <div id="footer">
<a href="about.html">About Freebase Gridworks</a> <a href="about.html">About Google Refine</a>
&bull; &bull;
&copy; 2010 <a href="http://www.metaweb.com/">Metaweb Technologies, Inc.</a> &copy; 2010 <a href="http://www.metaweb.com/">Google, Inc.</a>
</div> </div>
</body> </body>
</html> </html>

0
main/webapp/modules/core/images/gridworks-watermark.png → main/webapp/modules/core/images/google-refine-watermark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

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

@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html> <html>
<head> <head>
<title>Freebase Gridworks</title> <title>Google Refine</title>
<link rel="icon" type="image/png" href="images/favicon.png"> <link rel="icon" type="image/png" href="images/favicon.png">
@ -10,23 +10,21 @@
</head> </head>
<body> <body>
<div id="header"> <div id="header">
<span id="gridworks-version"></span> <span id="google-refine-version"></span>
<a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a> <a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a>
<div id="path"><span class="app-path-section"><a href="./">Gridworks</a></span></div> <div id="path"><span class="app-path-section"><a href="./">Google Refine</a></span></div>
</div> </div>
<div id="body"> <div id="body">
<div class="grid-layout layout-loose"><table> <div class="grid-layout layout-loose"><table>
<tr> <tr>
<td id="welcome-panel"> <td id="welcome-panel">
<h1>Welcome to Gridworks</h1> <h1>Welcome to Google Refine</h1>
<p>Freebase Gridworks is a power tool that allows you to load data, understand it, <p>Google Refine is a power tool that allows you to load data, understand it,
clean it up, reconcile it internally, augment it with data coming from clean it up, reconcile it internally, augment it with data coming from
<a href="http://www.freebase.com/" class="quiet-link">Freebase</a>, and optionally <a href="http://www.freebase.com/" class="quiet-link">Freebase</a>, and optionally
contribute your data to Freebase for others to use. contribute your data to Freebase for others to use.
</p> </p>
<p>It was originally developed by <a href="http://www.metaweb.com/" class="quiet-link">Metaweb</a>.
</p>
<p><a href="about.html" class="quiet-link">Credits and Licenses &raquo;</a> <p><a href="about.html" class="quiet-link">Credits and Licenses &raquo;</a>
</p> </p>
</td> </td>
@ -111,7 +109,7 @@
<div id="form-tabs-import-project" class="round-corners"> <div id="form-tabs-import-project" class="round-corners">
<a class="form-tab-link" href="javascript:showHide('project-upload-form', 'file-upload-form')">or Create a New Project</a> <a class="form-tab-link" href="javascript:showHide('project-upload-form', 'file-upload-form')">or Create a New Project</a>
<h1>Import an Existing Project</h1> <h1>Import an Existing Project</h1>
<p>Import an existing Gridworks .tar or .tar.gz file:</p> <p>Import an existing Google Refine .tar or .tar.gz file:</p>
<div class="grid-layout layout-tight"><table> <div class="grid-layout layout-tight"><table>
<tr><td class="field-label">Project File:</td><td><input type="file" id="project-tar-file-input" name="project-file" /></td></tr> <tr><td class="field-label">Project File:</td><td><input type="file" id="project-tar-file-input" name="project-file" /></td></tr>
<tr><td class="field-label">Rename (optional):</td><td><input type="text" size="30" id="project-name-input" name="project-name" /></td></tr> <tr><td class="field-label">Rename (optional):</td><td><input type="text" size="30" id="project-name-input" name="project-name" /></td></tr>

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

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Freebase Gridworks - Preferences</title> <title>Google Refine - Preferences</title>
<script type="text/javascript" src="wirings.js"></script> <script type="text/javascript" src="wirings.js"></script>
$scriptInjection $scriptInjection
@ -14,7 +14,7 @@
<body> <body>
<div id="header"> <div id="header">
<a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a> <a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a>
<div id="path"><span class="app-path-section"><a href="./">Gridworks</a></span><span class="app-path-section">Preferences</span></div> <div id="path"><span class="app-path-section"><a href="./">Google Refine</a></span><span class="app-path-section">Preferences</span></div>
</div> </div>
<div id="body"> <div id="body">

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

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Freebase Gridworks</title> <title>Google Refine</title>
<script type="text/javascript">var theProject = { id : $projectID };</script> <script type="text/javascript">var theProject = { id : $projectID };</script>
<script type="text/javascript" src="wirings.js"></script> <script type="text/javascript" src="wirings.js"></script>
@ -15,7 +15,7 @@
<body> <body>
<div id="header"> <div id="header">
<a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a> <a id="logo" href="http://www.freebase.com/" title="Freebase"><img alt="Freebase" src="images/freebase-headerlogo.png" /></a>
<div id="path"><span class="app-path-section"><a href="./">Gridworks</a></span></div> <div id="path"><span class="app-path-section"><a href="./">Google Refine</a></span></div>
</div> </div>
<div id="body"> <div id="body">

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

@ -293,7 +293,7 @@ ClusteringDialog.prototype._apply = function(onDone) {
} }
if (edits.length > 0) { if (edits.length > 0) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"mass-edit", "mass-edit",
{}, {},
{ {

2
main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.js
View File

@ -36,7 +36,7 @@ ColumnReorderingDialog.prototype._dismiss = function() {
ColumnReorderingDialog.prototype._commit = function() { ColumnReorderingDialog.prototype._commit = function() {
var columnNames = this._elmts.columnContainer.find('div').map(function() { return this.getAttribute("column"); }).get(); var columnNames = this._elmts.columnContainer.find('div').map(function() { return this.getAttribute("column"); }).get();
Gridworks.postCoreProcess( Refine.postCoreProcess(
"reorder-columns", "reorder-columns",
null, null,
{ "columnNames" : JSON.stringify(columnNames) }, { "columnNames" : JSON.stringify(columnNames) },

2
main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.html
View File

@ -14,7 +14,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div id="expression-preview-tabs" class="gridworks-tabs"> <div id="expression-preview-tabs" class="refine-tabs">
<ul> <ul>
<li><a href="#expression-preview-tabs-preview">Preview</a></li> <li><a href="#expression-preview-tabs-preview">Preview</a></li>
<li><a href="#expression-preview-tabs-history">History</a></li> <li><a href="#expression-preview-tabs-history">History</a></li>

2
main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js
View File

@ -39,7 +39,7 @@ ExtendDataPreviewDialog.getAllProperties = function(typeID, onDone) {
var done = false; var done = false;
$.getJSON( $.getJSON(
Gridworks.gridworksHelperService + "/get_properties_of_type?type=" + typeID + "&callback=?", Refine.refineHelperService + "/get_properties_of_type?type=" + typeID + "&callback=?",
null, null,
function(data) { function(data) {
if (done) return; if (done) return;

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

@ -107,7 +107,7 @@ TemplatingExporterDialog.prototype._export = function() {
.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", "gridworks-export"); .attr("target", "refine-export");
var appendField = function(name, value) { var appendField = function(name, value) {
$('<textarea />') $('<textarea />')
@ -127,7 +127,7 @@ TemplatingExporterDialog.prototype._export = function() {
document.body.appendChild(form); document.body.appendChild(form);
window.open("about:blank", "gridworks-export"); window.open("about:blank", "refine-export");
form.submit(); form.submit();
document.body.removeChild(form); document.body.removeChild(form);

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

@ -495,7 +495,7 @@ ListFacet.prototype._editChoice = function(choice, choiceDiv) {
edit.from = [ originalContent ]; edit.from = [ originalContent ];
} }
Gridworks.postCoreProcess( Refine.postCoreProcess(
"mass-edit", "mass-edit",
{}, {},
{ {
@ -610,7 +610,7 @@ ListFacet.prototype._remove = function() {
}; };
ListFacet.prototype._updateRest = function() { ListFacet.prototype._updateRest = function() {
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
}; };
ListFacet.prototype._editExpression = function() { ListFacet.prototype._editExpression = function() {
@ -619,7 +619,7 @@ ListFacet.prototype._editExpression = function() {
("Edit Facet's Expression based on Column " + this._config.columnName) : ("Edit Facet's Expression based on Column " + this._config.columnName) :
"Edit Facet's Expression"; "Edit Facet's Expression";
var column = Gridworks.columnNameToColumn(this._config.columnName); var column = Refine.columnNameToColumn(this._config.columnName);
var o = DataTableView.sampleVisibleRows(column); var o = DataTableView.sampleVisibleRows(column);
new ExpressionPreviewDialog( new ExpressionPreviewDialog(

4
main/webapp/modules/core/scripts/facets/range-facet.js
View File

@ -332,7 +332,7 @@ RangeFacet.prototype._remove = function() {
}; };
RangeFacet.prototype._updateRest = function() { RangeFacet.prototype._updateRest = function() {
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
}; };
RangeFacet.prototype._editExpression = function() { RangeFacet.prototype._editExpression = function() {
@ -341,7 +341,7 @@ RangeFacet.prototype._editExpression = function() {
("Edit Facet's Expression based on Column " + this._config.columnName) : ("Edit Facet's Expression based on Column " + this._config.columnName) :
"Edit Facet's Expression"; "Edit Facet's Expression";
var column = Gridworks.columnNameToColumn(this._config.columnName); var column = Refine.columnNameToColumn(this._config.columnName);
var o = DataTableView.sampleVisibleRows(column); var o = DataTableView.sampleVisibleRows(column);
new ExpressionPreviewDialog( new ExpressionPreviewDialog(

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

@ -319,5 +319,5 @@ ScatterplotFacet.prototype._remove = function() {
}; };
ScatterplotFacet.prototype._updateRest = function() { ScatterplotFacet.prototype._updateRest = function() {
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
}; };

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

@ -130,5 +130,5 @@ TextSearchFacet.prototype._scheduleUpdate = function() {
}; };
TextSearchFacet.prototype._updateRest = function() { TextSearchFacet.prototype._updateRest = function() {
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
}; };

4
main/webapp/modules/core/scripts/facets/timerange-facet.js
View File

@ -359,7 +359,7 @@ TimeRangeFacet.prototype._remove = function() {
}; };
TimeRangeFacet.prototype._updateRest = function() { TimeRangeFacet.prototype._updateRest = function() {
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
}; };
TimeRangeFacet.prototype._editExpression = function() { TimeRangeFacet.prototype._editExpression = function() {
@ -368,7 +368,7 @@ TimeRangeFacet.prototype._editExpression = function() {
("Edit Facet's Expression based on Column " + this._config.columnName) : ("Edit Facet's Expression based on Column " + this._config.columnName) :
"Edit Facet's Expression"; "Edit Facet's Expression";
var column = Gridworks.columnNameToColumn(this._config.columnName); var column = Refine.columnNameToColumn(this._config.columnName);
var o = DataTableView.sampleVisibleRows(column); var o = DataTableView.sampleVisibleRows(column);
new ExpressionPreviewDialog( new ExpressionPreviewDialog(

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

@ -54,7 +54,7 @@ function formatDate(d) {
} }
function isThereNewRelease() { function isThereNewRelease() {
var thisRevision = GridworksVersion.revision; var thisRevision = GoogleRefineVersion.revision;
var revision_pattern = /r([0-9]+)/; var revision_pattern = /r([0-9]+)/;
@ -62,10 +62,10 @@ function isThereNewRelease() {
return false; return false;
} }
var latestRevision = GridworksReleases.releases[0].revision; var latestRevision = GoogleRefineReleases.releases[0].revision;
var thisRev = parseInt(revision_pattern.exec(thisRevision)[1],10); var thisRev = parseInt(revision_pattern.exec(thisRevision)[1],10);
var latestRev = parseInt(revision_pattern.exec(GridworksReleases.releases[0].revision)[1],10); var latestRev = parseInt(revision_pattern.exec(GoogleRefineReleases.releases[0].revision)[1],10);
return latestRev > thisRev; return latestRev > thisRev;
} }
@ -203,19 +203,19 @@ function onLoad() {
$("#more-options").show(); $("#more-options").show();
}); });
var version = (GridworksVersion.version != "$VERSION") ? "Version " + GridworksVersion.version + "-" + GridworksVersion.revision : ""; var version = (GoogleRefineVersion.version != "$VERSION") ? "Version " + GoogleRefineVersion.version + "-" + GoogleRefineVersion.revision : "";
$("#gridworks-version").text(version); $("#google-refine-version").text(version);
var script = $('<script></script>') var script = $('<script></script>')
.attr("src", "http://freebase-gridworks.googlecode.com/svn/support/releases.js") .attr("src", "http://google-refine.googlecode.com/svn/support/releases2.js")
.attr("type", "text/javascript") .attr("type", "text/javascript")
.appendTo(document.body); .appendTo(document.body);
var poll = function() { var poll = function() {
if ("GridworksReleases" in window) { if ("GoogleRefineReleases" in window) {
if (isThereNewRelease()) { if (isThereNewRelease()) {
$('<div id="version-message">' + $('<div id="version-message">' +
'New version "' + GridworksReleases.releases[0].description + '" <a href="' + GridworksReleases.homepage + '">available for download here</a>.' + 'New version "' + GoogleRefineReleases.releases[0].description + '" <a href="' + GoogleRefineReleases.homepage + '">available for download here</a>.' +
'</div>').appendTo(document.body); '</div>').appendTo(document.body);
} }
} else { } else {

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

@ -1,11 +1,11 @@
var theProject; var theProject;
var ui = {}; var ui = {};
var Gridworks = { var Refine = {
gridworksHelperService: "http://6.gridworks-helper.dfhuynh.user.dev.freebaseapps.com" refineHelperService: "http://6.gridworks-helper.dfhuynh.user.dev.freebaseapps.com"
}; };
Gridworks.reportException = function(e) { Refine.reportException = function(e) {
if (window.console) { if (window.console) {
console.log(e); console.log(e);
} }
@ -71,22 +71,22 @@ function initializeUI(uiState) {
$('<span class="app-path-section" id="project-name-in-path"></span>').appendTo(path); $('<span class="app-path-section" id="project-name-in-path"></span>').appendTo(path);
$('<a href="javascript:{}" class="permalink">permalink</a>') $('<a href="javascript:{}" class="permalink">permalink</a>')
.mouseenter(function() { .mouseenter(function() {
this.href = Gridworks.getPermanentLink(); this.href = Refine.getPermanentLink();
}).appendTo(path); }).appendTo(path);
Gridworks.setTitle(); Refine.setTitle();
var body = $("#body").empty().html( var body = $("#body").empty().html(
'<div bind="viewPanel" class="view-panel"></div>' + '<div bind="viewPanel" class="view-panel"></div>' +
'<div bind="processPanel" class="process-panel"></div>' + '<div bind="processPanel" class="process-panel"></div>' +
'<div bind="leftPanel" class="left-panel">' + '<div bind="leftPanel" class="left-panel">' +
'<div bind="leftPanelTabs" class="gridworks-tabs">' + '<div bind="leftPanelTabs" class="refine-tabs">' +
'<ul>' + '<ul>' +
'<li><a href="#gridworks-tabs-facets">Facet/Filter</a></li>' + '<li><a href="#refine-tabs-facets">Facet/Filter</a></li>' +
'<li><a href="#gridworks-tabs-history" bind="historyTabHeader">Undo/Redo</a></li>' + '<li><a href="#refine-tabs-history" bind="historyTabHeader">Undo/Redo</a></li>' +
'</ul>' + '</ul>' +
'<div id="gridworks-tabs-facets" bind="facetPanel" class="facet-panel"></div>' + '<div id="refine-tabs-facets" bind="facetPanel" class="facet-panel"></div>' +
'<div id="gridworks-tabs-history" bind="historyPanel" class="history-panel"></div>' + '<div id="refine-tabs-history" bind="historyPanel" class="history-panel"></div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'<div class="menu-bar-container" bind="menuBarContainer"><div bind="menuBarPanel" class="menu-bar"></div></div>' '<div class="menu-bar-container" bind="menuBarContainer"><div bind="menuBarPanel" class="menu-bar"></div></div>'
@ -116,11 +116,11 @@ function initializeUI(uiState) {
$(window).bind("resize", resizeAll); $(window).bind("resize", resizeAll);
if (uiState.facets) { if (uiState.facets) {
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
} }
} }
Gridworks.setTitle = function(status) { Refine.setTitle = function(status) {
var title = theProject.metadata.name + " - Gridworks"; var title = theProject.metadata.name + " - Gridworks";
if (status) { if (status) {
title = status + " - " + title; title = status + " - " + title;
@ -133,7 +133,7 @@ Gridworks.setTitle = function(status) {
$('<a href="#">' + theProject.metadata.name + '</a>').appendTo(name); $('<a href="#">' + theProject.metadata.name + '</a>').appendTo(name);
}; };
Gridworks.reinitializeProjectData = function(f) { Refine.reinitializeProjectData = function(f) {
Ajax.chainGetJSON( Ajax.chainGetJSON(
"/command/core/get-project-metadata?" + $.param({ project: theProject.id }), null, "/command/core/get-project-metadata?" + $.param({ project: theProject.id }), null,
function(data) { function(data) {
@ -155,7 +155,7 @@ Gridworks.reinitializeProjectData = function(f) {
* Utility state functions * Utility state functions
*/ */
Gridworks.createUpdateFunction = function(options, onFinallyDone) { Refine.createUpdateFunction = function(options, onFinallyDone) {
var functions = []; var functions = [];
var pushFunction = function(f) { var pushFunction = function(f) {
var index = functions.length; var index = functions.length;
@ -168,7 +168,7 @@ Gridworks.createUpdateFunction = function(options, onFinallyDone) {
ui.historyWidget.update(onDone); ui.historyWidget.update(onDone);
}); });
if (options.everythingChanged || options.modelsChanged || options.columnStatsChanged) { if (options.everythingChanged || options.modelsChanged || options.columnStatsChanged) {
pushFunction(Gridworks.reinitializeProjectData); pushFunction(Refine.reinitializeProjectData);
} }
if (options.everythingChanged || options.modelsChanged || options.rowsChanged || options.rowMetadataChanged || options.cellsChanged || options.engineChanged) { if (options.everythingChanged || options.modelsChanged || options.rowsChanged || options.rowMetadataChanged || options.cellsChanged || options.engineChanged) {
pushFunction(function(onDone) { pushFunction(function(onDone) {
@ -184,14 +184,14 @@ Gridworks.createUpdateFunction = function(options, onFinallyDone) {
return functions[0]; return functions[0];
}; };
Gridworks.update = function(options, onFinallyDone) { Refine.update = function(options, onFinallyDone) {
var done = false; var done = false;
var dismissBusy = null; var dismissBusy = null;
Gridworks.setAjaxInProgress(); Refine.setAjaxInProgress();
Gridworks.createUpdateFunction(options, function() { Refine.createUpdateFunction(options, function() {
Gridworks.clearAjaxInProgress(); Refine.clearAjaxInProgress();
done = true; done = true;
if (dismissBusy) { if (dismissBusy) {
@ -209,11 +209,11 @@ Gridworks.update = function(options, onFinallyDone) {
}, 500); }, 500);
}; };
Gridworks.postCoreProcess = function(command, params, body, updateOptions, callbacks) { Refine.postCoreProcess = function(command, params, body, updateOptions, callbacks) {
Gridworks.postProcess("core", command, params, body, updateOptions, callbacks); Refine.postProcess("core", command, params, body, updateOptions, callbacks);
}; };
Gridworks.postProcess = function(moduleName, command, params, body, updateOptions, callbacks) { Refine.postProcess = function(moduleName, command, params, body, updateOptions, callbacks) {
updateOptions = updateOptions || {}; updateOptions = updateOptions || {};
callbacks = callbacks || {}; callbacks = callbacks || {};
@ -238,14 +238,14 @@ Gridworks.postProcess = function(moduleName, command, params, body, updateOption
dismissBusy(); dismissBusy();
} }
Gridworks.clearAjaxInProgress(); Refine.clearAjaxInProgress();
if (o.code == "error") { if (o.code == "error") {
if ("onError" in callbacks) { if ("onError" in callbacks) {
try { try {
callbacks.onError(o); callbacks.onError(o);
} catch (e) { } catch (e) {
Gridworks.reportException(e); Refine.reportException(e);
} }
} else { } else {
alert(o.message); alert(o.message);
@ -255,12 +255,12 @@ Gridworks.postProcess = function(moduleName, command, params, body, updateOption
try { try {
callbacks.onDone(o); callbacks.onDone(o);
} catch (e) { } catch (e) {
Gridworks.reportException(e); Refine.reportException(e);
} }
} }
if (o.code == "ok") { if (o.code == "ok") {
Gridworks.update(updateOptions, callbacks.onFinallyDone); Refine.update(updateOptions, callbacks.onFinallyDone);
if ("historyEntry" in o) { if ("historyEntry" in o) {
ui.processWidget.showUndo(o.historyEntry); ui.processWidget.showUndo(o.historyEntry);
@ -270,7 +270,7 @@ Gridworks.postProcess = function(moduleName, command, params, body, updateOption
try { try {
callbacks.onPending(o); callbacks.onPending(o);
} catch (e) { } catch (e) {
Gridworks.reportException(e); Refine.reportException(e);
} }
} }
ui.processWidget.update(updateOptions, callbacks.onFinallyDone); ui.processWidget.update(updateOptions, callbacks.onFinallyDone);
@ -278,7 +278,7 @@ Gridworks.postProcess = function(moduleName, command, params, body, updateOption
} }
} }
Gridworks.setAjaxInProgress(); Refine.setAjaxInProgress();
$.post( $.post(
"/command/" + moduleName + "/" + command + "?" + $.param(params), "/command/" + moduleName + "/" + command + "?" + $.param(params),
@ -294,11 +294,11 @@ Gridworks.postProcess = function(moduleName, command, params, body, updateOption
}, 500); }, 500);
}; };
Gridworks.setAjaxInProgress = function() { Refine.setAjaxInProgress = function() {
$(document.body).attr("ajax_in_progress", "true"); $(document.body).attr("ajax_in_progress", "true");
}; };
Gridworks.clearAjaxInProgress = function() { Refine.clearAjaxInProgress = function() {
$(document.body).attr("ajax_in_progress", "false"); $(document.body).attr("ajax_in_progress", "false");
}; };
@ -306,7 +306,7 @@ Gridworks.clearAjaxInProgress = function() {
* Utility model functions * Utility model functions
*/ */
Gridworks.cellIndexToColumn = function(cellIndex) { Refine.cellIndexToColumn = function(cellIndex) {
var columns = theProject.columnModel.columns; var columns = theProject.columnModel.columns;
for (var i = 0; i < columns.length; i++) { for (var i = 0; i < columns.length; i++) {
var column = columns[i]; var column = columns[i];
@ -316,7 +316,7 @@ Gridworks.cellIndexToColumn = function(cellIndex) {
} }
return null; return null;
}; };
Gridworks.columnNameToColumn = function(columnName) { Refine.columnNameToColumn = function(columnName) {
var columns = theProject.columnModel.columns; var columns = theProject.columnModel.columns;
for (var i = 0; i < columns.length; i++) { for (var i = 0; i < columns.length; i++) {
var column = columns[i]; var column = columns[i];
@ -326,7 +326,7 @@ Gridworks.columnNameToColumn = function(columnName) {
} }
return null; return null;
}; };
Gridworks.columnNameToColumnIndex = function(columnName) { Refine.columnNameToColumnIndex = function(columnName) {
var columns = theProject.columnModel.columns; var columns = theProject.columnModel.columns;
for (var i = 0; i < columns.length; i++) { for (var i = 0; i < columns.length; i++) {
var column = columns[i]; var column = columns[i];
@ -337,7 +337,7 @@ Gridworks.columnNameToColumnIndex = function(columnName) {
return -1; return -1;
}; };
Gridworks.preparePool = function(pool) { Refine.preparePool = function(pool) {
for (var id in pool.recons) { for (var id in pool.recons) {
if (pool.recons.hasOwnProperty(id)) { if (pool.recons.hasOwnProperty(id)) {
var recon = pool.recons[id]; var recon = pool.recons[id];
@ -353,7 +353,7 @@ Gridworks.preparePool = function(pool) {
} }
}; };
Gridworks.fetchRows = function(start, limit, onDone, sorting) { Refine.fetchRows = function(start, limit, onDone, sorting) {
var body = { var body = {
engine: JSON.stringify(ui.browsingEngine.getJSON()) engine: JSON.stringify(ui.browsingEngine.getJSON())
}; };
@ -368,7 +368,7 @@ Gridworks.fetchRows = function(start, limit, onDone, sorting) {
theProject.rowModel = data; theProject.rowModel = data;
// Un-pool objects // Un-pool objects
Gridworks.preparePool(data.pool); Refine.preparePool(data.pool);
for (var r = 0; r < data.rows.length; r++) { for (var r = 0; r < data.rows.length; r++) {
var row = data.rows[r]; var row = data.rows[r];
for (var c = 0; c < row.cells.length; c++) { for (var c = 0; c < row.cells.length; c++) {
@ -387,7 +387,7 @@ Gridworks.fetchRows = function(start, limit, onDone, sorting) {
); );
}; };
Gridworks.getPermanentLink = function() { Refine.getPermanentLink = function() {
var params = [ var params = [
"project=" + escape(theProject.id), "project=" + escape(theProject.id),
"ui=" + escape(JSON.stringify({ "ui=" + escape(JSON.stringify({
@ -412,7 +412,7 @@ function onLoad() {
} }
} }
Gridworks.reinitializeProjectData(function() { Refine.reinitializeProjectData(function() {
initializeUI(uiState); initializeUI(uiState);
}); });
} }

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

@ -107,7 +107,7 @@ BrowsingEngine.prototype._initializeUI = function() {
this._elmts.modeSelectors.buttonset(); this._elmts.modeSelectors.buttonset();
this._elmts.modeSelectors.find("input").change(function() { this._elmts.modeSelectors.find("input").change(function() {
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
}); });
this._elmts.refreshLink.click(function() { self.update(); }); this._elmts.refreshLink.click(function() { self.update(); });
@ -170,7 +170,7 @@ BrowsingEngine.prototype.addFacet = function(type, config, options) {
this._facets.push({ elmt: elmt, facet: facet }); this._facets.push({ elmt: elmt, facet: facet });
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
}; };
BrowsingEngine.prototype._createFacetContainer = function() { BrowsingEngine.prototype._createFacetContainer = function() {
@ -205,7 +205,7 @@ BrowsingEngine.prototype.removeFacet = function(facet) {
} }
if (update) { if (update) {
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
} }
}; };
@ -251,7 +251,7 @@ BrowsingEngine.prototype.reset = function() {
this._facets[i].facet.reset(); this._facets[i].facet.reset();
} }
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
}; };
BrowsingEngine.prototype.remove = function() { BrowsingEngine.prototype.remove = function() {
@ -270,5 +270,5 @@ BrowsingEngine.prototype.remove = function() {
} }
}, 300); }, 300);
Gridworks.update({ engineChanged: true }); Refine.update({ engineChanged: true });
}; };

14
main/webapp/modules/core/scripts/project/menu-bar.js
View File

@ -253,7 +253,7 @@ MenuBar.handlers.exportRows = function(format, ext) {
.css("display", "none") .css("display", "none")
.attr("method", "post") .attr("method", "post")
.attr("action", "/command/core/export-rows/" + name + "." + ext) .attr("action", "/command/core/export-rows/" + name + "." + ext)
.attr("target", "gridworks-export"); .attr("target", "refine-export");
$('<input />') $('<input />')
.attr("name", "engine") .attr("name", "engine")
@ -270,7 +270,7 @@ MenuBar.handlers.exportRows = function(format, ext) {
document.body.appendChild(form); document.body.appendChild(form);
window.open("about:blank", "gridworks-export"); window.open("about:blank", "refine-export");
form.submit(); form.submit();
document.body.removeChild(form); document.body.removeChild(form);
@ -282,8 +282,8 @@ MenuBar.handlers.exportProject = function() {
$(form) $(form)
.css("display", "none") .css("display", "none")
.attr("method", "post") .attr("method", "post")
.attr("action", "/command/core/export-project/" + name + ".gridworks.tar.gz") .attr("action", "/command/core/export-project/" + name + ".google-refine.tar.gz")
.attr("target", "gridworks-export"); .attr("target", "refine-export");
$('<input />') $('<input />')
.attr("name", "project") .attr("name", "project")
.attr("value", theProject.id) .attr("value", theProject.id)
@ -291,7 +291,7 @@ MenuBar.handlers.exportProject = function() {
document.body.appendChild(form); document.body.appendChild(form);
window.open("about:blank", "gridworks-export"); window.open("about:blank", "refine-export");
form.submit(); form.submit();
document.body.removeChild(form); document.body.removeChild(form);
@ -316,7 +316,7 @@ MenuBar.handlers.renameProject = function() {
success: function (data) { success: function (data) {
if (data && typeof data.code != 'undefined' && data.code == "ok") { if (data && typeof data.code != 'undefined' && data.code == "ok") {
theProject.metadata.name = name; theProject.metadata.name = name;
Gridworks.setTitle(); Refine.setTitle();
} else { } else {
alert("Failed to rename project: " + data.message); alert("Failed to rename project: " + data.message);
} }
@ -380,7 +380,7 @@ MenuBar.handlers.browseToDataLoad = function() {
}; };
MenuBar.handlers.importQAData = function() { MenuBar.handlers.importQAData = function() {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"import-qa-data", "import-qa-data",
{}, {},
{}, {},

2
main/webapp/modules/core/scripts/protograph/schema-alignment-ui-link.js
View File

@ -143,7 +143,7 @@ SchemaAlignmentDialog.UILink._getPropertiesOfType = function(typeID, targetTypeI
} }
$.getJSON( $.getJSON(
Gridworks.gridworksHelperService + "/get_properties_of_type?" + $.param(params) + "&callback=?", Refine.refineHelperService + "/get_properties_of_type?" + $.param(params) + "&callback=?",
null, null,
function(data) { function(data) {
if (done) return; if (done) return;

4
main/webapp/modules/core/scripts/protograph/schema-alignment.js
View File

@ -169,7 +169,7 @@ SchemaAlignmentDialog.prototype._constructFooter = function(footer) {
$('<button></button>').html("&nbsp;&nbsp;OK&nbsp;&nbsp;").click(function() { $('<button></button>').html("&nbsp;&nbsp;OK&nbsp;&nbsp;").click(function() {
var protograph = self.getJSON(); var protograph = self.getJSON();
Gridworks.postCoreProcess( Refine.postCoreProcess(
"save-protograph", "save-protograph",
{}, {},
{ protograph: JSON.stringify(protograph) }, { protograph: JSON.stringify(protograph) },
@ -198,7 +198,7 @@ SchemaAlignmentDialog.prototype._constructBody = function(body) {
'</p>').appendTo(body); '</p>').appendTo(body);
$( $(
'<div id="schema-alignment-tabs" class="gridworks-tabs">' + '<div id="schema-alignment-tabs" class="refine-tabs">' +
'<ul>' + '<ul>' +
'<li><a href="#schema-alignment-tabs-protograph">Skeleton</a></li>' + '<li><a href="#schema-alignment-tabs-protograph">Skeleton</a></li>' +
'<li><a href="#schema-alignment-tabs-preview-mqllike">MQL-like Preview</a></li>' + '<li><a href="#schema-alignment-tabs-preview-mqllike">MQL-like Preview</a></li>' +

2
main/webapp/modules/core/scripts/reconciliation/freebase-query-panel.js
View File

@ -91,7 +91,7 @@ ReconFreebaseQueryPanel.prototype.start = function() {
}; };
} }
Gridworks.postCoreProcess( Refine.postCoreProcess(
"reconcile", "reconcile",
{}, {},
bodyParams, bodyParams,

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

@ -271,7 +271,7 @@ ReconStandardServicePanel.prototype.start = function() {
} }
); );
Gridworks.postCoreProcess( Refine.postCoreProcess(
"reconcile", "reconcile",
{}, {},
{ {

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

@ -55,7 +55,7 @@
true, true,
{}, {},
$.suggest.suggest.defaults, { $.suggest.suggest.defaults, {
service_url: Gridworks.gridworksHelperService, service_url: Refine.refineHelperService,
service_path: "/suggest_property", service_path: "/suggest_property",
flyout_service_url: "http://www.freebase.com", flyout_service_url: "http://www.freebase.com",
css: { pane: "fbs-pane fbs-pane-property" } css: { pane: "fbs-pane fbs-pane-property" }

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

@ -44,7 +44,7 @@ DialogSystem.dismissUntil = function(level) {
try { try {
layer.onCancel(); layer.onCancel();
} catch (e) { } catch (e) {
Gridworks.reportException(e); Refine.reportException(e);
} }
} }
} }

4
main/webapp/modules/core/scripts/version.js
View File

@ -1,5 +1,5 @@
var GridworksVersion = { var GoogleRefineVersion = {
description: "Gridworks $VERSION", description: "Google Refine $VERSION",
version: "$VERSION", version: "$VERSION",
revision: "$REVISION" revision: "$REVISION"
}; };

18
main/webapp/modules/core/scripts/views/data-table/cell-ui.js
View File

@ -240,7 +240,7 @@ DataTableCellUI.prototype._doJudgmentForSimilarCells = function(judgment, params
"recon-judge-similar-cells", "recon-judge-similar-cells",
params || {}, params || {},
$.extend(bodyParams || {}, { $.extend(bodyParams || {}, {
columnName: Gridworks.cellIndexToColumn(this._cellIndex).name, columnName: Refine.cellIndexToColumn(this._cellIndex).name,
similarValue: this._cell.v, similarValue: this._cell.v,
judgment: judgment, judgment: judgment,
identifierSpace: (this._cell.r) ? this._cell.r.identifierSpace : null, identifierSpace: (this._cell.r) ? this._cell.r.identifierSpace : null,
@ -270,7 +270,7 @@ DataTableCellUI.prototype._searchForMatch = function(suggestOptions) {
if (elmts.checkSimilar[0].checked) { if (elmts.checkSimilar[0].checked) {
params.similarValue = self._cell.v; params.similarValue = self._cell.v;
params.columnName = Gridworks.cellIndexToColumn(self._cellIndex).name; params.columnName = Refine.cellIndexToColumn(self._cellIndex).name;
self._postProcessSeveralCells("recon-judge-similar-cells", {}, params, true); self._postProcessSeveralCells("recon-judge-similar-cells", {}, params, true);
} else { } else {
@ -303,14 +303,14 @@ DataTableCellUI.prototype._searchForMatch = function(suggestOptions) {
DataTableCellUI.prototype._postProcessOneCell = function(command, params, bodyParams, columnStatsChanged) { DataTableCellUI.prototype._postProcessOneCell = function(command, params, bodyParams, columnStatsChanged) {
var self = this; var self = this;
Gridworks.postCoreProcess( Refine.postCoreProcess(
command, command,
params, params,
bodyParams, bodyParams,
{ columnStatsChanged: columnStatsChanged }, { columnStatsChanged: columnStatsChanged },
{ {
onDone: function(o) { onDone: function(o) {
Gridworks.preparePool(o.pool); Refine.preparePool(o.pool);
if (o.cell.r) { if (o.cell.r) {
o.cell.r = o.pool.recons[o.cell.r]; o.cell.r = o.pool.recons[o.cell.r];
} }
@ -324,7 +324,7 @@ DataTableCellUI.prototype._postProcessOneCell = function(command, params, bodyPa
}; };
DataTableCellUI.prototype._postProcessSeveralCells = function(command, params, bodyParams, columnStatsChanged) { DataTableCellUI.prototype._postProcessSeveralCells = function(command, params, bodyParams, columnStatsChanged) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
command, command,
params, params,
bodyParams, bodyParams,
@ -410,11 +410,11 @@ DataTableCellUI.prototype._startEdit = function(elmt) {
MenuSystem.dismissAll(); MenuSystem.dismissAll();
if (applyOthers) { if (applyOthers) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"mass-edit", "mass-edit",
{}, {},
{ {
columnName: Gridworks.cellIndexToColumn(self._cellIndex).name, columnName: Refine.cellIndexToColumn(self._cellIndex).name,
expression: "value", expression: "value",
edits: JSON.stringify([{ edits: JSON.stringify([{
from: [ originalContent ], from: [ originalContent ],
@ -425,7 +425,7 @@ DataTableCellUI.prototype._startEdit = function(elmt) {
{ cellsChanged: true } { cellsChanged: true }
); );
} else { } else {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"edit-one-cell", "edit-one-cell",
{ {
row: self._rowIndex, row: self._rowIndex,
@ -437,7 +437,7 @@ DataTableCellUI.prototype._startEdit = function(elmt) {
{}, {},
{ {
onDone: function(o) { onDone: function(o) {
Gridworks.preparePool(o.pool); Refine.preparePool(o.pool);
if (o.cell.r) { if (o.cell.r) {
o.cell.r = o.pool.recons[o.cell.r]; o.cell.r = o.pool.recons[o.cell.r];
} }

18
main/webapp/modules/core/scripts/views/data-table/data-table-view.js
View File

@ -280,7 +280,7 @@ DataTableView.prototype._renderDataTable = function(table) {
.click(function() { .click(function() {
var newStarred = !row.starred; var newStarred = !row.starred;
Gridworks.postCoreProcess( Refine.postCoreProcess(
"annotate-one-row", "annotate-one-row",
{ row: row.i, starred: newStarred }, { row: row.i, starred: newStarred },
null, null,
@ -301,7 +301,7 @@ DataTableView.prototype._renderDataTable = function(table) {
.click(function() { .click(function() {
var newFlagged = !row.flagged; var newFlagged = !row.flagged;
Gridworks.postCoreProcess( Refine.postCoreProcess(
"annotate-one-row", "annotate-one-row",
{ row: row.i, flagged: newFlagged }, { row: row.i, flagged: newFlagged },
null, null,
@ -354,7 +354,7 @@ DataTableView.prototype._renderDataTable = function(table) {
DataTableView.prototype._showRows = function(start, onDone) { DataTableView.prototype._showRows = function(start, onDone) {
var self = this; var self = this;
Gridworks.fetchRows(start, this._pageSize, function() { Refine.fetchRows(start, this._pageSize, function() {
self.render(); self.render();
if (onDone) { if (onDone) {
@ -471,33 +471,33 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
{ {
label: "Star Rows", label: "Star Rows",
click: function() { click: function() {
Gridworks.postCoreProcess("annotate-rows", { "starred" : "true" }, null, { rowMetadataChanged: true }); Refine.postCoreProcess("annotate-rows", { "starred" : "true" }, null, { rowMetadataChanged: true });
} }
}, },
{ {
label: "Unstar Rows", label: "Unstar Rows",
click: function() { click: function() {
Gridworks.postCoreProcess("annotate-rows", { "starred" : "false" }, null, { rowMetadataChanged: true }); Refine.postCoreProcess("annotate-rows", { "starred" : "false" }, null, { rowMetadataChanged: true });
} }
}, },
{}, {},
{ {
label: "Flag Rows", label: "Flag Rows",
click: function() { click: function() {
Gridworks.postCoreProcess("annotate-rows", { "flagged" : "true" }, null, { rowMetadataChanged: true }); Refine.postCoreProcess("annotate-rows", { "flagged" : "true" }, null, { rowMetadataChanged: true });
} }
}, },
{ {
label: "Unflag Rows", label: "Unflag Rows",
click: function() { click: function() {
Gridworks.postCoreProcess("annotate-rows", { "flagged" : "false" }, null, { rowMetadataChanged: true }); Refine.postCoreProcess("annotate-rows", { "flagged" : "false" }, null, { rowMetadataChanged: true });
} }
}, },
{}, {},
{ {
label: "Remove All Matching Rows", label: "Remove All Matching Rows",
click: function() { click: function() {
Gridworks.postCoreProcess("remove-rows", {}, null, { rowMetadataChanged: true }); Refine.postCoreProcess("remove-rows", {}, null, { rowMetadataChanged: true });
} }
} }
] ]
@ -548,7 +548,7 @@ DataTableView.prototype._createSortingMenu = function(elmt) {
{ {
"label" : "Reorder Rows Permanently", "label" : "Reorder Rows Permanently",
"click" : function() { "click" : function() {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"reorder-rows", "reorder-rows",
null, null,
{ "sorting" : JSON.stringify(self._sorting) }, { "sorting" : JSON.stringify(self._sorting) },

14
main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js
View File

@ -1,6 +1,6 @@
DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var doTextTransform = function(expression, onError, repeat, repeatCount) { var doTextTransform = function(expression, onError, repeat, repeatCount) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"text-transform", "text-transform",
{ {
columnName: column.name, columnName: column.name,
@ -54,7 +54,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doFillDown = function() { var doFillDown = function() {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"fill-down", "fill-down",
{ {
columnName: column.name columnName: column.name
@ -65,7 +65,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doBlankDown = function() { var doBlankDown = function() {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"blank-down", "blank-down",
{ {
columnName: column.name columnName: column.name
@ -78,7 +78,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var doJoinMultiValueCells = function() { var doJoinMultiValueCells = function() {
var separator = window.prompt("Enter separator to use between values", ", "); var separator = window.prompt("Enter separator to use between values", ", ");
if (separator !== null) { if (separator !== null) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"join-multi-value-cells", "join-multi-value-cells",
{ {
columnName: column.name, columnName: column.name,
@ -94,7 +94,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var doSplitMultiValueCells = function() { var doSplitMultiValueCells = function() {
var separator = window.prompt("What separator currently separates the values?", ","); var separator = window.prompt("What separator currently separates the values?", ",");
if (separator !== null) { if (separator !== null) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"split-multi-value-cells", "split-multi-value-cells",
{ {
columnName: column.name, columnName: column.name,
@ -194,7 +194,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
ignoreBlankCells: elmts.ignoreBlankCellsCheckbox[0].checked ignoreBlankCells: elmts.ignoreBlankCellsCheckbox[0].checked
}; };
Gridworks.postCoreProcess( Refine.postCoreProcess(
"transpose-columns-into-rows", "transpose-columns-into-rows",
config, config,
null, null,
@ -254,7 +254,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
rowCount: rowCount rowCount: rowCount
}; };
Gridworks.postCoreProcess( Refine.postCoreProcess(
"transpose-rows-into-columns", "transpose-rows-into-columns",
config, config,
null, null,

20
main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js
View File

@ -1,5 +1,5 @@
DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var columnIndex = Gridworks.columnNameToColumnIndex(column.name); var columnIndex = Refine.columnNameToColumnIndex(column.name);
var doAddColumn = function() { var doAddColumn = function() {
var frame = $( var frame = $(
DOM.loadHTML("core", "scripts/views/data-table/add-column-dialog.html") DOM.loadHTML("core", "scripts/views/data-table/add-column-dialog.html")
@ -19,7 +19,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
return; return;
} }
Gridworks.postCoreProcess( Refine.postCoreProcess(
"add-column", "add-column",
{ {
baseColumnName: column.name, baseColumnName: column.name,
@ -63,7 +63,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
return; return;
} }
Gridworks.postCoreProcess( Refine.postCoreProcess(
"add-column-by-fetching-urls", "add-column-by-fetching-urls",
{ {
baseColumnName: column.name, baseColumnName: column.name,
@ -96,7 +96,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
columnIndex, columnIndex,
o.rowIndices, o.rowIndices,
function(extension) { function(extension) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"extend-data", "extend-data",
{ {
baseColumnName: column.name, baseColumnName: column.name,
@ -112,7 +112,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doRemoveColumn = function() { var doRemoveColumn = function() {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"remove-column", "remove-column",
{ {
columnName: column.name columnName: column.name
@ -125,7 +125,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var doRenameColumn = function() { var doRenameColumn = function() {
var newColumnName = window.prompt("Enter new column name", column.name); var newColumnName = window.prompt("Enter new column name", column.name);
if (newColumnName !== null) { if (newColumnName !== null) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"rename-column", "rename-column",
{ {
oldColumnName: column.name, oldColumnName: column.name,
@ -138,7 +138,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doMoveColumnTo = function(index) { var doMoveColumnTo = function(index) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"move-column", "move-column",
{ {
columnName: column.name, columnName: column.name,
@ -150,11 +150,11 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doMoveColumnBy = function(change) { var doMoveColumnBy = function(change) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"move-column", "move-column",
{ {
columnName: column.name, columnName: column.name,
index: Gridworks.columnNameToColumnIndex(column.name) + change index: Refine.columnNameToColumnIndex(column.name) + change
}, },
null, null,
{ modelsChanged: true } { modelsChanged: true }
@ -214,7 +214,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
config.fieldLengths = JSON.stringify(lengths); config.fieldLengths = JSON.stringify(lengths);
} }
Gridworks.postCoreProcess( Refine.postCoreProcess(
"split-column", "split-column",
config, config,
null, null,

8
main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js
View File

@ -4,7 +4,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doReconDiscardJudgments = function() { var doReconDiscardJudgments = function() {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"recon-discard-judgments", "recon-discard-judgments",
{ columnName: column.name }, { columnName: column.name },
null, null,
@ -13,7 +13,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doReconMatchBestCandidates = function() { var doReconMatchBestCandidates = function() {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"recon-match-best-candidates", "recon-match-best-candidates",
{ columnName: column.name }, { columnName: column.name },
null, null,
@ -22,7 +22,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doReconMarkNewTopics = function(shareNewTopics) { var doReconMarkNewTopics = function(shareNewTopics) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"recon-mark-new-topics", "recon-mark-new-topics",
{ columnName: column.name, shareNewTopics: shareNewTopics }, { columnName: column.name, shareNewTopics: shareNewTopics },
null, null,
@ -56,7 +56,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
function(o) { function(o) {
var types = "result" in o ? o.result.type : []; var types = "result" in o ? o.result.type : [];
Gridworks.postCoreProcess( Refine.postCoreProcess(
"recon-match-specific-topic-to-cells", "recon-match-specific-topic-to-cells",
{ {
columnName: column.name, columnName: column.name,

8
main/webapp/modules/core/scripts/widgets/history-widget.js
View File

@ -39,7 +39,7 @@ HistoryWidget.prototype._render = function() {
'<div class="history-panel-help" bind="helpDiv">' + '<div class="history-panel-help" bind="helpDiv">' +
'<h1>Don\'t worry ...</h1>' + '<h1>Don\'t worry ...</h1>' +
'<p>about making mistakes. Every change you make will be shown here, and you can undo changes at any point.</p>' + '<p>about making mistakes. Every change you make will be shown here, and you can undo changes at any point.</p>' +
'<p><a href="http://wiki.freebase.com/index.php?title=Gridworks" target="_blank">Learn more &raquo;</a></p>' + '<p><a href="http://code.google.com/p/google-refine/wiki/GettingStarted?tm=6" target="_blank">Learn more &raquo;</a></p>' +
'</div>' + '</div>' +
'<div class="history-panel-body" bind="bodyDiv">' + '<div class="history-panel-body" bind="bodyDiv">' +
'<div class="history-past" bind="pastDiv"></div>' + '<div class="history-past" bind="pastDiv"></div>' +
@ -100,7 +100,7 @@ HistoryWidget.prototype._render = function() {
HistoryWidget.prototype._onClickHistoryEntry = function(evt, entry, lastDoneID) { HistoryWidget.prototype._onClickHistoryEntry = function(evt, entry, lastDoneID) {
var self = this; var self = this;
Gridworks.postCoreProcess( Refine.postCoreProcess(
"undo-redo", "undo-redo",
{ lastDoneID: lastDoneID }, { lastDoneID: lastDoneID },
null, null,
@ -218,7 +218,7 @@ HistoryWidget.prototype._showApplyOperationsDialog = function() {
return; return;
} }
Gridworks.postCoreProcess( Refine.postCoreProcess(
"apply-operations", "apply-operations",
{}, {},
{ operations: JSON.stringify(json) }, { operations: JSON.stringify(json) },
@ -227,7 +227,7 @@ HistoryWidget.prototype._showApplyOperationsDialog = function() {
onDone: function(o) { onDone: function(o) {
if (o.code == "pending") { if (o.code == "pending") {
// Something might have already been done and so it's good to update // Something might have already been done and so it's good to update
Gridworks.update({ everythingChanged: true }); Refine.update({ everythingChanged: true });
} }
} }
} }

10
main/webapp/modules/core/scripts/widgets/process-widget.js
View File

@ -72,7 +72,7 @@ ProcessWidget.prototype.showUndo = function(historyEntry) {
ProcessWidget.prototype.undo = function() { ProcessWidget.prototype.undo = function() {
if (this._latestHistoryEntry !== null) { if (this._latestHistoryEntry !== null) {
Gridworks.postCoreProcess( Refine.postCoreProcess(
"undo-redo", "undo-redo",
{ undoID: this._latestHistoryEntry.id }, { undoID: this._latestHistoryEntry.id },
null, null,
@ -101,7 +101,7 @@ ProcessWidget.prototype._render = function(newData) {
this._div.stop(true, false).empty(); this._div.stop(true, false).empty();
if (!newData.processes.length) { if (!newData.processes.length) {
Gridworks.setTitle(); Refine.setTitle();
this._div.hide(); this._div.hide();
} else { } else {
this._div.show(); this._div.show();
@ -130,7 +130,7 @@ ProcessWidget.prototype._render = function(newData) {
if (process.status == "pending") { if (process.status == "pending") {
div.text(process.description + " (pending)"); div.text(process.description + " (pending)");
} else { } else {
Gridworks.setTitle(process.progress + "%"); Refine.setTitle(process.progress + "%");
div.text(process.description + " (" + process.progress + "%)"); div.text(process.description + " (" + process.progress + "%)");
} }
}; };
@ -190,12 +190,12 @@ ProcessWidget.prototype._runOnDones = function() {
this._updateOptions = {}; this._updateOptions = {};
this._onDones = []; this._onDones = [];
Gridworks.update(updateOptions, function() { Refine.update(updateOptions, function() {
for (var i = 0; i < onDones.length; i++) { for (var i = 0; i < onDones.length; i++) {
try { try {
onDones[i](); onDones[i]();
} catch (e) { } catch (e) {
Gridworks.reportException(e); Refine.reportException(e);
} }
} }
}); });

4
main/webapp/modules/core/styles/index.css
View File

@ -1,6 +1,6 @@
body { body {
background-color: #f4f7fa; background-color: #f4f7fa;
background-image: url('../images/gridworks-watermark.png'); background-image: url('../images/google-refine-watermark.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: left top; background-position: left top;
} }
@ -12,7 +12,7 @@ body {
vertical-align: top; vertical-align: top;
} }
#gridworks-version { #google-refine-version {
float: right; float: right;
color: #aaa; color: #aaa;
margin: 5px; margin: 5px;

36
main/webapp/modules/core/styles/jquery-ui-overrides.css
View File

@ -1,54 +1,54 @@
.gridworks-tabs.ui-tabs { .refine-tabs.ui-tabs {
padding: 0; padding: 0;
} }
.gridworks-tabs.ui-corner-all { .refine-tabs.ui-corner-all {
} }
.gridworks-tabs.ui-widget-content { .refine-tabs.ui-widget-content {
border: none; border: none;
background: none; background: none;
color: inherit; color: inherit;
} }
.gridworks-tabs.ui-tabs .ui-tabs-nav { .refine-tabs.ui-tabs .ui-tabs-nav {
padding: 0; padding: 0;
} }
.gridworks-tabs.ui-tabs .ui-widget-header { .refine-tabs.ui-tabs .ui-widget-header {
background: none; background: none;
border: none; border: none;
} }
.gridworks-tabs.ui-tabs .ui-tabs-nav li a { .refine-tabs.ui-tabs .ui-tabs-nav li a {
padding: 4px 10px; padding: 4px 10px;
} }
.gridworks-tabs.ui-tabs .ui-tabs-nav li a span.count { .refine-tabs.ui-tabs .ui-tabs-nav li a span.count {
color: #666; color: #666;
font-weight: normal; font-weight: normal;
font-size: 80%; font-size: 80%;
} }
.gridworks-tabs.ui-tabs .ui-tabs-nav .ui-state-default, .refine-tabs.ui-tabs .ui-tabs-nav .ui-state-default,
.gridworks-tabs.ui-tabs .ui-tabs-nav .ui-widget-content .ui-state-default { .refine-tabs.ui-tabs .ui-tabs-nav .ui-widget-content .ui-state-default {
background: #C5D1D4; background: #C5D1D4;
} }
.gridworks-tabs.ui-tabs .ui-tabs-nav .ui-state-default a, .refine-tabs.ui-tabs .ui-tabs-nav .ui-state-default a,
.gridworks-tabs.ui-tabs .ui-tabs-nav .ui-state-default a:link, .refine-tabs.ui-tabs .ui-tabs-nav .ui-state-default a:link,
.gridworks-tabs.ui-tabs .ui-tabs-nav .ui-state-default a:visited { .refine-tabs.ui-tabs .ui-tabs-nav .ui-state-default a:visited {
color: black; color: black;
} }
.gridworks-tabs.ui-tabs .ui-tabs-nav .ui-state-active, .refine-tabs.ui-tabs .ui-tabs-nav .ui-state-active,
.gridworks-tabs.ui-tabs .ui-tabs-nav .ui-widget-content .ui-state-active { .refine-tabs.ui-tabs .ui-tabs-nav .ui-widget-content .ui-state-active {
background: #DBE8EB; background: #DBE8EB;
border: none; border: none;
color: black; color: black;
} }
.gridworks-tabs.ui-tabs .ui-tabs-nav .ui-state-active a, .refine-tabs.ui-tabs .ui-tabs-nav .ui-state-active a,
.gridworks-tabs.ui-tabs .ui-tabs-nav .ui-state-active a:link, .refine-tabs.ui-tabs .ui-tabs-nav .ui-state-active a:link,
.gridworks-tabs.ui-tabs .ui-tabs-nav .ui-state-active a:visited { .refine-tabs.ui-tabs .ui-tabs-nav .ui-state-active a:visited {
color: black; color: black;
} }
.gridworks-tabs.ui-tabs .ui-tabs-panel { .refine-tabs.ui-tabs .ui-tabs-panel {
margin: 0px; margin: 0px;
padding: 15px; padding: 15px;
border: 1px solid #DBE8EB; border: 1px solid #DBE8EB;

2
main/webapp/modules/core/styles/project.css
View File

@ -52,7 +52,7 @@ body {
padding: 0px; padding: 0px;
font-size: 11px; font-size: 11px;
} }
.left-panel .gridworks-tabs.ui-tabs .ui-tabs-panel { .left-panel .refine-tabs.ui-tabs .ui-tabs-panel {
padding: 7px; padding: 7px;
overflow: hidden; overflow: hidden;
} }