From 8207df32fa188a2ccf33e49e00c793946eda3d7c Mon Sep 17 00:00:00 2001 From: richard Date: Tue, 11 Jun 2002 06:52:03 +0000 Subject: [PATCH] . #564271 ] find() and new properties git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@777 57a73879-2fb5-44c3-a270-3262357dd7e2 --- CHANGES.txt | 2 ++ roundup/hyperdb.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 55e4ac6..cbb45a9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -66,6 +66,8 @@ Fixed: . build htmlbase if tests are run using CVS checkout . #565979 ] code error in hyperdb.Class.find . #565996 ] The "Attach a File to this Issue" fails + . #564271 ] find() and new properties + 2002-03-25 - 0.4.1 Feature: diff --git a/roundup/hyperdb.py b/roundup/hyperdb.py index 78a0d76..392363f 100644 --- a/roundup/hyperdb.py +++ b/roundup/hyperdb.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: hyperdb.py,v 1.67 2002-06-11 05:02:37 richard Exp $ +# $Id: hyperdb.py,v 1.68 2002-06-11 06:52:03 richard Exp $ __doc__ = """ Hyperdatabase implementation, especially field types. @@ -793,11 +793,14 @@ class Class: # ok, now do the find cldb = self.db.getclassdb(self.classname) l = [] - for id in self.db.getnodeids(self.classname, cldb): - node = self.db.getnode(self.classname, id, cldb) + for id in self.db.getnodeids(self.classname, db=cldb): + node = self.db.getnode(self.classname, id, db=cldb) if node.has_key(self.db.RETIRED_FLAG): continue for propname, nodeid in propspec: + # can't test if the node doesn't have this property + if not node.has_key(propname): + continue prop = self.properties[propname] property = node[propname] if isinstance(prop, Link) and nodeid == property: @@ -1158,6 +1161,9 @@ def Choice(name, db, *options): # # $Log: not supported by cvs2svn $ +# Revision 1.67 2002/06/11 05:02:37 richard +# . #565979 ] code error in hyperdb.Class.find +# # Revision 1.66 2002/05/25 07:16:24 rochecompaan # Merged search_indexing-branch with HEAD # -- 2.30.2