matthias
/
xapian-haystack
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactored xapian_backend.update. 

Removed repeated code.
This commit is contained in:
Jorge C. Leitão 2014-05-14 23:21:43 +02:00
parent d22eb8d3f4
commit 61a68f3e27
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xapian_backend.py
View File

@ -266,42 +266,22 @@ class XapianSearchBackend(BaseSearchBackend):
document.add_term(TERM_PREFIXES[field['field_name']] + term, weight)
document.add_value(field['column'], term)
elif field['type'] == 'text':
value = data[field['field_name']]
prefix = TERM_PREFIXES['field'] + field['field_name'].upper()
if field['multi_valued'] == 'false':
term = _marshal_term(value)
term_generator.index_text(term, weight)
term_generator.index_text(term, weight, prefix)
if len(term.split()) == 1:
document.add_term(term, weight)
document.add_term(prefix + term, weight)
document.add_value(field['column'], _marshal_value(value))
else:
for term in value:
term = _marshal_term(term)
term_generator.index_text(term, weight)
term_generator.index_text(term, weight, prefix)
if len(term.split()) == 1:
document.add_term(term, weight)
document.add_term(prefix + term, weight)
else:
value = data[field['field_name']]
prefix = TERM_PREFIXES['field'] + field['field_name'].upper()
if field['multi_valued'] == 'false':
term = _marshal_term(value)
document.add_value(field['column'], _marshal_value(value))
value = [value]
for term in value:
term = _marshal_term(term)
if field['type'] == 'text':
term_generator.index_text(term, weight)
term_generator.index_text(term, weight, prefix)
if len(term.split()) == 1:
document.add_term(term, weight)
document.add_term(prefix + term, weight)
document.add_value(field['column'], _marshal_value(value))
else:
for term in value:
term = _marshal_term(term)
if len(term.split()) == 1:
document.add_term(term, weight)
document.add_term(prefix + term, weight)
# store data without indexing it
document.set_data(pickle.dumps(