[Modeling-cvs] ProjectModeling/Modeling Qualifier.py,1.5,1.6 QualifierParser.py,1.7,1.8

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1:/tmp/cvs-serv2361

Modified Files:
	Qualifier.py QualifierParser.py 
Log Message:
Added keyword 'ilike', short for 'caseInsensitiveLike', for qualifier string definition

Index: Qualifier.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Qualifier.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Qualifier.py	27 Jan 2003 22:41:59 -0000	1.5
--- Qualifier.py	31 May 2003 10:16:57 -0000	1.6
***************
*** 79,83 ****
  # Module
  def allQualifierOperators():
!   return ('==', '!=', '<', '<=', '>', '>=', 'like', 'caseInsensitiveLike')
  
  def filteredArrayWithQualifier(objects, qualifier):
--- 79,83 ----
  # Module
  def allQualifierOperators():
!   return ('==', '!=', '<', '<=', '>', '>=', 'like', 'caseInsensitiveLike', 'ilike')
  
  def filteredArrayWithQualifier(objects, qualifier):
***************
*** 97,101 ****
    if op == '>=':        return QualifierOperatorGreaterThanOrEqualTo
    if op == 'like':      return QualifierOperatorLike
!   if op in ('caseInsensitiveLike', 'iLike'):
      return QualifierOperatorCaseInsensitiveLike
    raise ValueError, aString
--- 97,101 ----
    if op == '>=':        return QualifierOperatorGreaterThanOrEqualTo
    if op == 'like':      return QualifierOperatorLike
!   if op in ('caseInsensitiveLike', 'ilike'):
      return QualifierOperatorCaseInsensitiveLike
    raise ValueError, aString

Index: QualifierParser.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/QualifierParser.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** QualifierParser.py	10 Feb 2003 11:27:10 -0000	1.7
--- QualifierParser.py	31 May 2003 10:16:57 -0000	1.8
***************
*** 176,180 ****
        
    def t_comp_op(self, s):
!     r' \+ | \* | == | >= | > | <= | < | \!= | like | caseInsensitiveLike '
      trace('Token COMP_OP: %s'%s)
      self.rv.append(Token(type=s))
--- 176,180 ----
        
    def t_comp_op(self, s):
!     r' \+ | \* | == | >= | > | <= | < | \!= | like | caseInsensitiveLike | ilike'
      trace('Token COMP_OP: %s'%s)
      self.rv.append(Token(type=s))
***************
*** 327,330 ****
--- 327,331 ----
      comp_op ::= like
      comp_op ::= caseInsensitiveLike
+     comp_op ::= ilike
      '''
      trace('comp_op: %s'%args[0])