xapian_db 0.5.10 → 0.5.11

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+##0.5.11 (April 21st, 2011)
+
+Features:
+
+  - XapianDb.search accepts all options supported by XapianDb::Database.search
+  - Rails log entries include query execution time
+  - small changes to the beanstalk worker error handling
+
 ##0.5.10 (April 6th, 2011)
 
 Features:

data/lib/generators/templates/beanstalk_worker

@@ -23,8 +23,8 @@ module XapianDb
       Rails.logger.info "XapianDb beanstalk worker: ready"
 
       loop do
+        job = beanstalk.reserve
         begin
-          job = beanstalk.reserve
           params = YAML::load job.body
           Rails.logger.info "XapianDb beanstalk worker: executing task #{params}"
           task = params.delete :task
@@ -32,13 +32,7 @@ module XapianDb
         rescue Exception => ex
           Rails.logger.error "XapianDb beanstalk worker: could not process #{job.body} (#{ex})"
         end
-
-        begin
-          job.delete
-        rescue Exception => ex
-          Rails.logger.error "XapianDb beanstalk worker: could delete job #{job.body} (#{ex})"
-        end
-
+        job.delete
       end
     end
   end

data/lib/xapian_db/database.rb

@@ -65,7 +65,7 @@ module XapianDb
       # If we do not have a valid query we return an empty result set
       return Resultset.new(nil, opts) unless query
 
-      Rails.logger.info "Executing XapianDb search: #{expression}" if defined?(Rails)
+      start = Time.now
 
       enquiry        = Xapian::Enquire.new(reader)
       enquiry.query  = query
@@ -84,7 +84,10 @@ module XapianDb
 
       opts[:spelling_suggestion] = @query_parser.spelling_suggestion
       opts[:db_size]             = self.size
-      Resultset.new(enquiry, opts)
+      result = Resultset.new(enquiry, opts)
+
+      Rails.logger.debug "XapianDb search (#{(Time.now - start) * 1000}ms) #{expression}" if defined?(Rails)
+      result
     end
 
     # A very simple implementation of facets limited to the class facets.

data/lib/xapian_db.rb

@@ -74,8 +74,8 @@ module XapianDb
   # Query the configured database.
   # See {XapianDb::Database#search} for options
   # @return [XapianDb::Resultset]
-  def self.search(expression)
-    XapianDb::Config.database.search(expression)
+  def self.search(expression, options={})
+    XapianDb::Config.database.search(expression, options)
   end
 
   # Get facets from the configured database.

data/tasks/beanstalk_worker.rake

@@ -21,8 +21,8 @@ namespace :xapian_db do
     puts DEPRECATION_WARNING
     puts "XapianDb beanstalk worker is serving on #{url}..."
     loop do
+      job = beanstalk.reserve
       begin
-        job = beanstalk.reserve
         params = YAML::load job.body
         Rails.logger.info "XapianDb beanstalk worker: executing task #{params}"
         task = params.delete :task
@@ -30,13 +30,7 @@ namespace :xapian_db do
       rescue Exception => ex
         Rails.logger.error "XapianDb beanstalk worker: could not process #{job.body} (#{ex})"
       end
-
-      begin
-        job.delete
-      rescue Exception => ex
-        Rails.logger.error "XapianDb beanstalk worker: could delete job #{job.body} (#{ex})"
-      end
-
+      job.delete
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 10
-  version: 0.5.10
+  - 11
+  version: 0.5.11
 platform: ruby
 authors: 
 - Gernot Kogler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +02:00
+date: 2011-04-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency