commit 375f91a24236057eab531bada2cfb2d70cac542a
parent 9585e430151cb415e7b76acc4280ad54ded17b00
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 28 Jul 2009 12:00:58 -0400
Merge branch 'xapian' into next
Diffstat:
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/sup/ferret_index.rb b/lib/sup/ferret_index.rb
@@ -442,6 +442,7 @@ private
def build_ferret_query query
q = Ferret::Search::BooleanQuery.new
+ q.add_query Ferret::Search::MatchAllQuery.new, :must
q.add_query query[:qobj], :must if query[:qobj]
labels = ([query[:label]] + (query[:labels] || [])).compact
labels.each { |t| q.add_query Ferret::Search::TermQuery.new("label", t.to_s), :must }
diff --git a/lib/sup/xapian_index.rb b/lib/sup/xapian_index.rb
@@ -14,7 +14,7 @@ class XapianIndex < BaseIndex
## so we must ensure they're reasonably valid. this typically only affect
## spam.
MIN_DATE = Time.at 0
- MAX_DATE = Time.at(2**31)
+ MAX_DATE = Time.at(2**31-1)
def initialize dir=BASE_DIR
super