Changeset 4088

Timestamp:

07/30/08 15:03:51 (4 months ago)

Author:

gotoh

Message:

Unify the versions for 0.9, 0.10, 0.11 and 0.12.
Tested on 0.9.6, 0.10.5, 0.11 and 0.12dev-r7419.

Files:

• ticketboxmacro/0.11/TicketBox.py (modified) (9 diffs)

ticketboxmacro/0.11/TicketBox.py

@@ -12 +12 @@
-[[TicketBox([report:1])]]              ... alternate format of report
-[[TicketBox([report:9?name=val])]]     ... report with dynamic variable
-
+
+
-[[TicketBox(500pt,{1})]]               ... with box width as 50 point
-[[TicketBox(200px,{1})]]               ... with box width as 200 pixel
@@ -41 +42 @@
-import re
-import string
+from trac import __version__ as version
-from trac.wiki.formatter import wiki_to_oneliner
-from trac.ticket.report import ReportModule
-from trac.ticket.model import Ticket
+try:
+    from trac.ticket.query import Query
+    has_query = True
+except:
+    has_query = False
+
+## Mock request object for trac 0.10.x or before
+class MockReq(object):
+    def __init__(self, hdf):
+        self.hdf = dict()
+        self.args = {}
+        self.authname = hdf.getValue('trac.authname', 'anonymous')
+        
+
+# get trac version
+verstr = re.compile('([0-9.]+).*').match(version).group(1)
+ver = [int(x) for x in verstr.split(".")]
+
+if ver <= [0, 10]:
+    report_query_field = 'sql'
+    call_args = dict(get_sql=[],
+                     sql_sub_vars=['req', 'sql', 'dv'],
+                     )
+elif ver < [0, 11]:
+    report_query_field = 'query'
+    call_args = dict(get_sql=[],
+                     sql_sub_vars=['req', 'sql', 'dv', 'db'],
+                     )
+else:
+    report_query_field = 'query'
+    call_args = dict(get_sql=['req'],
+                     sql_sub_vars=['sql', 'dv', 'db'],
+                     )
-
-## default style values
-default_styles = { "float": "right",
+                   "color": None,
-                   "background": "#f7f7f0",
-                   "width": "25%",
+                   "border-color": None,
-                   }
-
@@ -54 +91 @@
-            r"{(?P<rptnum>\d+)}",
-            r"\[report:(?P<rptnum2>\d+)(?P<dv>\?.*)?\]",
+            r"\[query:(?P<query>[^\]]*)\]",
-            r"(?P<width>\d+(pt|px|%))",
-            r"(?P<title>'[^']*'|\"[^\"]*\")",
@@ -134 +172 @@
-        result.append(item)
-    return result
+
+def call(func, vars):
+    from win32api import OutputDebugString as dbg
+    names = call_args[func.__name__]
+    args = [vars[x] for x in names]
+    dbg('call: ' + ', '.join(['%s=%s' % (k,v) for k,v in zip(names, args)]))
+    return func(*args)
-    
-
-
-
+
-    args = parse(content or '')
-    items = []
@@ -169 +212 @@
-            elif kw == 'nosort':
-                nosort = True
+            elif kw == 'nowrap':
+                styles['white-space'] = 'nowrap'
-            elif kw in styles and kwarg:
-                styles[kw] = kwarg
-    # pick up ticket numbers and report numbers
-    for arg in args:
+        sql = None
+        params = []
-        match = args_re.match(arg)
+        id_name = ticket
+        sidx = iidx = -1
-        if not match:
-            continue
-        elif match.group('tktnum'):
-            items.append(int(match.group('tktnum')))
+        elif match.group('query'):
+            if not has_query:
+                raise Exception('You cannot use trac query for this version of trac')
+            q = Query.from_string(env, match.group('query'))
+            sql, params = call(q.get_sql, locals())
+            id_name = 'id'
-        elif match.group('rptnum') or match.group('rptnum2'):
-            num = match.group('rptnum') or match.group('rptnum2')
-            dv = {}
-            # username, do not override if specified
-            if not dv.has_key('USER'):
-                dv['USER'] = req.authname
-            if match.group('dv'):
-                for expr in string.split(match.group('dv')[1:], '&'):
-                    k, v = string.split(expr, '=')
-                    dv[k] = v
-            #env.log.debug('dynamic variables = %s' % dv)
-            db = env.get_db_cnx()
-            curs = db.cursor()
-            try:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                # NOTE: sql_sub_vars() takes different arguments in
-                #       several trac versions.
@@ -200 +262 @@
-                #       For 0.10.x, arguments are (req, query, args, db)
-                #       For 0.11 or later, arguments are (query, args, db)
-
-
-
+
+
+
+
+
+
-                rows = curs.fetchall()
-                if rows:
-                    descriptions = [desc[0] for desc in curs.description]
-                    try:
-dx = descriptions.index(ticket
+idx = descriptions.index(id_name
-                    except:
-
-ticket
+ number
+id_name
-                    if summary:
-                        try:
@@ -218 +283 @@
-                                            % summary)
-                    for row in rows:
-
-
-
+i
+ and 0 <= sidx
+i
-            finally:
-
-
-
-
+
+
-    if summary:
-        # get summary text
@@ -240 +303 @@
-        items.sort()
-    html = ''
+
+    if ver < [0, 11]:
+        fargs = dict(db=db)
+    else:
+        fargs = dict(db=db, req=req)
-    if summary:
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        try:
-            title = title % len(items)  # process %d in title
@@ -262 +335 @@
-        return ''
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-if __name__ == '__main__':