Merge branch 'master' into 4523-search-index

[arvados.git] / services / api / app / models / collection.rb

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 5701a1cafe138bdd4af03c6e534347bc8fe8e052..d112e09e97d466b1c1052a4826841a865343c8c8 100644 (file)
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -128,13 +128,31 @@ class Collection < ArvadosModel
   end
 
   def set_file_names
-    if self.manifest_text_changed? and self.manifest_text
-      # set file_names to the first 2^16 bytes of manifest_text
-      self['file_names'] = self[:manifest_text][0,2**16]
+    if self.manifest_text_changed?
+      self.file_names = Collection.manifest_files self.manifest_text
     end
     true
   end
 
+  def self.manifest_files manifest_text
+    names = ''
+    if manifest_text
+      manifest_text.scan(/ \d+:\d+:(\S+)/) do |name|
+        names << name.first.gsub('\040',' ') + "\n" 
+        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
+
   def check_encoding
     if manifest_text.encoding.name == 'UTF-8' and manifest_text.valid_encoding?
       true
@@ -278,6 +296,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