infopark_fiona7 1.2.0.1.4 → 1.2.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cba5228a981890aa7cfb8f6c59c2e3fbaff1553
-  data.tar.gz: 08330c953d938833085ccdbfbbf68f2490b2400a
+  metadata.gz: 95e1d0c153cae176d4413ba9de85700117ff2119
+  data.tar.gz: 073a4693abd33326b6d2218d7d0f69eb95a6c81a
 SHA512:
-  metadata.gz: 2846235f3e810fe9899fc4ed254896c8e5abf2ce9b5d9dcc99a1d5490e6b933230eb1c7e939f5489f28700a96b1bd5ffd25184f100afe1493ee38835b78a5a2f
-  data.tar.gz: bb5baf49c42113c9379fff3671123b17072ecab572ea9de0020c3b55a3075fd616970436a31dac105cb2363f04cd1507a63859845b532d1617aa55a601b4bf1e
+  metadata.gz: e4684651e4eea73bcc38691a9ae8b0441063c190cd71b6a67637c2022eb9b2bcfb14fd306a9dda84f5d1b9dd3141f2f4594a8b373db98354b304780915cf1e8b
+  data.tar.gz: 47871bc4bdd0a6ee52369e9b07f83b89af87a0c16a483c63fd0d2ed89a11d56fa0cf8425081a58912800f7814edcfa5813b2e47508f90e3343cc02234b4f66e6

data/lib/fiona7/controllers/rest_api/obj_controller.rb

@@ -286,7 +286,7 @@ module Fiona7
         def use_naive_search_engine?(query)
           false ||
             query.empty? ||
-            query.any? {|q| (q[:field].to_sym == :_path || q[:field].to_sym == :_name)&& (q[:operator].to_sym == :equal || q[:operator].to_sym == :prefix || query.length == 1)} ||
+            query.any? {|q| (q[:field].to_sym == :_path || q[:field].to_sym == :_name)&& (query.length == 1)} ||
             query.any? {|q| q[:field].to_sym == :_parent_path && (q[:operator].to_sym == :equal || query.length == 1)} ||
             (query.length == 1 && query.first[:field].to_sym == :_modification) ||
             (query.length == 1 && query.first[:field].to_sym == :_obj_class) ||

data/lib/fiona7/verity_search_engine.rb

@@ -86,13 +86,14 @@ module Fiona7
         conditions = query.map do |q|
           field = resolve_field_name(q[:field])
 
-          # paths are sadly not in the search index by default.
-          next if field == :visiblePath
-
           case q[:operator]
           when :equal
             if field == :__dummy__
               '("edited" <#IN> state)'
+            elsif field ==:_path
+              paths = Array(q[:value])
+              ids = Fiona7::WriteObj.where(path: paths).select(:obj_id).limit(1000).map(&:obj_id).map(&:to_s).presence || ["1000"]
+              search_in(:objId, ids)
             else
               search_in(field, q[:value])
             end
@@ -113,6 +114,12 @@ module Fiona7
               values = as_values_array(q[:value])
               values = values.map {|v| "#{v}*" }
               full_text_query_string(values)
+            elsif field == :_path
+              query = []
+              paths = Array(q[:value]).map {|p| "#{p}%" }
+              paths.each { |_| query << " (path LIKE ?) " }
+              ids = Fiona7::WriteObj.where(query.join(' AND '), paths).select(:obj_id).limit(1000).map(&:obj_id).map(&:to_s).presence || ["1000"]
+              search_in(:objId, ids)
             else
               values = as_values_array(q[:value])
               values = values.map {|v| "#{v}*" }
@@ -136,7 +143,7 @@ module Fiona7
 
       def search_in(field, values)
         values = [values] unless values.kind_of?(Array)
-        if [:objClass, :obj_id, :permalink, :lastChanged, :name].include?(field)
+        if [:objClass, :objId, :permalink, :lastChanged, :name].include?(field)
           fields = [field.to_s]
         else
           fields = Fiona7::AttributeNamesFromQueries.new(field.to_s, @query).attributes || Fiona7::AttributeNamesFromCms.new(field.to_s).attributes || [field.to_s]
@@ -172,11 +179,15 @@ module Fiona7
         when :_obj_class
           :objClass
         when :_path
-          :visiblePath
+          :_path
         when :_modification
           :__dummy__
         when :id
-          :obj_id
+          :objId
+        when :_id
+          :objId
+        when :obj_id
+          :objId
         when :_permalink
           :permalink
         when :_last_changed

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.2.0.1.4"
+  VERSION = "1.2.0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.2.0.1.4
+  version: 1.2.0.2.1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails