dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity

Split basic and regex search functions

Browse Source
This commit is contained in:
DarkPhoenix
2020-04-10 00:57:41 +03:00
parent 362923ac64
commit adf90a8263
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/market.py
View File

@@ -153,7 +153,7 @@ class SearchWorkerThread(threading.Thread):
all_results = set()
if len(' '.join(requestTokens)) >= config.minItemSearchLength:
for filter_ in filters:
filtered_results = eos.db.searchItems(
filtered_results = eos.db.searchItemsRegex(
requestTokens, where=filter_,
join=(types_Item.group, types_Group.category),
eager=("group.category", "metaGroup"))
@@ -846,7 +846,7 @@ class Market:
def searchShips(self, name):
"""Find ships according to given text pattern"""
filter_ = types_Category.name.in_(["Ship", "Structure"])
results = eos.db.searchItems(name.split(), where=filter_,
results = eos.db.searchItems(name, where=filter_,
join=(types_Item.group, types_Group.category),
eager=("group.category", "metaGroup"))
ships = set()