Changeset 4084

Timestamp:

07/30/08 05:54:12 (5 months ago)

Author:

gotoh

Message:

Support query string in macro argument and report definition.
See TracQuery for the syntax of query string.
Note that url style of query string is not yet supported.
So if you use it in report, you cannot refer it.

Example:

[[TicketBox("Unassigned tickets", [query:status=new],inline,summary)]]

Close #754.

Files:

• ticketboxmacro/0.11/TicketBox.py (modified) (8 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
@@ -44 +45 @@
-from trac.ticket.report import ReportModule
-from trac.ticket.model import Ticket
+from trac.ticket.query import Query
-
-## default style values
@@ -54 +56 @@
-            r"{(?P<rptnum>\d+)}",
-            r"\[report:(?P<rptnum2>\d+)(?P<dv>\?.*)?\]",
+            r"\[query:(?P<query>[^\]]*)\]",
-            r"(?P<width>\d+(pt|px|%))",
-            r"(?P<title>'[^']*'|\"[^\"]*\")",
@@ -139 +142 @@
-    env = formatter.env
-    args = parse(content or '')
+    try:
+        db = env.get_db_cnx()
+        return doit(req, env, args, db)
+    finally:
+        if db and not hasattr(env, 'get_cnx_pool'):
+            # without db connection pool, we should close db.
+            db.close()
+
+def doit(req, env, args, db):
-    items = []
-    summary = None
@@ -172 +184 @@
-    # 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'):
+            q = Query.from_string(env, match.group('query'))
+            sql, params = q.get_sql(req)
+            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:
-                curs.execute('SELECT query FROM report WHERE id=%s' % num)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                # NOTE: sql_sub_vars() takes different arguments in
-                #       several trac versions.
@@ -199 +222 @@
-                #       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:
@@ -217 +243 @@
-                                            % summary)
-                    for row in rows:
-
-
-
+i
+ and 0 <= sidx
+i
-            finally:
-
-
-
-
+
+
-    if summary:
-        # get summary text
@@ -242 +266 @@
-        html = string.join([wiki_to_oneliner("%s (#%d)" % (summaries[n],n),
-                                             env,
-env.get_db_cnx()
-formatter.
+db
+
-    else:
-        html = wiki_to_oneliner(string.join(["#%d" % c for c in items], ", "),
-env.get_db_cnx(), req=formatter.
+db, req=
-    if html != '':
-        try: