fixed ZRoundup - mostly changes to classic template

Author: Richard Jones

CHANGES.txt

@@ -7,7 +7,8 @@ Feature:
 - support setgid and running on port < 1024 (sf patch 777528)
 - using Zope3's test runner now, allowing GC checks, nicer controls and
   coverage analysis
-- added postgresql backend (originally from patch #761740, many changes since)
+- added postgresql backend (originally from sf patch 761740, many changes
+  since)
 - all RDBMS backends now have indexes on several columns
 - Change nosymessage and send_message to accept msgid=None (RFE #707235).
 
@@ -17,18 +18,19 @@ Fixed:
   couple of cases
 - HTML 4.01 validation on the 'classic' backend
 - Messages to the mailgw can be about classes other than issues now.
-- Signature matching is more precise (bug #827775).
-- Anonymous user can no longer edit or view itself (bug #828901).
-- Corrected typo in installation.html (bug #822967).
+- Signature matching is more precise (sf bug 827775).
+- Anonymous user can no longer edit or view itself (sf bug 828901).
+- Corrected typo in installation.html (sf bug 822967).
 - Clarified listTemplates docstring.
 - Print a nicer error message when the address is already in use 
-  (bug #798659).
+  (sf bug 798659).
 - Remove empty lines before sending strings off to the csv parser 
-  (bug #821364).
-- Centralised conversion of user-input data to hyperdb values (bug #802405,
-  bug #817217, rfe #816994)
+  (sf bug 821364).
+- Centralised conversion of user-input data to hyperdb values (sf bug 802405,
+  sf bug 817217, sf rfe 816994)
 - recalculate SHA on template files when installed tracker used as
   template (sf bug 827510)
+- fixed ZRoundup (sf bug 624380)
 
 Cleanup:
 - Replace curuserid attribute on Database with the extended getuid() method.

doc/upgrading.txt

@@ -21,6 +21,29 @@ be replaced with a call to Database.getuid().
 might still need to create an index "create index ids_name_idx on 
 ids(name)".
 
+0.7.0 ZRoundup changes
+----------------------
+
+The templates in your tracker's html directory will need updating if you
+wish to use ZRoundup. If you've not modified those files (or some of them),
+you may just copy the new versions from the Roundup source in the
+templates/classic/html directory.
+
+If you have modified the html files, then you'll need to manually edit them
+to change all occurances of special form variables from using the colon ":"
+special character to the at "@" special character. That is, variables such
+as::
+
+  :action :required :template :remove:messages ...
+
+should become:
+
+  @action @required @template @remove@messages ...
+
+Note that ``tal:`` statements are unaffected. So are TAL expression type
+prefixes such as ``python:`` and ``string:``. Please ask on the
+roundup-users mailing list for help if you're unsure.
+
 
 Migrating from 0.6.x to 0.6.3
 =============================

frontends/ZRoundup/ZRoundup.py

@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: ZRoundup.py,v 1.16 2002-10-18 03:34:58 richard Exp $
+# $Id: ZRoundup.py,v 1.17 2003-11-12 01:00:58 richard Exp $
 #
 ''' ZRoundup module - exposes the roundup web interface to Zope
 
@@ -26,11 +26,6 @@
 independently of Zope. The roundup code is kept in memory though, and it
 runs in the same server as all your other Zope stuff, so it does have _some_
 advantages over regular CGI :)
-
-It also means that any requests which specify :filter, :columns or :sort
-_must_ be done using a GET, so that this interface can re-parse the
-QUERY_STRING. Zope interprets the ':' as a special character, and the special
-args are lost to it.
 '''
 
 import urlparse
@@ -142,16 +137,7 @@ def roundup_opendb(self):
             # the last element is the name
             env['TRACKER_NAME'] = path_components[-1]
 
-        if env['REQUEST_METHOD'] == 'GET':
-            # force roundup to re-parse the request because Zope fiddles
-            # with it and we lose all the :filter, :columns, etc goodness
-            form = None
-        else:
-            # For some reason, CRs are embeded in multiline notes.
-            # It doesn't occur with apache/roundup.cgi, though.
-            form = FormWrapper(self.REQUEST.form)
-
-        print (env['SCRIPT_NAME'], env['PATH_INFO'])
+        form = FormWrapper(self.REQUEST.form)
         return instance.Client(instance, request, env, form)
 
     security.declareProtected('View', 'index_html')
@@ -160,7 +146,7 @@ def index_html(self):
         '''
         # Redirect misdirected requests -- bugs 558867 , 565992
         # PATH_INFO, as defined by the CGI spec, has the *real* request path
-        orig_path = self.REQUEST.environ[ 'PATH_INFO' ]
+        orig_path = self.REQUEST.environ['PATH_INFO']
         if orig_path[-1] != '/' : 
             url = urlparse.urlparse( self.absolute_url() )
             url = list( url ) # make mutable
@@ -179,31 +165,30 @@ def index_html(self):
     def __getitem__(self, item):
         '''All other URL accesses are passed throuh to roundup
         '''
-        return PathElement(self, item)
+        return PathElement(self, item).__of__(self)
 
-class PathElement(Item, Implicit, Persistent):
-    def __init__(self, parent, path):
-        self.parent = parent
+class PathElement(Item, Implicit):
+    def __init__(self, zr, path):
+        self.zr = zr
         self.path = path
 
     def __getitem__(self, item):
         ''' Get a subitem.
         '''
-        return PathElement(self.path + '/' + item)
+        return PathElement(self.zr, self.path + '/' + item).__of__(self)
 
-    def __call__(self, *args, **kw):
+    def index_html(self, REQUEST=None):
         ''' Actually call through to roundup to handle the request.
         '''
-        print '*****', self.path
         try:
-            client = self.parent.roundup_opendb()
+            client = self.zr.roundup_opendb()
             # fake the path that roundup should use
             client.path = self.path
             # and call roundup to do something 
             client.main()
             return ''
         except NotFound:
-            raise 'NotFound', self.REQUEST.URL
+            raise 'NotFound', REQUEST.URL
             pass
         except:
             import traceback

roundup/backends/back_mysql.py

@@ -53,7 +53,7 @@ class Database(Database):
     mysql_backend = 'InnoDB'
     #mysql_backend = 'BDB'    # much slower, only use if you have no choice
 
-    def open_connection(self):
+    def sql_open_connection(self):
         db = getattr(self.config, 'MYSQL_DATABASE')
         try:
             self.conn = MySQLdb.connect(*db)
@@ -81,9 +81,6 @@ def open_connection(self):
                 self.mysql_backend)
             self.sql("CREATE INDEX ids_name_idx on ids(name)")
 
-    def close(self):
-        self.conn.close()
-
     def __repr__(self):
         return '<myroundsql 0x%x>'%id(self)
 

roundup/backends/back_postgresql.py

@@ -8,15 +8,15 @@
 # psycopg backend for roundup
 #
 
-from roundup.backends.rdbms_common import *
+from roundup import hyperdb, date
 from roundup.backends import rdbms_common
 import psycopg
 import os, shutil, popen2
 
-class Database(Database):
+class Database(rdbms_common.Database):
     arg = '%s'
 
-    def open_connection(self):
+    def sql_open_connection(self):
         db = getattr(self.config, 'POSTGRESQL_DATABASE')
         try:
             self.conn = psycopg.connect(**db)
@@ -33,18 +33,9 @@ def open_connection(self):
             self.sql("CREATE TABLE schema (schema TEXT)")
             self.sql("CREATE TABLE ids (name VARCHAR(255), num INT4)")
 
-    def close(self):
-        self.conn.close()
-
     def __repr__(self):
         return '<roundpsycopgsql 0x%x>' % id(self)
 
-    def sql_fetchone(self):
-        return self.cursor.fetchone()
-
-    def sql_fetchall(self):
-        return self.cursor.fetchall()
-
     def sql_stringquote(self, value):
         ''' psycopg.QuotedString returns a "buffer" object with the
             single-quotes around it... '''
@@ -56,44 +47,6 @@ def sql_index_exists(self, table_name, index_name):
         self.cursor.execute(sql, (table_name, index_name))
         return self.cursor.fetchone()[0]
 
-    def save_dbschema(self, schema):
-        s = repr(self.database_schema)
-        self.sql('INSERT INTO schema VALUES (%s)', (s,))
-    
-    def load_dbschema(self):
-        self.cursor.execute('SELECT schema FROM schema')
-        schema = self.cursor.fetchone()
-        if schema:
-            return eval(schema[0])
-
-    def save_journal(self, classname, cols, nodeid, journaldate,
-                     journaltag, action, params):
-        params = repr(params)
-        entry = (nodeid, journaldate, journaltag, action, params)
-
-        a = self.arg
-        sql = 'INSERT INTO %s__journal (%s) values (%s, %s, %s, %s, %s)'%(
-            classname, cols, a, a, a, a, a)
-
-        if __debug__:
-          print >>hyperdb.DEBUG, 'addjournal', (self, sql, entry)
-
-        self.cursor.execute(sql, entry)
-
-    def load_journal(self, classname, cols, nodeid):
-        sql = 'SELECT %s FROM %s__journal WHERE nodeid = %s' % (
-            cols, classname, self.arg)
-        
-        if __debug__:
-            print >>hyperdb.DEBUG, 'getjournal', (self, sql, nodeid)
-
-        self.cursor.execute(sql, (nodeid,))
-        res = []
-        for nodeid, date_stamp, user, action, params in self.cursor.fetchall():
-            params = eval(params)
-            res.append((nodeid, date.Date(date_stamp), user, action, params))
-        return res
-
     def create_class_table(self, spec):
         cols, mls = self.determine_columns(spec.properties.items())
         cols.append('id')
@@ -126,79 +79,10 @@ def create_multilink_table(self, spec, ml):
 
         self.cursor.execute(sql)
 
-class PsycopgClass:
-    def find(self, **propspec):
-        """Get the ids of nodes in this class which link to the given nodes."""
-        
-        if __debug__:
-            print >>hyperdb.DEBUG, 'find', (self, propspec)
-
-        # shortcut
-        if not propspec:
-            return []
-
-        # validate the args
-        props = self.getprops()
-        propspec = propspec.items()
-        for propname, nodeids in propspec:
-            # check the prop is OK
-            prop = props[propname]
-            if not isinstance(prop, Link) and not isinstance(prop, Multilink):
-                raise TypeError, "'%s' not a Link/Multilink property"%propname
-
-        # first, links
-        l = []
-        where = []
-        allvalues = ()
-        a = self.db.arg
-        for prop, values in propspec:
-            if not isinstance(props[prop], hyperdb.Link):
-                continue
-            if type(values) is type(''):
-                allvalues += (values,)
-                where.append('_%s = %s' % (prop, a))
-            elif values is None:
-                where.append('_%s is NULL'%prop)
-            else:
-                allvalues += tuple(values.keys())
-                where.append('_%s in (%s)' % (prop, ','.join([a]*len(values))))
-        tables = []
-        if where:
-            self.db.sql('SELECT id AS nodeid FROM _%s WHERE %s' % (
-                self.classname, ' and '.join(where)), allvalues)
-            l += [x[0] for x in self.db.sql_fetchall()]
-
-        # now multilinks
-        for prop, values in propspec:
-            vals = ()
-            if not isinstance(props[prop], hyperdb.Multilink):
-                continue
-            if type(values) is type(''):
-                vals = (values,)
-                s = a
-            else:
-                vals = tuple(values.keys())
-                s = ','.join([a]*len(values))
-            query = 'SELECT nodeid FROM %s_%s WHERE linkid IN (%s)'%(
-                self.classname, prop, s)
-            self.db.sql(query, vals)
-            l += [x[0] for x in self.db.sql_fetchall()]
-            
-        if __debug__:
-            print >>hyperdb.DEBUG, 'find ... ', l
-
-        # Remove duplicated ids
-        d = {}
-        for k in l:
-            d[k] = 1
-        return d.keys()
-
-        return l
-
-class Class(PsycopgClass, rdbms_common.Class):
+class Class(rdbms_common.Class):
     pass
-class IssueClass(PsycopgClass, rdbms_common.IssueClass):
+class IssueClass(rdbms_common.IssueClass):
     pass
-class FileClass(PsycopgClass, rdbms_common.FileClass):
+class FileClass(rdbms_common.FileClass):
     pass