Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix extract keyword bug #88

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix extract keyword bug #88

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d1e3f0
fix bug
Jul 19, 2019
8fdb94e
fix bug
Jul 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions flashtext/keyword.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,8 @@ def extract_keywords(self, sentence, span_info=False):
idy = idx + 1
while idy < sentence_len:
inner_char = sentence[idy]
if inner_char not in self.non_word_boundaries and self._keyword in current_dict_continued:
# if inner_char not in self.non_word_boundaries and self._keyword in current_dict_continued:
if self._keyword in current_dict_continued:
# update longest sequence found
longest_sequence_found = current_dict_continued[self._keyword]
sequence_end_pos = idy
Expand All @@ -524,6 +525,7 @@ def extract_keywords(self, sentence, span_info=False):
current_dict = self.keyword_trie_dict
if longest_sequence_found:
keywords_extracted.append((longest_sequence_found, sequence_start_pos, idx))
idx -= 1
reset_current_dict = True
else:
# we reset current_dict
Expand Down Expand Up @@ -580,7 +582,7 @@ def replace_keywords(self, sentence):
if not sentence:
# if sentence is empty or none just return the same.
return sentence
new_sentence = []
new_sentence = ''
orig_sentence = sentence
if not self.case_sensitive:
sentence = sentence.lower()
Expand Down Expand Up @@ -639,17 +641,17 @@ def replace_keywords(self, sentence):
current_word = current_word_continued
current_dict = self.keyword_trie_dict
if longest_sequence_found:
new_sentence.append(longest_sequence_found + current_white_space)
new_sentence += longest_sequence_found + current_white_space
current_word = ''
current_white_space = ''
else:
new_sentence.append(current_word)
new_sentence += current_word
current_word = ''
current_white_space = ''
else:
# we reset current_dict
current_dict = self.keyword_trie_dict
new_sentence.append(current_word)
new_sentence += current_word
current_word = ''
current_white_space = ''
elif char in current_dict:
Expand All @@ -667,15 +669,15 @@ def replace_keywords(self, sentence):
break
idy += 1
idx = idy
new_sentence.append(current_word)
new_sentence += current_word
current_word = ''
current_white_space = ''
# if we are end of sentence and have a sequence discovered
if idx + 1 >= sentence_len:
if self._keyword in current_dict:
sequence_found = current_dict[self._keyword]
new_sentence.append(sequence_found)
new_sentence += sequence_found
else:
new_sentence.append(current_word)
new_sentence += current_word
idx += 1
return "".join(new_sentence)
return new_sentence