Mercurial Repository: p/roundup/code: roundup/hyperdb.py comparison

comparison roundup/hyperdb.py @ 224:ad2c98faec97

using isinstance(blah, Foo) now instead of isFooType

author	Richard Jones <richard@users.sourceforge.net>
date	Sun, 12 Aug 2001 06:32:36 +0000
parents	18134bffab37
children	1d1848c99abe

comparison

equal deleted inserted replaced

-:5ce5fc22ac6c
+:ad2c98faec97
 # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 # FOR A PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: hyperdb.py,v 1.14 2001-08-07 00:24:42 richard Exp $
+# $Id: hyperdb.py,v 1.15 2001-08-12 06:32:36 richard Exp $
 # standard python modules
 import cPickle, re, string
 # roundup modules
 #
 # Types
 #
-class BaseType:
+class String:
-isStringType = 0
+"""An object designating a String property."""
-isDateType = 0
-isIntervalType = 0
-isLinkType = 0
-isMultilinkType = 0
-class String(BaseType):
-def __init__(self):
-"""An object designating a String property."""
-pass
 def __repr__(self):
 return '<%s>'%self.__class__
-isStringType = 1
+class Date:
-class Date(BaseType, String):
+"""An object designating a Date property."""
-isDateType = 1
+def __repr__(self):
+return '<%s>'%self.__class__
-class Interval(BaseType, String):
-isIntervalType = 1
+class Interval:
+"""An object designating an Interval property."""
-class Link(BaseType):
+def __repr__(self):
+return '<%s>'%self.__class__
+class Link:
+"""An object designating a Link property that links to a
+node in a specified class."""
 def __init__(self, classname):
-"""An object designating a Link property that links to
-nodes in a specified class."""
 self.classname = classname
 def __repr__(self):
 return '<%s to "%s">'%(self.__class__, self.classname)
-isLinkType = 1
+class Multilink:
-class Multilink(BaseType, Link):
 """An object designating a Multilink property that links
 to nodes in a specified class.
 """
-isMultilinkType = 1
+def __init__(self, classname):
+self.classname = classname
+def __repr__(self):
+return '<%s to "%s">'%(self.__class__, self.classname)
 class DatabaseError(ValueError):
 pass
 prop = self.properties[key]
 except KeyError:
 raise KeyError, '"%s" has no property "%s"'%(self.classname,
 key)
-if prop.isLinkType:
+if isinstance(prop, Link):
 if type(value) != type(''):
 raise ValueError, 'link value must be String'
-#                value = str(value)
 link_class = self.properties[key].classname
 # if it isn't a number, it's a key
 if not num_re.match(value):
 try:
 value = self.db.classes[link_class].lookup(value)
 # register the link with the newly linked node
 self.db.addjournal(link_class, value, 'link',
 (self.classname, newid, key))
-elif prop.isMultilinkType:
+elif isinstance(prop, Multilink):
 if type(value) != type([]):
 raise TypeError, 'new property "%s" not a list of ids'%key
 link_class = self.properties[key].classname
 l = []
 for entry in value:
 raise IndexError, '%s has no node %s'%(link_class, id)
 # register the link with the newly linked node
 self.db.addjournal(link_class, id, 'link',
 (self.classname, newid, key))
-elif prop.isStringType:
+elif isinstance(prop, String):
 if type(value) != type(''):
 raise TypeError, 'new property "%s" not a string'%key
-elif prop.isDateType:
+elif isinstance(prop, Date):
 if not hasattr(value, 'isDate'):
 raise TypeError, 'new property "%s" not a Date'% key
-elif prop.isIntervalType:
+elif isinstance(prop, Interval):
 if not hasattr(value, 'isInterval'):
 raise TypeError, 'new property "%s" not an Interval'% key
 for key, prop in self.properties.items():
 if propvalues.has_key(key):
 continue
-if prop.isMultilinkType:
+if isinstance(prop, Multilink):
 propvalues[key] = []
 else:
 propvalues[key] = None
 # done
 IndexError is raised.  'propname' must be the name of a property
 of this class or a KeyError is raised.
 """
 if propname == 'id':
 return nodeid
-#        nodeid = str(nodeid)
 d = self.db.getnode(self.classname, nodeid)
 if not d.has_key(propname) and default is not _marker:
 return default
 return d[propname]
 raise KeyError, '"id" is reserved'
 if self.db.journaltag is None:
 raise DatabaseError, 'Database open read-only'
-#        nodeid = str(nodeid)
 node = self.db.getnode(self.classname, nodeid)
 if node.has_key(self.db.RETIRED_FLAG):
 raise IndexError
 num_re = re.compile('^\d+$')
 for key, value in propvalues.items():
 else:
 raise ValueError, 'node with key "%s" exists'%value
 prop = self.properties[key]
-if prop.isLinkType:
+if isinstance(prop, Link):
-#                value = str(value)
 link_class = self.properties[key].classname
 # if it isn't a number, it's a key
 if type(value) != type(''):
 raise ValueError, 'link value must be String'
 if not num_re.match(value):
 # register the link with the newly linked node
 if value is not None:
 self.db.addjournal(link_class, value, 'link',
 (self.classname, nodeid, key))
-elif prop.isMultilinkType:
+elif isinstance(prop, Multilink):
 if type(value) != type([]):
 raise TypeError, 'new property "%s" not a list of ids'%key
 link_class = self.properties[key].classname
 l = []
 for entry in value:
 # register the link with the newly linked node
 self.db.addjournal(link_class, id, 'link',
 (self.classname, nodeid, key))
 l.append(id)
-elif prop.isStringType:
+elif isinstance(prop, String):
 if value is not None and type(value) != type(''):
 raise TypeError, 'new property "%s" not a string'%key
-elif prop.isDateType:
+elif isinstance(prop, Date):
 if not hasattr(value, 'isDate'):
 raise TypeError, 'new property "%s" not a Date'% key
-elif prop.isIntervalType:
+elif isinstance(prop, Interval):
 if not hasattr(value, 'isInterval'):
 raise TypeError, 'new property "%s" not an Interval'% key
 node[key] = value
 and the node's id is never reused.
 Retired nodes are not returned by the find(), list(), or lookup()
 methods, and other nodes may reuse the values of their key properties.
 """
-#        nodeid = str(nodeid)
 if self.db.journaltag is None:
 raise DatabaseError, 'Database open read-only'
 node = self.db.getnode(self.classname, nodeid)
 node[self.db.RETIRED_FLAG] = 1
 self.db.setnode(self.classname, nodeid, node)
 'nodeid' must be the id of an existing node in the class linked
 to by the given property, or an IndexError is raised.
 """
 propspec = propspec.items()
 for propname, nodeid in propspec:
-#            nodeid = str(nodeid)
 # check the prop is OK
 prop = self.properties[propname]
-if not prop.isLinkType and not prop.isMultilinkType:
+if not isinstance(prop, Link) and not isinstance(prop, Multilink):
 raise TypeError, "'%s' not a Link/Multilink property"%propname
 if not self.db.hasnode(prop.classname, nodeid):
 raise ValueError, '%s has no node %s'%(link_class, nodeid)
 # ok, now do the find
 for id in self.db.getnodeids(self.classname, cldb):
 node = self.db.getnode(self.classname, id, cldb)
 if node.has_key(self.db.RETIRED_FLAG):
 continue
 for propname, nodeid in propspec:
-#                nodeid = str(nodeid)
 property = node[propname]
-if prop.isLinkType and nodeid == property:
+if isinstance(prop, Link) and nodeid == property:
 l.append(id)
-elif prop.isMultilinkType and nodeid in property:
+elif isinstance(prop, Multilink) and nodeid in property:
 l.append(id)
 cldb.close()
 return l
 def stringFind(self, **requirements):
 The return is a list of the id of all nodes that match.
 """
 for propname in requirements.keys():
 prop = self.properties[propname]
-if not prop.isStringType:
+if isinstance(not prop, String):
 raise TypeError, "'%s' not a String property"%propname
 l = []
 cldb = self.db.getclassdb(self.classname)
 for nodeid in self.db.getnodeids(self.classname, cldb):
 node = self.db.getnode(self.classname, nodeid, cldb)
 # optimise filterspec
 l = []
 props = self.getprops()
 for k, v in filterspec.items():
 propclass = props[k]
-if propclass.isLinkType:
+if isinstance(propclass, Link):
 if type(v) is not type([]):
 v = [v]
 # replace key values with node ids
 u = []
 link_class =  self.db.classes[propclass.classname]
 raise ValueError, 'new property "%s": %s not a %s'%(
 k, entry, self.properties[k].classname)
 u.append(entry)
 l.append((0, k, u))
-elif propclass.isMultilinkType:
+elif isinstance(propclass, Multilink):
 if type(v) is not type([]):
 v = [v]
 # replace key values with node ids
 u = []
 link_class =  self.db.classes[propclass.classname]
 except:
 raise ValueError, 'new property "%s": %s not a %s'%(
 k, entry, self.properties[k].classname)
 u.append(entry)
 l.append((1, k, u))
-elif propclass.isStringType:
+elif isinstance(propclass, String):
 if '*' in v or '?' in v:
 # simple glob searching
 v = v.replace('?', '.')
 v = v.replace('*', '.*?')
 v = re.compile(v)
 # sorting is class-specific
 propclass = properties[prop]
 # String and Date values are sorted in the natural way
-if propclass.isStringType:
+if isinstance(propclass, String):
 # clean up the strings
 if av and av[0] in string.uppercase:
 av = an[prop] = av.lower()
 if bv and bv[0] in string.uppercase:
 bv = bn[prop] = bv.lower()
-if propclass.isStringType or propclass.isDateType:
+if isinstance(propclass.isStringType or propclass, Date):
 if dir == '+':
 r = cmp(av, bv)
 if r != 0: return r
 elif dir == '-':
 r = cmp(bv, av)
 # Link properties are sorted according to the value of
 # the "order" property on the linked nodes if it is
 # present; or otherwise on the key string of the linked
 # nodes; or finally on  the node ids.
-elif propclass.isLinkType:
+elif isinstance(propclass, Link):
 link = db.classes[propclass.classname]
 if av is None and bv is not None: return -1
 if av is not None and bv is None: return 1
 if av is None and bv is None: return 0
 if link.getprops().has_key('order'):
 r = cmp(bv, av)
 if r != 0: return r
 # Multilink properties are sorted according to how many
 # links are present.
-elif propclass.isMultilinkType:
+elif isinstance(propclass, Multilink):
 if dir == '+':
 r = cmp(len(av), len(bv))
 if r != 0: return r
 elif dir == '-':
 r = cmp(len(bv), len(av))
 cl.create(name=option[i], order=i)
 return hyperdb.Link(name)
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.14  2001/08/07 00:24:42  richard
+# stupid typo
+#
 # Revision 1.13  2001/08/07 00:15:51  richard
 # Added the copyright/license notice to (nearly) all files at request of
 # Bizar Software.
 #
 # Revision 1.12  2001/08/02 06:38:17  richard

Mercurial > p > roundup > code

comparison roundup/hyperdb.py @ 224:ad2c98faec97