From 5a5de51a5c6efe1575259cd694c379a5fc4bd306 Mon Sep 17 00:00:00 2001 From: Daniel Benoy Date: Sat, 27 Jul 2013 04:25:01 -0400 Subject: [PATCH] Reimplemented get_dbref_range It always returned every object in the database --- src/typeclasses/managers.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/typeclasses/managers.py b/src/typeclasses/managers.py index e3630efe47..4ca3453d51 100644 --- a/src/typeclasses/managers.py +++ b/src/typeclasses/managers.py @@ -152,14 +152,12 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager): Return all objects inside and including the given boundaries. """ - min_dbref, max_dbref = self.dbref(min_dbref), self.dbref(max_dbref) - if not min_dbref or not max_dbref: - return self.all() - if not min_dbref: - return self.filter(id__lte=max_dbref) - elif not max_dbref: - return self.filter(id__gte=min_dbref) - return self.filter(id__gte=min_dbref).filter(id__lte=min_dbref) + retval = super(TypedObjectManager, self).all() + if min_dbref != None: + retval = retval.filter(id__gte=self.dbref(min_dbref, reqhash=False)) + if max_dbref != None: + retval = retval.filter(id__lte=self.dbref(max_dbref, reqhash=False)) + return retval def object_totals(self): """