Yeah...Zope is now a regex|ts_regex|regsub zone. Replaced and removed…

… all old regex stuff. No one survived.

Catalog.py

@@ -86,9 +86,8 @@
 from Persistence import Persistent
 import Acquisition
 import ExtensionClass
-from SearchIndex import UnIndex, UnTextIndex, UnKeywordIndex, Query
+from SearchIndex import UnIndex, UnTextIndex, UnKeywordIndex
 from SearchIndex.Lexicon import Lexicon
-import regex, pdb
 from MultiMapping import MultiMapping
 from string import lower
 import Record
@@ -106,19 +105,6 @@
 
 import time
 
-def orify(seq,
-          query_map={
-              type(regex.compile('')): Query.Regex,
-              type(''): Query.String,
-              }):
-    subqueries=[]
-    for q in seq:
-        try: q=query_map[type(q)](q)
-        except KeyError: q=Query.Cmp(q)
-        subqueries.append(q)
-    return apply(Query.Or,tuple(subqueries))
-
-
 class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
     """ An Object Catalog
 
@@ -607,13 +593,7 @@ def _indexedSearch(self, args, sort_index, append, used):
 
         return used
 
-    def searchResults(self, REQUEST=None, used=None,
-                      query_map={
-                          type(regex.compile('')): Query.Regex,
-                          type([]): orify,
-                          type(''): Query.String,
-                          }, **kw):
-
+    def searchResults(self, REQUEST=None, used=None, **kw):
         # Get search arguments:
         if REQUEST is None and not kw:
             try: REQUEST=self.REQUEST

ZCatalog.py

@@ -90,17 +90,15 @@
 from OFS.FindSupport import FindSupport
 from DateTime import DateTime
 from SearchIndex import Query
-import string, regex, urlparse, urllib, os, sys, time
+import string, urlparse, urllib, os, sys, time
 import Products
 from Acquisition import Implicit
 from Persistence import Persistent
 from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
 from DocumentTemplate.DT_Util import Eval, expr_globals
 from AccessControl.Permission import name_trans
-from Catalog import Catalog, orify, CatalogError
-from SearchIndex import UnIndex, UnTextIndex
+from Catalog import Catalog, CatalogError
 from Vocabulary import Vocabulary
-from Shared.DC.ZRDB.TM import TM
 from AccessControl import getSecurityManager
 from zLOG import LOG, ERROR
 
@@ -518,21 +516,14 @@ def _searchable_result_columns(self):
                   'width': 8})
         return r
 
-    def searchResults(self, REQUEST=None, used=None,
-                      query_map={
-                          type(regex.compile('')): Query.Regex,
-                          type([]): orify,
-                          type(()): orify,
-                          type(''): Query.String,
-                          }, **kw):
+    def searchResults(self, REQUEST=None, used=None, **kw):
         """
         Search the catalog according to the ZTables search interface.
         Search terms can be passed in the REQUEST or as keyword
         arguments. 
         """
 
-        return apply(self._catalog.searchResults,
-                     (REQUEST,used, query_map), kw)
+        return apply(self._catalog.searchResults, (REQUEST,used), kw)
 
     __call__=searchResults
 

dtml/catalogView.dtml

@@ -46,7 +46,7 @@
     </td>
     <td align="left" valign="top">
     <div class="form-text">
-      <dtml-with name="aq_self" only>
+      <dtml-with sequence-item only>
         <dtml-if name="meta_type">
           <dtml-var name="meta_type" size="15">
         <dtml-else>