Made extend data from freebase command available on columns not officially reconciled, since some columns might contain reconciled data copied from other columns.

More error checking in the extend data utility.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@583 7d457c2a-affb-35e4-300a-418c747d4874

src/main/java/com/metaweb/gridworks/commands/util/PreviewExtendDataCommand.java

@@ -61,6 +61,10 @@ public class PreviewExtendDataCommand extends Command {
                         topicNames.add(cell.recon.match.topicName);
                         topicGuids.add(cell.recon.match.topicGUID);
                         guids.add(cell.recon.match.topicGUID);
+                    } else {
+                        topicNames.add(null);
+                        topicGuids.add(null);
+                        guids.add(null);
                     }
                 }
             }
@@ -101,7 +105,7 @@ public class PreviewExtendDataCommand extends Command {
                     String guid = topicGuids.get(r);
                     String topicName = topicNames.get(r);
                     
-                    if (map.containsKey(guid)) {
+                    if (guid != null && map.containsKey(guid)) {
                         DataExtension ext = map.get(guid);
                         boolean first = true;
                         
@@ -134,7 +138,14 @@ public class PreviewExtendDataCommand extends Command {
                     }
                     
                     writer.array();
-                    writer.value(topicName);
+                    if (guid != null) {
+                        writer.object();
+                        writer.key("id"); writer.value("/guid/" + guid.substring(1));
+                        writer.key("name"); writer.value(topicName);
+                        writer.endObject();
+                    } else {
+                        writer.value("<not reconciled>");
+                    }
                     writer.endArray();
                 }
                 writer.endArray();

src/main/java/com/metaweb/gridworks/util/FreebaseDataExtensionJob.java

@@ -70,6 +70,7 @@ public class FreebaseDataExtensionJob {
             JSONObject o = ParsingUtilities.evaluateJsonStringToObject(s);
             
             Map<String, FreebaseDataExtensionJob.DataExtension> map = new HashMap<String, FreebaseDataExtensionJob.DataExtension>();
+            if (o.has("result")) {
                 JSONArray a = o.getJSONArray("result");
                 int l = a.length();
                 
@@ -82,6 +83,7 @@ public class FreebaseDataExtensionJob {
                         map.put(guid, ext);
                     }
                 }
+            }
             
             return map;
         } finally {
@@ -284,8 +286,10 @@ public class FreebaseDataExtensionJob {
                 jsonWriter.key("guid|=");
                     jsonWriter.array();
                     for (String guid : guids) {
+                        if (guid != null) {
                             jsonWriter.value(guid);
                         }
+                    }
                     jsonWriter.endArray();
                     
                 formulateQueryNode(node.getJSONArray("properties"), jsonWriter);

src/main/webapp/scripts/dialogs/extend-data-preview-dialog.js

@@ -53,8 +53,9 @@ function ExtendDataPreviewDialog(column, columnIndex, rowIndices, onDone) {
     }).appendTo(footer);
     
     var dismissBusy = DialogSystem.showBusy();
+    var type = "reconConfig" in column && "type" in column.reconConfig ? column.reconConfig.type.id : "/common/topic";
     
-    ExtendDataPreviewDialog.getAllProperties(column.reconConfig.type.id, function(properties) {
+    ExtendDataPreviewDialog.getAllProperties(type, function(properties) {
         dismissBusy();
         self._show(properties);
     });
@@ -131,12 +132,14 @@ ExtendDataPreviewDialog.prototype._show = function(properties) {
     }
     
     var suggestConfig = {
-        type: '/type/property',
+        type: '/type/property'
-        schema: this._column.reconConfig.type.id
     };
+    if ("reconConfig" in this._column && "type" in this._column.reconConfig) {
+        suggestConfig.schema = this._column.reconConfig.type.id
+    }
     
     this._elmts.addPropertyInput.suggestP(suggestConfig).bind("fb-select", function(evt, data) {
-        var expected = data["/type/property/expected_type"];
+        var expected = data["expected_type"];
         self._addProperty({
             id : data.id,
             name: data.name,

src/main/webapp/scripts/views/data-table-column-header-ui.js

@@ -866,7 +866,6 @@ DataTableColumnHeaderUI.prototype._doAddColumn = function(initialExpression) {
 };
 
 DataTableColumnHeaderUI.prototype._doAddColumnFromFreebase = function() {
-    if ("reconConfig" in this._column && "type" in this._column.reconConfig) {
     var o = DataTableView.sampleVisibleRows(this._column);
     var self = this;
     new ExtendDataPreviewDialog(
@@ -887,9 +886,6 @@ DataTableColumnHeaderUI.prototype._doAddColumnFromFreebase = function() {
             );
         }
     );
-    } else {
-        alert("This column has not been reconciled yet.");
-    }
 };
 
 DataTableColumnHeaderUI.prototype._doRemoveColumn = function() {