largish changes as a start of splitting off bits and pieces to allow more

flexible installation / database back-ends

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@22 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/CHANGES b/CHANGES
index 262e9e8911cdf26180c7b1c9c19acee97dd0e7b8..29a1d69f54f39419c88954a15984da52edd41223 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -51,4 +51,5 @@
  . Fixed handling of None String property in grouped list headings
  . Fixed adding new issue with no change note
  . Added an issue priority of support
-
+ . Fixed values in text input fields which contained quotes (") are now
+   quoted.

diff --git a/hyperdb.py b/hyperdb.py
index 1110390662f5cb0dce7b87cdbfff32d2d842a859..102b380bfaffdc1f6359eb2ac4cd8cef5b7ebd21 100644 (file)
--- a/hyperdb.py
+++ b/hyperdb.py
@@ -1,8 +1,22 @@
-# $Id: hyperdb.py,v 1.4 2001-07-19 06:27:07 anthonybaxter Exp $
+# $Id: hyperdb.py,v 1.5 2001-07-20 07:35:55 richard Exp $
 
-import bsddb, os, cPickle, re, string
+# standard python modules
+import cPickle, re, string
 
+# roundup modules
 import date
+
+
+RETIRED_FLAG = '__hyperdb_retired'
+
+#
+# Here's where we figure which db to use....
+# 
+import hyperdb_bsddb
+Database = hyperdb_bsddb.Database
+hyperdb_bsddb.RETIRED_FLAG = RETIRED_FLAG
+
+
 #
 # Types
 #
@@ -45,165 +59,10 @@ class Multilink(BaseType, Link):
 class DatabaseError(ValueError):
     pass
 
+
 #
-# Now the database
+# The base Class class
 #
-RETIRED_FLAG = '__hyperdb_retired'
-class Database:
-    """A database for storing records containing flexible data types."""
-
-    def __init__(self, storagelocator, journaltag=None):
-        """Open a hyperdatabase given a specifier to some storage.
-
-        The meaning of 'storagelocator' depends on the particular
-        implementation of the hyperdatabase.  It could be a file name,
-        a directory path, a socket descriptor for a connection to a
-        database over the network, etc.
-
-        The 'journaltag' is a token that will be attached to the journal
-        entries for any edits done on the database.  If 'journaltag' is
-        None, the database is opened in read-only mode: the Class.create(),
-        Class.set(), and Class.retire() methods are disabled.
-        """
-        self.dir, self.journaltag = storagelocator, journaltag
-        self.classes = {}
-
-    #
-    # Classes
-    #
-    def __getattr__(self, classname):
-        """A convenient way of calling self.getclass(classname)."""
-        return self.classes[classname]
-
-    def addclass(self, cl):
-        cn = cl.classname
-        if self.classes.has_key(cn):
-            raise ValueError, cn
-        self.classes[cn] = cl
-
-    def getclasses(self):
-        """Return a list of the names of all existing classes."""
-        l = self.classes.keys()
-        l.sort()
-        return l
-
-    def getclass(self, classname):
-        """Get the Class object representing a particular class.
-
-        If 'classname' is not a valid class name, a KeyError is raised.
-        """
-        return self.classes[classname]
-
-    #
-    # Class DBs
-    #
-    def clear(self):
-        for cn in self.classes.keys():
-            db = os.path.join(self.dir, 'nodes.%s'%cn)
-            bsddb.btopen(db, 'n')
-            db = os.path.join(self.dir, 'journals.%s'%cn)
-            bsddb.btopen(db, 'n')
-
-    def getclassdb(self, classname, mode='r'):
-        ''' grab a connection to the class db that will be used for
-            multiple actions
-        '''
-        path = os.path.join(os.getcwd(), self.dir, 'nodes.%s'%classname)
-        return bsddb.btopen(path, mode)
-
-    def addnode(self, classname, nodeid, node):
-        ''' add the specified node to its class's db
-        '''
-        db = self.getclassdb(classname, 'c')
-        db[nodeid] = cPickle.dumps(node, 1)
-        db.close()
-    setnode = addnode
-
-    def getnode(self, classname, nodeid, cldb=None):
-        ''' add the specified node to its class's db
-        '''
-        db = cldb or self.getclassdb(classname)
-        if not db.has_key(nodeid):
-            raise IndexError, nodeid
-        res = cPickle.loads(db[nodeid])
-        if not cldb: db.close()
-        return res
-
-    def hasnode(self, classname, nodeid, cldb=None):
-        ''' add the specified node to its class's db
-        '''
-        db = cldb or self.getclassdb(classname)
-        res = db.has_key(nodeid)
-        if not cldb: db.close()
-        return res
-
-    def countnodes(self, classname, cldb=None):
-        db = cldb or self.getclassdb(classname)
-        return len(db.keys())
-        if not cldb: db.close()
-        return res
-
-    def getnodeids(self, classname, cldb=None):
-        db = cldb or self.getclassdb(classname)
-        res = db.keys()
-        if not cldb: db.close()
-        return res
-
-    #
-    # Journal
-    #
-    def addjournal(self, classname, nodeid, action, params):
-        ''' Journal the Action
-        'action' may be:
-
-            'create' or 'set' -- 'params' is a dictionary of property values
-            'link' or 'unlink' -- 'params' is (classname, nodeid, propname)
-            'retire' -- 'params' is None
-        '''
-        entry = (nodeid, date.Date(), self.journaltag, action, params)
-        db = bsddb.btopen(os.path.join(self.dir, 'journals.%s'%classname), 'c')
-        if db.has_key(nodeid):
-            s = db[nodeid]
-            l = cPickle.loads(db[nodeid])
-            l.append(entry)
-        else:
-            l = [entry]
-        db[nodeid] = cPickle.dumps(l)
-        db.close()
-
-    def getjournal(self, classname, nodeid):
-        ''' get the journal for id
-        '''
-        db = bsddb.btopen(os.path.join(self.dir, 'journals.%s'%classname), 'r')
-        res = cPickle.loads(db[nodeid])
-        db.close()
-        return res
-
-    def close(self):
-        ''' Close the Database - we must release the circular refs so that
-            we can be del'ed and the underlying bsddb connections closed
-            cleanly.
-        '''
-        self.classes = None
-
-
-    #
-    # Basic transaction support
-    #
-    # TODO: well, write these methods (and then use them in other code)
-    def register_action(self):
-        ''' Register an action to the transaction undo log
-        '''
-
-    def commit(self):
-        ''' Commit the current transaction, start a new one
-        '''
-
-    def rollback(self):
-        ''' Reverse all actions from the current transaction
-        '''
-
-
 class Class:
     """The handle to a particular class of nodes in a hyperdatabase."""
 
@@ -876,53 +735,6 @@ def Choice(name, *options):
         cl.create(name=option[i], order=i)
     return hyperdb.Link(name)
 
-
-if __name__ == '__main__':
-    import pprint
-    db = Database("test_db", "richard")
-    status = Class(db, "status", name=String())
-    status.setkey("name")
-    print db.status.create(name="unread")
-    print db.status.create(name="in-progress")
-    print db.status.create(name="testing")
-    print db.status.create(name="resolved")
-    print db.status.count()
-    print db.status.list()
-    print db.status.lookup("in-progress")
-    db.status.retire(3)
-    print db.status.list()
-    issue = Class(db, "issue", title=String(), status=Link("status"))
-    db.issue.create(title="spam", status=1)
-    db.issue.create(title="eggs", status=2)
-    db.issue.create(title="ham", status=4)
-    db.issue.create(title="arguments", status=2)
-    db.issue.create(title="abuse", status=1)
-    user = Class(db, "user", username=String(), password=String())
-    user.setkey("username")
-    db.issue.addprop(fixer=Link("user"))
-    print db.issue.getprops()
-#{"title": <hyperdb.String>, "status": <hyperdb.Link to "status">,
-#"user": <hyperdb.Link to "user">}
-    db.issue.set(5, status=2)
-    print db.issue.get(5, "status")
-    print db.status.get(2, "name")
-    print db.issue.get(5, "title")
-    print db.issue.find(status = db.status.lookup("in-progress"))
-    print db.issue.history(5)
-# [(<Date 2000-06-28.19:09:43>, "ping", "create", {"title": "abuse", "status": 1}),
-# (<Date 2000-06-28.19:11:04>, "ping", "set", {"status": 2})]
-    print db.status.history(1)
-# [(<Date 2000-06-28.19:09:43>, "ping", "link", ("issue", 5, "status")),
-# (<Date 2000-06-28.19:11:04>, "ping", "unlink", ("issue", 5, "status"))]
-    print db.status.history(2)
-# [(<Date 2000-06-28.19:11:04>, "ping", "link", ("issue", 5, "status"))]
-
-    # TODO: set up some filter tests
-
 #
 # $Log: not supported by cvs2svn $
-# Revision 1.3  2001/07/19 05:52:22  anthonybaxter
-# Added CVS keywords Id and Log to all python files.
-#
-#
 

diff --git a/hyperdb_bsddb.py b/hyperdb_bsddb.py
new file mode 100644 (file)
index 0000000..422fced
--- /dev/null
+++ b/hyperdb_bsddb.py
@@ -0,0 +1,165 @@
+#$Id: hyperdb_bsddb.py,v 1.1 2001-07-20 07:35:55 richard Exp $
+
+import bsddb, os, cPickle
+import date
+
+#
+# Now the database
+#
+class Database:
+    """A database for storing records containing flexible data types."""
+
+    def __init__(self, storagelocator, journaltag=None):
+        """Open a hyperdatabase given a specifier to some storage.
+
+        The meaning of 'storagelocator' depends on the particular
+        implementation of the hyperdatabase.  It could be a file name,
+        a directory path, a socket descriptor for a connection to a
+        database over the network, etc.
+
+        The 'journaltag' is a token that will be attached to the journal
+        entries for any edits done on the database.  If 'journaltag' is
+        None, the database is opened in read-only mode: the Class.create(),
+        Class.set(), and Class.retire() methods are disabled.
+        """
+        self.dir, self.journaltag = storagelocator, journaltag
+        self.classes = {}
+
+    #
+    # Classes
+    #
+    def __getattr__(self, classname):
+        """A convenient way of calling self.getclass(classname)."""
+        return self.classes[classname]
+
+    def addclass(self, cl):
+        cn = cl.classname
+        if self.classes.has_key(cn):
+            raise ValueError, cn
+        self.classes[cn] = cl
+
+    def getclasses(self):
+        """Return a list of the names of all existing classes."""
+        l = self.classes.keys()
+        l.sort()
+        return l
+
+    def getclass(self, classname):
+        """Get the Class object representing a particular class.
+
+        If 'classname' is not a valid class name, a KeyError is raised.
+        """
+        return self.classes[classname]
+
+    #
+    # Class DBs
+    #
+    def clear(self):
+        for cn in self.classes.keys():
+            db = os.path.join(self.dir, 'nodes.%s'%cn)
+            bsddb.btopen(db, 'n')
+            db = os.path.join(self.dir, 'journals.%s'%cn)
+            bsddb.btopen(db, 'n')
+
+    def getclassdb(self, classname, mode='r'):
+        ''' grab a connection to the class db that will be used for
+            multiple actions
+        '''
+        path = os.path.join(os.getcwd(), self.dir, 'nodes.%s'%classname)
+        return bsddb.btopen(path, mode)
+
+    def addnode(self, classname, nodeid, node):
+        ''' add the specified node to its class's db
+        '''
+        db = self.getclassdb(classname, 'c')
+        db[nodeid] = cPickle.dumps(node, 1)
+        db.close()
+    setnode = addnode
+
+    def getnode(self, classname, nodeid, cldb=None):
+        ''' add the specified node to its class's db
+        '''
+        db = cldb or self.getclassdb(classname)
+        if not db.has_key(nodeid):
+            raise IndexError, nodeid
+        res = cPickle.loads(db[nodeid])
+        if not cldb: db.close()
+        return res
+
+    def hasnode(self, classname, nodeid, cldb=None):
+        ''' add the specified node to its class's db
+        '''
+        db = cldb or self.getclassdb(classname)
+        res = db.has_key(nodeid)
+        if not cldb: db.close()
+        return res
+
+    def countnodes(self, classname, cldb=None):
+        db = cldb or self.getclassdb(classname)
+        return len(db.keys())
+        if not cldb: db.close()
+        return res
+
+    def getnodeids(self, classname, cldb=None):
+        db = cldb or self.getclassdb(classname)
+        res = db.keys()
+        if not cldb: db.close()
+        return res
+
+    #
+    # Journal
+    #
+    def addjournal(self, classname, nodeid, action, params):
+        ''' Journal the Action
+        'action' may be:
+
+            'create' or 'set' -- 'params' is a dictionary of property values
+            'link' or 'unlink' -- 'params' is (classname, nodeid, propname)
+            'retire' -- 'params' is None
+        '''
+        entry = (nodeid, date.Date(), self.journaltag, action, params)
+        db = bsddb.btopen(os.path.join(self.dir, 'journals.%s'%classname), 'c')
+        if db.has_key(nodeid):
+            s = db[nodeid]
+            l = cPickle.loads(db[nodeid])
+            l.append(entry)
+        else:
+            l = [entry]
+        db[nodeid] = cPickle.dumps(l)
+        db.close()
+
+    def getjournal(self, classname, nodeid):
+        ''' get the journal for id
+        '''
+        db = bsddb.btopen(os.path.join(self.dir, 'journals.%s'%classname), 'r')
+        res = cPickle.loads(db[nodeid])
+        db.close()
+        return res
+
+    def close(self):
+        ''' Close the Database - we must release the circular refs so that
+            we can be del'ed and the underlying bsddb connections closed
+            cleanly.
+        '''
+        self.classes = None
+
+
+    #
+    # Basic transaction support
+    #
+    # TODO: well, write these methods (and then use them in other code)
+    def register_action(self):
+        ''' Register an action to the transaction undo log
+        '''
+
+    def commit(self):
+        ''' Commit the current transaction, start a new one
+        '''
+
+    def rollback(self):
+        ''' Reverse all actions from the current transaction
+        '''
+
+#
+#$Log: not supported by cvs2svn $
+

diff --git a/roundup_cgi.py b/roundup_cgi.py
index 6415d40ee62d4ec90f57573546cda2a516d8ade8..422af519d85fb61001b7af754e6465687f1fcfaa 100644 (file)
--- a/roundup_cgi.py
+++ b/roundup_cgi.py
@@ -1,4 +1,4 @@
-# $Id: roundup_cgi.py,v 1.6 2001-07-20 00:53:20 richard Exp $
+# $Id: roundup_cgi.py,v 1.7 2001-07-20 07:35:55 richard Exp $
 
 import os, cgi, pprint, StringIO, urlparse, re, traceback
 
@@ -264,7 +264,7 @@ class Client:
                             summary = re.split(r'\n\r?', note)[0]
                         else:
                             summary = note
-                        m.append('\n%s\n'%note)
+                        m.insert(0, '%s\n\n'%note)
                     else:
                         if len(changed) > 1:
                             plural = 's were'
@@ -273,7 +273,7 @@ class Client:
                         summary = 'This %s has been edited through the web '\
                             'and the %s value%s changed.'%(cn,
                             ', '.join(changed), plural)
-                        m.append('\n%s\n'%summary)
+                        m.insert(0, '%s\n\n'%summary)
 
                     # now create the message
                     content = '\n'.join(m)
@@ -488,6 +488,9 @@ class Client:
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.6  2001/07/20 00:53:20  richard
+# Default index now filters out the resolved issues ;)
+#
 # Revision 1.5  2001/07/20 00:17:16  richard
 # Fixed adding a new issue when there is no __note
 #

diff --git a/roundupdb.py b/roundupdb.py
index 72ee084bc60e037115170be476f5f2ea5ae945e1..356abb2d5dacdf40dea0ca55dd5672be9cddc8ea 100644 (file)
--- a/roundupdb.py
+++ b/roundupdb.py
@@ -1,4 +1,4 @@
-# $Id: roundupdb.py,v 1.5 2001-07-20 00:22:50 richard Exp $
+# $Id: roundupdb.py,v 1.6 2001-07-20 07:35:55 richard Exp $
 
 import re, os, smtplib, socket
 
@@ -18,6 +18,8 @@ class Database(hyperdb.Database):
 
     def uidFromAddress(self, address):
         ''' address is from the rfc822 module, and therefore is (name, addr)
+
+            user is created if they don't exist in the db already
         '''
         (realname, address) = address
         users = self.user.stringFind(address=address)
@@ -374,6 +376,10 @@ def initDB(storagelocator, password):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.5  2001/07/20 00:22:50  richard
+# Priority list changes - removed the redundant TODO and added support. See
+# roundup-devel for details.
+#
 # Revision 1.4  2001/07/19 06:27:07  anthonybaxter
 # fixing (manually) the (dollarsign)Log(dollarsign) entries caused by
 # my using the magic (dollarsign)Id(dollarsign) and (dollarsign)Log(dollarsign)

diff --git a/test.py b/test.py
new file mode 100644 (file)
index 0000000..fb8faea
--- /dev/null
+++ b/test.py
@@ -0,0 +1,41 @@
+
+import pprint
+db = Database("test_db", "richard")
+status = Class(db, "status", name=String())
+status.setkey("name")
+print db.status.create(name="unread")
+print db.status.create(name="in-progress")
+print db.status.create(name="testing")
+print db.status.create(name="resolved")
+print db.status.count()
+print db.status.list()
+print db.status.lookup("in-progress")
+db.status.retire(3)
+print db.status.list()
+issue = Class(db, "issue", title=String(), status=Link("status"))
+db.issue.create(title="spam", status=1)
+db.issue.create(title="eggs", status=2)
+db.issue.create(title="ham", status=4)
+db.issue.create(title="arguments", status=2)
+db.issue.create(title="abuse", status=1)
+user = Class(db, "user", username=String(), password=String())
+user.setkey("username")
+db.issue.addprop(fixer=Link("user"))
+print db.issue.getprops()
+#{"title": <hyperdb.String>, "status": <hyperdb.Link to "status">,
+#"user": <hyperdb.Link to "user">}
+db.issue.set(5, status=2)
+print db.issue.get(5, "status")
+print db.status.get(2, "name")
+print db.issue.get(5, "title")
+print db.issue.find(status = db.status.lookup("in-progress"))
+print db.issue.history(5)
+# [(<Date 2000-06-28.19:09:43>, "ping", "create", {"title": "abuse", "status": 1}),
+# (<Date 2000-06-28.19:11:04>, "ping", "set", {"status": 2})]
+print db.status.history(1)
+# [(<Date 2000-06-28.19:09:43>, "ping", "link", ("issue", 5, "status")),
+# (<Date 2000-06-28.19:11:04>, "ping", "unlink", ("issue", 5, "status"))]
+print db.status.history(2)
+# [(<Date 2000-06-28.19:11:04>, "ping", "link", ("issue", 5, "status"))]
+
+# TODO: set up some filter tests