mirror of
https://github.com/Hopiu/xapian-haystack.git
synced 2026-03-16 22:20:31 +00:00
Update xapian_backend.py
This commit is contained in:
parent
2824430736
commit
089b892d78
1 changed files with 3 additions and 4 deletions
|
|
@ -7,7 +7,6 @@ import re
|
||||||
import shutil
|
import shutil
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from django.utils import six
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.exceptions import ImproperlyConfigured
|
from django.core.exceptions import ImproperlyConfigured
|
||||||
from django.utils.encoding import force_text
|
from django.utils.encoding import force_text
|
||||||
|
|
@ -354,7 +353,7 @@ class XapianSearchBackend(BaseSearchBackend):
|
||||||
def _get_ngram_lengths(value):
|
def _get_ngram_lengths(value):
|
||||||
values = value.split()
|
values = value.split()
|
||||||
for item in values:
|
for item in values:
|
||||||
for ngram_length in six.moves.range(NGRAM_MIN_LENGTH, NGRAM_MAX_LENGTH + 1):
|
for ngram_length in range(NGRAM_MIN_LENGTH, NGRAM_MAX_LENGTH + 1):
|
||||||
yield item, ngram_length
|
yield item, ngram_length
|
||||||
|
|
||||||
for obj in iterable:
|
for obj in iterable:
|
||||||
|
|
@ -364,8 +363,8 @@ class XapianSearchBackend(BaseSearchBackend):
|
||||||
def ngram_terms(value):
|
def ngram_terms(value):
|
||||||
for item, length in _get_ngram_lengths(value):
|
for item, length in _get_ngram_lengths(value):
|
||||||
item_length = len(item)
|
item_length = len(item)
|
||||||
for start in six.moves.range(0, item_length - length + 1):
|
for start in range(0, item_length - length + 1):
|
||||||
for size in six.moves.range(length, length + 1):
|
for size in range(length, length + 1):
|
||||||
end = start + size
|
end = start + size
|
||||||
if end > item_length:
|
if end > item_length:
|
||||||
continue
|
continue
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue