[ARVADOS] updated: a66a265608dbde7f3dd02dcd64ffba55f6a772fd

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/angular_shim.js         |  9 ++--
 apps/workbench/test/diagnostics/pipeline_test.rb   | 13 ++++--
 .../test/integration/pipeline_instances_test.rb    |  2 +-
 apps/workbench/test/integration_helper.rb          |  8 ++--
 sdk/go/arvadosclient/arvadosclient.go              | 53 ++++++++++++++--------
 sdk/go/arvadosclient/arvadosclient_test.go         | 28 ++++++++++++
 services/api/app/models/arvados_model.rb           |  8 +---
 services/api/app/models/collection.rb              | 12 +++++
 8 files changed, 95 insertions(+), 38 deletions(-)

       via  a66a265608dbde7f3dd02dcd64ffba55f6a772fd (commit)
       via  e95e66b8be5d92fe2890f9e33e682cc3c8c6cc73 (commit)
       via  5aacaabf6190d644bc957903f0f712959234fa07 (commit)
       via  3c81026770b7d9251116679b549f116533f4f469 (commit)
       via  61fdce2ec17d5892642be7a957b824f9d311c192 (commit)
       via  2fad64f0b0ef8085f3f8b59cdab31c37ea76c996 (commit)
       via  f0ac035f2eb76952ee2d56764756ddbc7bef270f (commit)
       via  5810ac278a9abac129369dafcdb42436452c74c8 (commit)
       via  3636b3a3c941b89da720e6f6d02ac05c483ff097 (commit)
       via  15ffbb6dac07e594ca6b68022530ccfee97c2481 (commit)
       via  215372746216e1c348231b6585a6e0fb9c505af4 (commit)
      from  ec7cd27f399097d76822eb05867102e2b7d19be7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a66a265608dbde7f3dd02dcd64ffba55f6a772fd
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Jan 9 21:28:04 2015 -0500

    4523: revert test update now that text attributes in non-collections objects are not omitted from search index.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 6a5d097..9f4ce69 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -443,7 +443,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     ['admin', nil, 40, 200],
     ['admin', 'FUSE project', 1, 1],
     ['admin', 'pipeline_10', 2, 2],
-    ['active', 'containing at least two', 0, 100],  # components column (of type text) is currently not searchable
+    ['active', 'containing at least two', 2, 100],
     ['active', nil, 10, 100],
     ['active', 'no such match', 0, 0],
   ].each do |user, search_filter, expected_min, expected_max|

commit e95e66b8be5d92fe2890f9e33e682cc3c8c6cc73
Merge: 5aacaab 61fdce2
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Jan 9 21:07:06 2015 -0500

    Merge branch 'master' into 4523-search-index


commit 5aacaabf6190d644bc957903f0f712959234fa07
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Jan 9 18:11:10 2015 -0500

    4523: include stream names in file_names

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 35f8533..d112e09 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -142,6 +142,14 @@ class Collection < ArvadosModel
         break if names.length > 2**13
       end
     end
+
+    if manifest_text and names.length < 2**13
+      manifest_text.scan(/^\.\/(\S+)/m) do |stream_name|
+        names << stream_name.first.gsub('\040',' ') + "\n" 
+        break if names.length > 2**13
+      end
+    end
+
     names[0,2**13]
   end
 

commit 3c81026770b7d9251116679b549f116533f4f469
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Jan 9 18:00:07 2015 -0500

    4523: exclude manifest_text from collection -> searchable_columns and leave the other text columns for other objects.

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index fc46337..a170fb9 100644
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -60,14 +60,8 @@ class ArvadosModel < ActiveRecord::Base
     textonly_operator = !operator.match(/[<=>]/)
     self.columns.select do |col|
       case col.type
-      when :string
+      when :string, :text
         true
-      when :text
-        if operator == 'ilike'
-          false
-        else
-          true
-        end
       when :datetime, :integer, :boolean
         !textonly_operator
       else
diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 423555b..35f8533 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -288,6 +288,10 @@ class Collection < ArvadosModel
     find_all_for_docker_image(search_term, search_tag, readers).first
   end
 
+  def self.searchable_columns operator
+    super - ["manifest_text"]
+  end
+
   protected
   def portable_manifest_text
     portable_manifest = self[:manifest_text].dup

commit 5810ac278a9abac129369dafcdb42436452c74c8
Merge: ec7cd27 15ffbb6
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Jan 9 16:49:36 2015 -0500

    Merge branch 'master' into 4523-search-index


-----------------------------------------------------------------------


hooks/post-receive
--