Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move standard_objsearch to Objects.search_for_object. Also make sure @alias only accepts alphanumeric strings.

Browse source
This commit is contained in:
Greg Taylor 2009-01-25 03:11:52 +00:00
parent eacdf8b33c
commit 7ff97599be
7 changed files with 93 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/commands/search.py
View file

@ -84,8 +84,7 @@ def build_query(source_object, search_query, search_player, search_type,
# Look up an Object matching the player search query
if search_player:
# Replace the string variable with an Object reference
search_player = Object.objects.standard_objsearch(source_object,
search_player)
search_player = source_object.search_for_object(search_player)
# Use standard_objsearch to handle duplicate/nonexistant results
if not search_player:
return None
@ -121,9 +120,8 @@ def build_query(source_object, search_query, search_player, search_type,
search_query = search_query.filter(name__icontains=search_restriction,
type=defines_global.OTYPE_PLAYER)
elif search_type == "zone":
zone_obj = Object.objects.standard_objsearch(source_object,
search_restriction)
# Use standard_objsearch to handle duplicate/nonexistant results.
zone_obj = source_object.search_for_object(search_restriction)
# Use search_for_object to handle duplicate/nonexistant results.
if not zone_obj:
return None
search_query = search_query.filter(zone=zone_obj)