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

Removed a mis-placed line in the object search that caused spurious errors in some commands.

Browse source
This commit is contained in:
Griatch 2012-03-20 19:59:29 +01:00
parent f09bfdf1d6
commit 81e7a31072
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/objects/manager.py
View file

@ -7,6 +7,8 @@ from django.db.models.fields import exceptions
from src.typeclasses.managers import TypedObjectManager from src.typeclasses.managers import TypedObjectManager
from src.typeclasses.managers import returns_typeclass, returns_typeclass_list from src.typeclasses.managers import returns_typeclass, returns_typeclass_list
from src.utils import utils from src.utils import utils
from src.utils.utils import to_unicode
from src.utils import logger
# Try to use a custom way to parse id-tagged multimatches. # Try to use a custom way to parse id-tagged multimatches.
@ -58,7 +60,7 @@ class ObjectManager(TypedObjectManager):
the search criterion (e.g. in local_and_global_search). the search criterion (e.g. in local_and_global_search).
search_string: (string) The name or dbref to search for. search_string: (string) The name or dbref to search for.
""" """
search_string = utils.to_unicode(search_string).lstrip('*') search_string = to_unicode(search_string).lstrip('*')
dbref = self.dbref(search_string) dbref = self.dbref(search_string)
if not dbref: if not dbref:
# not a dbref. Search by name. # not a dbref. Search by name.
@ -104,7 +106,7 @@ class ObjectManager(TypedObjectManager):
if exact: if exact:
return [attr.obj for attr in attrs if attribute_value == attr.value] return [attr.obj for attr in attrs if attribute_value == attr.value]
else: else:
return [attr.obj for attr in attrs if utils.to_unicode(attribute_value) in str(attr.value)] return [attr.obj for attr in attrs if to_unicode(attribute_value) in str(attr.value)]
@returns_typeclass_list @returns_typeclass_list
def get_objs_with_db_property(self, property_name, location=None): def get_objs_with_db_property(self, property_name, location=None):
@ -208,15 +210,16 @@ class ObjectManager(TypedObjectManager):
if location and ostring == 'here': if location and ostring == 'here':
return [location] return [location]
if caller and ostring in ['me', 'self']: if caller and to_unicode(ostring) in ('me', 'self'):
return [caller] return [caller]
if caller and ostring in ['*me', '*self']: if caller and to_unicode(ostring) in ('*me', '*self'):
return [caller] return [caller]
# Test if we are looking for an object controlled by a # Test if we are looking for an object controlled by a
# specific player # specific player
if utils.to_unicode(ostring).startswith("*"): #logger.log_infomsg(str(type(ostring)))
if to_unicode(ostring).startswith("*"):
# Player search - try to find obj by its player's name # Player search - try to find obj by its player's name
player_match = self.get_object_with_player(ostring) player_match = self.get_object_with_player(ostring)
if player_match is not None: if player_match is not None: