← Back to branch summary

~zaber/openobject-addons/stable_5.0-extra-addons

« back to all changes in this revision

Viewing changes to olap/cube/mdx_parser.py

  • Committer: asb (Open ERP)
  • Date: 2009-03-06 14:37:14 UTC
  • mto: This revision was merged to the branch mainline in revision 3588.
  • Revision ID: asb@tinyerp.com-20090306143714-ncuch5f360gjp3lm
* Added the olap_crm - Demo Cube for the CRM

Show diffs side-by-side

added added

removed removed

Lines of Context:
olap/cube/mdx_parser.py
96
96
        rightRoundBr = Literal(")").suppress()
97
97
        comma = Literal(",").suppress()
98
98
        crossjoinToken = Keyword("crossjoin", caseless=True).suppress() 
99
 
         
100
 
        crossx = Forward()
101
 
        cross_mdx = Group(crossx) | self.mdx_axis() + comma +  self.cross_axis()
102
 
        crossx << ((crossjoinToken + leftRoundBr +  delimitedList(cross_mdx)  + rightRoundBr) |  self.cross_axis())
 
99
        
 
100
        crossx = Forward() 
 
101
        cross_mdx = Group(crossx) | self.mdx_axis() + comma + self.cross_axis()
 
102
        crossx << ((crossjoinToken + leftRoundBr +  delimitedList(cross_mdx)  + rightRoundBr) | self.cross_axis())
103
103
        simple_mdx = self.mdx_axis()
104
104
 
105
105
        mdx = simple_mdx | crossx