Added the fabricated property "id".

Author: Richard Jones

roundup/hyperdb.py

@@ -1,4 +1,4 @@
-# $Id: hyperdb.py,v 1.4 2001-07-27 06:25:35 richard Exp $
+# $Id: hyperdb.py,v 1.5 2001-07-29 04:05:37 richard Exp $
 
 # standard python modules
 import cPickle, re, string
@@ -98,8 +98,13 @@ def create(self, **propvalues):
         If an id in a link or multilink property does not refer to a valid
         node, an IndexError is raised.
         """
+        if propvalues.has_key('id'):
+            raise KeyError, '"id" is reserved'
+
         if self.db.journaltag is None:
             raise DatabaseError, 'Database open read-only'
+
+        # new node's id
         newid = str(self.count() + 1)
 
         # validate propvalues
@@ -194,6 +199,8 @@ def get(self, nodeid, propname):
         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)
         return d[propname]
@@ -224,8 +231,13 @@ class or a KeyError is raised.
         """
         if not propvalues:
             return
+
+        if propvalues.has_key('id'):
+            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):
@@ -696,7 +708,9 @@ def count(self):
 
     def getprops(self):
         """Return a dictionary mapping property names to property objects."""
-        return self.properties
+        d = self.properties.copy()
+        d['id'] = String()
+        return d
 
     def addprop(self, **properties):
         """Add properties to this class.
@@ -753,6 +767,11 @@ def Choice(name, *options):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.4  2001/07/27 06:25:35  richard
+# Fixed some of the exceptions so they're the right type.
+# Removed the str()-ification of node ids so we don't mask oopsy errors any
+# more.
+#
 # Revision 1.3  2001/07/27 05:17:14  richard
 # just some comments
 #

roundup/roundupdb.py

@@ -1,4 +1,4 @@
-# $Id: roundupdb.py,v 1.3 2001-07-23 07:14:41 richard Exp $
+# $Id: roundupdb.py,v 1.4 2001-07-29 04:05:37 richard Exp $
 
 import re, os, smtplib, socket
 
@@ -107,8 +107,9 @@ def getprops(self):
         d['creator'] = hyperdb.Link("user")
         return d
 
-    # New methods:
-
+    #
+    # Detector interface
+    #
     def audit(self, event, detector):
         """Register a detector
         """
@@ -119,6 +120,7 @@ def react(self, event, detector):
         """
         self.reactors[event].append(detector)
 
+
 class FileClass(Class):
     def create(self, **propvalues):
         ''' snaffle the file propvalue and store in a file
@@ -245,6 +247,9 @@ def sendmessage(self, nodeid, msgid):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.3  2001/07/23 07:14:41  richard
+# Moved the database backends off into backends.
+#
 # Revision 1.2  2001/07/22 12:09:32  richard
 # Final commit of Grande Splite
 #