TicketBoxMacro: TicketBox.2.diffs

Index: TicketBox.py
===================================================================
--- TicketBox.py        (revision 1306)
+++ TicketBox.py        (working copy)
@@ -25,6 +25,11 @@
 {{{[report:9?PRIORITY=high&COMPONENT=ui]}}}. Of course, the special
 variable '{{{$USER}}}' is available. The login name (or 'anonymous)
 is used as $USER if not specified explicitly.
+
+The report should produce at least the field {{{ticket}}} containing
+the ticket ID.  If it also contains a {{{text}}} field a different
+formatting will be used showing that text after the ticket ID
+hyperlink.
 """
 
 ## NOTE: CSS2 defines 'max-width' but it seems that only few browser
@@ -57,6 +62,7 @@
     if not txt:
         txt = ''
     items = []
+    items_have_text = False
     title = "Tickets"
     args_re = re.compile("^(?:" + string.join(args_pat, "|") + ")$")
     for arg in [string.strip(s) for s in txt.split(',')]:
@@ -96,10 +102,19 @@
                 curs.execute(sql)
                 rows = curs.fetchall()
                 if rows:
+                    # Get the index of the fields we're interested in
+                    # The fields are 'ticket' (the ID) and optionally 'text'.
                     descriptions = [desc[0] for desc in curs.description]
                     idx = descriptions.index('ticket')
+                   if descriptions.count('text'):
+                       text = descriptions.index('text')
+                       items_have_text = True
+                    # Now get the values from each row
                     for row in rows:
-                        items.append(row[idx])
+                        if items_have_text:
+                          items.append("#%d: %s"%(row[idx], row[text]))
+                        else:
+                         items.append("#%d"%row[idx])
             finally:
                 if not hasattr(env, 'get_cnx_pool'):
                     # without db connection pool, we should close db.
@@ -110,13 +125,19 @@
     html = ''
     try:
         # for trac 0.9 or later
-        from trac.wiki.formatter import wiki_to_oneliner
-        html = wiki_to_oneliner(string.join(["#%d" % c for c in items], ", "),
+        from trac.wiki.formatter import wiki_to_oneliner, wiki_to_html
+        if items_have_text:
+          html = wiki_to_html(string.join(["%s" % str(c) for c in items],
+                                          "[[BR]]"),
                                env, env.get_db_cnx())
+        else:
+          html = wiki_to_oneliner(string.join(["%s" % str(c) for c in items], ", "),
+                               env, env.get_db_cnx())
     except:
         # for trac 0.8.x
         from trac.WikiFormatter import wiki_to_oneliner
-        html = wiki_to_oneliner(string.join(["#%d" % c for c in items], ", "),
+        html = wiki_to_oneliner(string.join(["%s" % str(c) for c in items],
+sep),
                                 hdf, env, env.get_db_cnx())
     if html != '':
         try: