[Zope-Checkins] CVS: Zope/lib/python/Products/PluginIndexes/TextIndexNG/queryparser - queryparser.py:1.1.2.8

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/Products/PluginIndexes/TextIndexNG/queryparser
In directory cvs.zope.org:/tmp/cvs-serv30246

Modified Files:
      Tag: ajung-textindexng-branch
	queryparser.py 
Log Message:
adopted parser to new parser modules



=== Zope/lib/python/Products/PluginIndexes/TextIndexNG/queryparser/queryparser.py 1.1.2.7 => 1.1.2.8 ===
     ANDREGEX       = 'and'
     ORREGEX        = 'or'
-    STRREGEX       = '[a-zA-Z\?\*]*'
-    OPENPREGEX     = r'('
-    CLOSEPREGEX    = r')'
+    STRREGEX       = '[\w\*\?]*'
+    OPENPREGEX     = '\('
+    CLOSEPREGEX    = '\)'
 
     def __init__(self):
 
@@ -46,6 +46,7 @@
 
     
     def DeclareTerminals(self):
+        print 'a'
         self.TextIndexG.Addterm("openp",  self.OPENPREGEX,  self.addOpenParens)
         self.TextIndexG.Addterm("closep", self.CLOSEPREGEX, self.addCloseParens)
         self.TextIndexG.Addterm("and",    self.ANDREGEX,    self.addOp)