cheap_skate 0.0.5 → 0.0.6

data/lib/cheap_skate/application.rb

@@ -95,7 +95,7 @@ END
           query.add_facets_to_query(parm)  
           query.parse_facet_query(parm)        
         end
-        results = settings.index.search(query, opts)
+        results = settings.index.do_search(query, opts)
         results.nl_format = params['json.nl']||'flat'
         results
       end

data/lib/cheap_skate/index.rb

@@ -54,7 +54,7 @@ module CheapSkate
       writer.field_infos.add_field(field, opts)
     end
         
-    def search(query, opts={})
+    def do_search(query, opts={})
       results = ResultSet.new
       results.offset = opts[:offset]
       results.limit = opts[:limit]
@@ -73,9 +73,14 @@ module CheapSkate
           opts[:filter_proc] = query.filter_proc
         end
       end
-
-      results.total = self.search_each(query.query, opts) do |id, score|
-        results << @schema.typed_document(self[id])
+      searcher = Ferret::Search::Searcher.new(self.reader)
+      hits = searcher.search(query.query, opts)
+      results.total = hits.total_hits
+      results.max_score = hits.max_score
+      hits.hits.each do |hit|
+       doc = @schema.typed_document(self[hit.doc])
+       doc[:score] = hit.score
+       results << doc      
       end
       if query.respond_to?(:facet_fields)
         facets = {}
@@ -95,7 +100,6 @@ module CheapSkate
     end
     
     def get_facets_from_index_terms(query)
-      puts query.facet_fields.inspect
       query.facet_fields.keys.each do |field|
         field_terms = reader.terms(field)
         next unless field_terms
@@ -160,7 +164,6 @@ module CheapSkate
         end
       end
       unless bool.to_s.empty?
-        puts "We did something here."
         return Ferret::Search::QueryFilter.new(bool)
       end
       nil

data/lib/cheap_skate/models.rb

@@ -26,7 +26,7 @@ module CheapSkate
   end  
   
   class ResultSet
-    attr_accessor :total, :docs, :query, :limit, :offset, :facets, :query_time, :nl_format
+    attr_accessor :total, :docs, :query, :limit, :offset, :facets, :query_time, :nl_format, :max_score
     def <<(obj)
       @docs ||=[]
       @docs << obj
@@ -34,7 +34,8 @@ module CheapSkate
   
     def to_hash()
       response = {"responseHeader"=>{"status"=>0, "QTime"=>self.query_time, "params"=>{"q"=>self.query, "version"=>"2.2", "rows"=>self.limit}}}
-      response["response"] = {"numFound"=>self.total, "start"=>self.offset, "docs"=>[]}
+      response["response"] = {"numFound"=>self.total, "start"=>self.offset, "rows"=>docs.length, "docs"=>[]}
+      response["response"]["maxScore"] = self.max_score if self.max_score
       if self.docs
         self.docs.each do |doc|
           response["response"]["docs"] << doc
@@ -121,8 +122,8 @@ module CheapSkate
       map_arr = {}
       @facet_fields.each_pair do |k,v|
         map_arr[k] ||= {}
-        v.flatten.each_cons(2) do |key, val|
-         map_arr[k][key] = val
+        v.each do |val_pair|
+         map_arr[k][val_pair[0]] = val_pair[1]
        end
       end
       map_arr      

data/lib/cheap_skate/schema.rb

@@ -154,7 +154,11 @@ module CheapSkate
       lazy_doc.fields.each do |field|
         [*lazy_doc[field]].each do |fld|
           if doc[field]
-            doc[field] = [*doc[field]]
+            if multi_valued?(field)
+              doc[field] = [*doc[field]] 
+            else
+              doc[field] << "\n"
+            end
             doc[field] << type_field(field, fld)
           elsif multi_valued?(field)
             doc[field] = [type_field(field, fld)]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ross Singer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -04:00
+date: 2010-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency