[Erp5-report] r20806 - /erp5/trunk/products/ZSQLCatalog/SearchKey/FullTextKey.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Apr 24 18:40:42 2008
New Revision: 20806

URL: http://svn.erp5.org?rev=20806&view=rev
Log:
Perform regex to exclude strings like "RRRR*"

Modified:
    erp5/trunk/products/ZSQLCatalog/SearchKey/FullTextKey.py

Modified: erp5/trunk/products/ZSQLCatalog/SearchKey/FullTextKey.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SearchKey/FullTextKey.py?rev=20806&r1=20805&r2=20806&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SearchKey/FullTextKey.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SearchKey/FullTextKey.py Thu Apr 24 18:40:42 2008
@@ -58,7 +58,8 @@
   t_DOUBLEQUOTE = r'(\")'
 
   def t_WORD(self, t):
-    r'[^\+\-<>\(\)\~\*\"\s]\S*'
+    r'[^\+\-<>\(\)\~\*\"\s]$|[^\+\-<>\(\)\~\*\s]+[^\*\s\)]'
+    #r'[^\+\-<>\(\)\~\*\"\s]\S*'
     #r'[\x7F-\xFF\w\d][\x7F-\xFF\w\d]*'
     # WORD may contain arbitrary letters and numbers without white space
     word_value = t.value