Changeset 25969

Timestamp:

12/05/08 21:59:50 (5 weeks ago)

Author:

hirobe

Message:

クエリストリングの解釈処理を変更
・URL形式('?'あり)と、TicketQuery形式('?'なし)の両方に対応
・URLがクエリストリングかつquery省略時にURLからクエリを生成する機能を追加

Files:

• platform/trac/plugins/querychart/trunk/querychart/macro.py (modified) (8 diffs)

platform/trac/plugins/querychart/trunk/querychart/macro.py

@@ -52 +52 @@
 
 
+    def _urlstring_to_reqarg(self,urlstr):
+        args={}
+        for uslarg in urlstr[1:].split('&'):
+            uslarg_sp = uslarg.split('=')
+            key = uslarg_sp[0]
+            val = '='.join(uslarg_sp[1:])
+            if len(val)>1 and val[0] in ['~','^','$','!']:
+                if val[0] == '!':
+                    args[key+'_mode']=val[:1]
+                    val = val[2:]
+                else:
+                    args[key+'_mode']=val[0]
+                    val = val[1:]
+            if not args.get(key):
+                args[key] = []
+            args[key].append(val)
+        return args
+    
+    def _get_constraints(self, args):
+            
+        constraints = {}
+        ticket_fields = [f['name'] for f in
+                         TicketSystem(self.env).get_ticket_fields()]
+        ticket_fields.append('id')
+
+        for field in [k for k in args.keys() if k in ticket_fields]:
+            vals = args[field]
+            if not isinstance(vals, (list, tuple)):
+                vals = [vals]
+            if vals:
+                mode = args.get(field + '_mode')
+                if mode:
+                    vals = [mode + x for x in vals]
+                constraints[field] = vals
+
+        return constraints
+
 
     def _make_data(self,req,opts):
@@ -61 +98 @@
         upper = opts['upper']
         
-        query_str = query_str[1:] + ''.join(['&col=%s'%field 
-                                         for field in fieldlist]) 
-        query = Query.from_string(self.env, query_str)
+        if len(query_str)>1 and query_str[0]!='?':
+            query_str = query_str + ''.join(['&col=%s'%field 
+                                             for field in fieldlist]) 
+            query = Query.from_string(self.env, query_str)
+        elif len(query_str)>1 and query_str[0]=='?':
+            constraints = self._get_constraints(self._urlstring_to_reqarg(query_str))
+            query = Query(self.env, constraints=constraints, cols=fieldlist)
+        else:
+            constraints = self._get_constraints(req.args)
+            query = Query(self.env, constraints=constraints, cols=fieldlist)
+                          
         self.log.debug(query.get_sql())
         result = query.execute(req, db=None, cached_ids=None)
@@ -95 +140 @@
         
         if len(edgedays)==0:
-            return {}#'''No data to output.'''
+            return None#'''No data to output.'''
 
         x_min = min(edgedays)
@@ -133 +178 @@
 
         
-        
-        # make script string
-        linenum=1
-        outs = []
-        vals = []
-        for line in lines:
-            datastrings = []
-            for p in line:
-                if upper_flag:
-                    datastrings.append('[%d,%d]'%(to_timestamp(p.date)*1000,p.count))
-                else:
-                    datastrings.append('[%d,%d]'%(to_timestamp(p.date)*1000,result_len-p.count))
-            outs.append( 'var d%s = [%s];'%(str(linenum),','.join(datastrings)))
-            vals.append( '{label:"%s",data:d%s}'%(fieldlist[linenum-1],str(linenum)))
-            linenum = linenum+1
-            
     def expand_macro(self, formatter, name, content):
         req = formatter.req
@@ -165 +194 @@
                'max':None,
                'min':None,
-               'query':None,
+               'query':'',
                'col':[],
                'per':'week',
@@ -171 +200 @@
                }
         collabel={}
+        ticket_fields = TicketSystem(self.env).get_ticket_fields()
+
         for arg in content.split(','):
             colon_split = arg.split(':')
@@ -180 +211 @@
                 value = True
             if key=='col':
-                ticket_fields = TicketSystem(self.env).get_ticket_fields()
                 if value=='time':
                     opts[key].append('time')
@@ -200 +230 @@
 
         
+        
         data = self._make_data(req,opts)
+        if data==None:
+            raise TracError('No data matched')
         fieldlist = data['fieldlist']
         x_axis = data['x_axis']