documentcloud · cometman · Sep 14, 2015 · Sep 18, 2015 · Sep 22, 2015 · Sep 22, 2015
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
@@ -122,8 +122,15 @@ def loader
   end
 
   def entities
-    ids = Document.accessible(current_account, current_organization).where({:id => params[:ids]}).pluck('id')
-    json 'entities' => Entity.where({ :document_id => ids })
+    documents = Document.accessible(current_account, current_organization).where({:id => params[:ids]})
+    result = {}
+    documents.each do |doc|
+      if doc.processing_jobs.select{|x| x.action == "process_entities" && x.complete == false}.present?
+        error = "Entities are still being extracted.  Please try again later."
+      end
+      result[doc.id.to_s] = {'entities' => Entity.where({ :document_id => doc.id }), "error" => error}
+    end
+    json result
   end
 
   def entity

diff --git a/lib/dc/import/entity_extractor.rb b/lib/dc/import/entity_extractor.rb
@@ -55,6 +55,7 @@ def extract_entities(document, calais, chunk_number)
           kind = Entity.normalize_kind(entity[:type])
           value = entity[:name]
           next unless kind && value
+          next if value.length >= 255 # If value is over 255, this is not a valid entity.
           value = Entity.normalize_value(value)
           next if kind == :phone && Validators::PHONE !~ value
           next if kind == :email && Validators::EMAIL !~ value

diff --git a/public/javascripts/model/entities.js b/public/javascripts/model/entities.js
@@ -164,12 +164,12 @@ dc.model.EntitySet = Backbone.Collection.extend({
     var missing = _.select(docs, function(doc){ return !doc.entities.loaded; });
     if (!missing.length) return callback();
     dc.ui.spinner.show();
-    $.get('/documents/entities.json', {'ids[]' : _.pluck(missing, 'id')}, function(resp) {
-      var entities = _.groupBy(resp.entities, 'document_id');
-      _.each(entities, function(list, docId) {
+    $.get('/documents/entities.json', {'ids[]' : _.pluck(missing, 'id')}, function(response) {
+      _.each(response, function(docEntityResponse, docId) {
         var collection = Documents.get(docId).entities;
         collection.loaded = true;
-        collection.reset(list);
+        collection.errors = docEntityResponse.error
+        collection.reset(docEntityResponse.entities);
       });
       dc.ui.spinner.hide();
       callback();

diff --git a/public/javascripts/ui/documents/document.js b/public/javascripts/ui/documents/document.js
@@ -437,6 +437,8 @@ dc.ui.Document = Backbone.View.extend({
   _renderEntities : function() {
     if (this.model.entities.length) {
       this.entitiesView.show();
+    } else if (this.model.entities.errors != null) {
+      dc.ui.Dialog.alert( this.model.entities.errors );
     } else {
       dc.ui.Dialog.alert( _.t('has_no_entities', this.model.get('title') ) );
     }

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -8,7 +8,7 @@
 VCR.configure do |config|
   config.cassette_library_dir = "test/vcr_cassettes"
   config.allow_http_connections_when_no_cassette = true
-  config.hook_into :webmock # or :fakeweb
+  #config.hook_into :webmock # or :fakeweb
 end
 
 PROCESSING_JOBS = []