Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-31 04:57:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Minor fixes and reducing some sql calls in various managers.

Browse source
This commit is contained in:
Griatch 2012-08-22 16:15:52 +02:00
parent 4edde61be4
commit 5117bd2a0a
7 changed files with 87 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/help/manager.py
View file

@ -26,8 +26,9 @@ class HelpEntryManager(models.Manager):
"""
Searches for matching topics based on player's input.
"""
if utils.dbref(topicstr):
return self.filter(id=utils.dbref(topicstr))
dbref = utils.dbref(topicstr)
if dbref:
return self.filter(id=dbref)
topics = self.filter(db_key__iexact=topicstr)
if not topics and not exact:
topics = self.filter(db_key__istartswith=topicstr)
@ -47,17 +48,13 @@ class HelpEntryManager(models.Manager):
Do a fuzzy match, preferably within the category of the
current topic.
"""
topics = self.find_apropos(topicstr)
# we need to clean away the given help entry.
return [topic for topic in topics
if topic.key.lower() != topicstr.lower()]
return self.filter(db_key__icontains=topicstring).exclude(db_key__iexact=topicstring)
def find_topics_with_category(self, help_category):
"""
Search topics having a particular category
"""
topics = self.filter(db_help_category__iexact=help_category)
return topics
return self.filter(db_help_category__iexact=help_category)
def get_all_topics(self):
"""
@ -94,7 +91,7 @@ class HelpEntryManager(models.Manager):
category - limit the search to a particular help topic
"""
ostring = ostring.strip().lower()
help_entries = self.filter(db_topicstr=ostring)
if help_category:
help_entries.filter(db_help_category=help_category)
return help_entries
if help_categories:
return self.filter(db_topicstr__iexact=ostring, db_help_category__iexact=help_category)
else:
return self.filter(db_topicstr__iexact=ostring)