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

Fixes issues #573 and #574

Browse source
This commit is contained in:
Duarte Cordeiro 2014-09-15 16:55:58 +01:00
parent 394ef28212
commit 5e020bb43d
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/commands/default/building.py
View file

@ -5,6 +5,7 @@ Building and world design commands
""" """
from django.conf import settings from django.conf import settings
from django.db.models import Q
from src.objects.models import ObjectDB from src.objects.models import ObjectDB
from src.locks.lockhandler import LockException from src.locks.lockhandler import LockException
from src.commands.default.muxcommand import MuxCommand from src.commands.default.muxcommand import MuxCommand
@ -1902,11 +1903,14 @@ class CmdFind(MuxCommand):
else: else:
string += "\n{g %s(%s) - %s{n" % (result.key, result.dbref, string += "\n{g %s(%s) - %s{n" % (result.key, result.dbref,
result.typeclass.path) result.typeclass.path)
if len(switches)>0:
string += "\n\n {RFilter ignored (while searching for dbref or player).{n"
else: else:
# Not a player/dbref search but a wider search; build a queryset. # Not a player/dbref search but a wider search; build a queryset.
# Searchs for key and aliases
results = ObjectDB.objects.filter(db_key__istartswith=searchstring, results = ObjectDB.objects.filter(Q(db_key__istartswith=searchstring,
id__gte=low, id__lte=high) id__gte=low, id__lte=high) | Q(db_tags__db_key__istartswith=searchstring, db_tags__db_tagtype__iexact="alias"))
if "room" in switches: if "room" in switches:
results = results.filter(db_location__isnull=True) results = results.filter(db_location__isnull=True)
if "exit" in switches: if "exit" in switches:
@ -1914,18 +1918,6 @@ class CmdFind(MuxCommand):
if "char" in switches: if "char" in switches:
results = results.filter(db_typeclass_path=CHAR_TYPECLASS) results = results.filter(db_typeclass_path=CHAR_TYPECLASS)
nresults = results.count() nresults = results.count()
if not nresults:
# no matches on the keys. Try aliases instead.
results = ObjectDB.objects.filter(db_tags__db_key__iexact=searchstring, db_tags__db_tagtype__iexact="alias")
if "room" in switches:
results = results.filter(db_location__isnull=True)
if "exit" in switches:
results = results.filter(db_destination__isnull=False)
if "char" in switches:
results = results.filter(db_typeclass_path=CHAR_TYPECLASS)
# we have to parse alias -> real object here
results = [result.dbobj for result in results]
nresults = len(results)
restrictions = "" restrictions = ""
if self.switches: if self.switches: