Simplified code.

This commit is contained in:
Jorge C. Leitão 2014-05-18 16:42:33 +02:00
parent 107e81be2d
commit 453129d60e

View file

@ -1384,12 +1384,12 @@ def _to_xapian_term(term):
Xapian term that can be indexed.
"""
if isinstance(term, datetime.datetime):
term = _marshal_datetime(term)
value = term.strftime(DATETIME_FORMAT)
elif isinstance(term, datetime.date):
term = _marshal_date(term)
value = term.strftime(DATETIME_FORMAT)
else:
term = force_text(term).lower()
return term
value = force_text(term).lower()
return value
def _from_xapian_value(value, field_type):
@ -1421,17 +1421,6 @@ def _from_xapian_value(value, field_type):
return value
def _marshal_date(d):
return '%04d%02d%02d000000' % (d.year, d.month, d.day)
def _marshal_datetime(dt):
return '%04d%02d%02d%02d%02d%02d' % (
dt.year, dt.month, dt.day, dt.hour,
dt.minute, dt.second
)
class XapianEngine(BaseEngine):
backend = XapianSearchBackend
query = XapianSearchQuery