source: trunk/plugins/dashboardreportsplugin/dashboardreports/patch/trac-query.7385.diff @ 391

Index: trac/ticket/api.py
===================================================================
--- trac/ticket/api.py  (revision 7385)
+++ trac/ticket/api.py  (working copy)
@@ -183,6 +183,17 @@
             valid_states.update(controller.get_all_status())
         return sorted(valid_states)
 
+    def get_all_ticket_fields(self):
+        """New method until full integration of the new fields."""
+        fields = self.get_ticket_fields()
+        
+        # append the new ones
+        fields.extend([{'name': 'time', 'type': 'date', 'label': 'Created'},
+                       {'name': 'changetime', 'type': 'date', 
+                            'label': 'Modified'}])
+        
+        return fields
+
     def get_ticket_fields(self):
         """Returns the list of fields available for tickets."""
         from trac.ticket import model
Index: trac/ticket/query.py
===================================================================
--- trac/ticket/query.py        (revision 7385)
+++ trac/ticket/query.py        (working copy)
@@ -43,6 +43,8 @@
 from trac.wiki.api import IWikiSyntaxProvider, parse_args
 from trac.wiki.macros import WikiMacroBase # TODO: should be moved in .api
 
+is_op = lambda x: x in ['!', '<', '>']
+
 class QuerySyntaxError(Exception):
     """Exception raised when a ticket query cannot be parsed from a string."""
 
@@ -98,7 +100,7 @@
             rows = []
         if verbose and 'description' not in rows: # 0.10 compatibility
             rows.append('description')
-        self.fields = TicketSystem(self.env).get_ticket_fields()
+        self.fields = TicketSystem(self.env).get_all_ticket_fields()
         field_names = [f['name'] for f in self.fields]
         self.cols = [c for c in cols or [] if c in field_names or 
                      c in ('id', 'time', 'changetime')]
@@ -118,6 +120,7 @@
             self.group = None
 
     def from_string(cls, env, string, **kw):
+        global is_op
         filters = string.split('&')
         kw_strs = ['order', 'group', 'page', 'max']
         kw_arys = ['rows']
@@ -137,8 +140,8 @@
             if field[-1] in ('~', '^', '$'):
                 mode = field[-1]
                 field = field[:-1]
-            if field[-1] == '!':
-                neg = '!'
+            if is_op(field[-1]):
+                neg = field[-1]
                 field = field[:-1]
             processed_values = []
             for val in values.split('|'):
@@ -368,6 +371,7 @@
 
     def get_sql(self, req=None, cached_ids=None):
         """Return a (sql, params) tuple for the query."""
+        global is_op
         self.get_columns()
 
         enum_columns = ('resolution', 'priority', 'severity')
@@ -413,6 +417,19 @@
                        % (col, col, col))
 
         def get_constraint_sql(name, value, mode, neg):
+            # strip the operator from the value
+            value = value[len(mode) + is_op(neg):]
+            # convert the value for non string fields
+            current_field = {}
+            for field in self.fields  :
+                if field['name'] == name :
+                    current_field = field
+                    break
+            if current_field.has_key('type') \
+                and current_field['type'] == 'date' :
+                    value = int(value) 
+            
+            # add the table alias to the field name
             if name not in custom_fields:
                 name = 't.' + name
             else:
@@ -420,8 +437,8 @@
             value = value[len(mode) + neg:]
 
             if mode == '':
-                return ("COALESCE(%s,'')%s=%%s" % (name, neg and '!' or ''),
-                        value)
+                return ("COALESCE(%s,'')%s=%%s" % (name, 
+                                is_op(neg) and neg or ''), value)
             if not value:
                 return None
             db = self.env.get_db_cnx()
@@ -432,7 +449,7 @@
                 value = value + '%'
             elif mode == '$':
                 value = '%' + value
-            return ("COALESCE(%s,'') %s%s" % (name, neg and 'NOT ' or '',
+            return ("COALESCE(%s,'') %s%s" % (name, neg == '!' and 'NOT ' or '',
                                               db.like()),
                     value)
 
@@ -441,18 +458,22 @@
         for k, v in self.constraints.items():
             if req:
                 v = [val.replace('$USER', req.authname) for val in v]
-            # Determine the match mode of the constraint (contains,
-            # starts-with, negation, etc.)
-            neg = v[0].startswith('!')
+            # get the first character of the value, determine later if it's an
+            # operation
+            neg = ''
             mode = ''
-            if len(v[0]) > neg and v[0][neg] in ('~', '^', '$'):
-                mode = v[0][neg]
+            if v[0] != '' :
+                neg = v[0][0]
+            mode = ''
+            if len(v[0]) > 1 and is_op(neg) and v[0][is_op(neg)] in ('~', '^', '$'):
+                    mode = v[0][is_op(neg)]
 
             # Special case id ranges
             if k == 'id':
                 ranges = Ranges()
                 for r in v:
-                    r = r.replace('!', '')
+                    for ch in ['!', '<', '>'] :
+                        r = r.replace(ch, '')
                     ranges.appendrange(r)
                 ids = []
                 id_clauses = []
@@ -466,7 +487,7 @@
                 if ids:
                     id_clauses.append('id IN (%s)' % (','.join(ids)))
                 if id_clauses:
-                    clauses.append('%s(%s)' % (neg and 'NOT ' or '',
+                    clauses.append('%s(%s)' % (neg == '!' and 'NOT ' or '',
                                                ' OR '.join(id_clauses)))
             # Special case for exact matches on multiple values
             elif not mode and len(v) > 1:
@@ -475,16 +496,16 @@
                 else:
                     col = k + '.value'
                 clauses.append("COALESCE(%s,'') %sIN (%s)"
-                               % (col, neg and 'NOT ' or '',
+                               % (col, neg == '!' and 'NOT ' or '',
                                   ','.join(['%s' for val in v])))
-                args += [val[neg:] for val in v]
+                args += [val[is_op(neg):] for val in v]
             elif len(v) > 1:
                 constraint_sql = filter(None,
                                         [get_constraint_sql(k, val, mode, neg)
                                          for val in v])
                 if not constraint_sql:
                     continue
-                if neg:
+                if is_op(neg):
                     clauses.append("(" + " AND ".join(
                         [item[0] for item in constraint_sql]) + ")")
                 else:
@@ -562,17 +583,21 @@
 
     def template_data(self, context, tickets, orig_list=None, orig_time=None,
                       req=None):
+        global is_op
         constraints = {}
         for k, v in self.constraints.items():
             constraint = {'values': [], 'mode': ''}
             for val in v:
-                neg = val.startswith('!')
-                if neg:
+                neg = ''
+                mode = ''
+                if val != '' :
+                    neg = val[0]
+                if val != '' and is_op(neg):
                     val = val[1:]
                 mode = ''
-                if val[:1] in ('~', '^', '$'):
+                if val != '' and val[:1] in ('~', '^', '$'):
                     mode, val = val[:1], val[1:]
-                constraint['mode'] = (neg and '!' or '') + mode
+                constraint['mode'] = (is_op(neg) and neg or '') + mode
                 constraint['values'].append(val)
             constraints[k] = constraint
 
@@ -605,7 +630,9 @@
             {'name': _("begins with"), 'value': "^"},
             {'name': _("ends with"), 'value': "$"},
             {'name': _("is"), 'value': ""},
-            {'name': _("is not"), 'value': "!"}
+            {'name': _("is not"), 'value': "!"},
+            {'name': _("greater"), 'value': ">"},
+            {'name': _("lesser"), 'value': "<"}
         ]
         modes['select'] = [
             {'name': _("is"), 'value': ""},
@@ -811,7 +838,7 @@
     def _get_constraints(self, req):
         constraints = {}
         ticket_fields = [f['name'] for f in
-                         TicketSystem(self.env).get_ticket_fields()]
+                         TicketSystem(self.env).get_all_ticket_fields()]
         ticket_fields.append('id')
 
         # For clients without JavaScript, we remove constraints here if