[ARVADOS] updated: 9b59cd2f10fa44f4cdbf8986b08e92bdde5a62a7

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/helpers/application_helper.rb   |  4 +-
 .../jobs/_rerun_job_with_options_popup.html.erb    |  2 +-
 .../app/views/pipeline_instances/show.html.erb     |  4 +-
 .../app/views/users/_add_ssh_key_popup.html.erb    |  2 +-
 .../app/views/users/_setup_popup.html.erb          |  2 +-
 .../test/integration/pipeline_instances_test.rb    | 43 ++++++++++++++++++----
 services/api/lib/current_api_client.rb             | 21 +++++++++--
 services/api/lib/record_filters.rb                 |  6 ++-
 services/api/test/fixtures/pipeline_templates.yml  | 19 ++++++++++
 services/fuse/setup.py                             |  2 +-
 services/nodemanager/setup.py                      |  2 +-
 11 files changed, 85 insertions(+), 22 deletions(-)

       via  9b59cd2f10fa44f4cdbf8986b08e92bdde5a62a7 (commit)
       via  1eda4774a59f46296f82231eeb80484aca70a961 (commit)
       via  54873fcd103e4887e41e987522e4442b62f682ad (commit)
       via  8cd7249b96576285388ef036d04532f72a8f1ee3 (commit)
       via  e5b8f6826a2034c0c7d7142cff3fb02f64fb8831 (commit)
       via  12dee1ebfd6a3fca40c19d751459ba6a071c0a3d (commit)
       via  36d6d1609ef342268cc87fc8bfce51bcf7199929 (commit)
       via  e20040092b47f79365637dd8e26156d95ab5c6ee (commit)
      from  a11c56ef66604a9117e3db8c2fa2273c98f88b51 (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 9b59cd2f10fa44f4cdbf8986b08e92bdde5a62a7
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Feb 6 16:15:23 2015 -0500

    4523: slightly modified full text search condition.

diff --git a/services/api/lib/record_filters.rb b/services/api/lib/record_filters.rb
index b8cdef0..51153fe 100644
--- a/services/api/lib/record_filters.rb
+++ b/services/api/lib/record_filters.rb
@@ -42,8 +42,12 @@ module RecordFilters
           raise ArgumentError.new("Full text search on individual columns is not supported")
         end
         attrs = [] #  skip the generic per-column operator loop below
+        # Use to_tsquery since plainto_tsquery does not support prefix search.
+        # Instead split operand and join the words with ' & ' and add ':*' to the last word
+        # Thus when searched for "some str", objects containing "some" and "str:*" are found.
         cond_out << model_class.full_text_tsvector+" @@ to_tsquery(?)"
-        param_out << operand.split.each {|s| s.concat(':*')}.join(' & ')
+        operand << ':*'
+        param_out << operand.split.join(' & ')
       else
        attrs.each do |attr|
         if !model_class.searchable_columns(operator).index attr.to_s

commit 1eda4774a59f46296f82231eeb80484aca70a961
Merge: 8cd7249 54873fc
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Feb 6 13:47:32 2015 -0500

    Merge branch 'master' into 4523-full-text-search


commit 8cd7249b96576285388ef036d04532f72a8f1ee3
Merge: a11c56e e5b8f68
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Feb 6 08:56:09 2015 -0500

    Merge branch 'master' into 4523-full-text-search


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


hooks/post-receive
--