[Zope-Checkins] SVN: Zope/trunk/lib/python/OFS/FindSupport.py Collector 1317: added FindSupport support for cmf's SearchableText.

Paul Winkler pw_lists at slinkp.com
Fri Jun 4 14:58:50 EDT 2004


Log message for revision 25263:
Collector 1317: added FindSupport support for cmf's SearchableText.



-=-
Modified: Zope/trunk/lib/python/OFS/FindSupport.py
===================================================================
--- Zope/trunk/lib/python/OFS/FindSupport.py	2004-06-04 16:25:59 UTC (rev 25262)
+++ Zope/trunk/lib/python/OFS/FindSupport.py	2004-06-04 18:58:49 UTC (rev 25263)
@@ -109,7 +109,6 @@
             if hasattr(ob, 'aq_base'):
                 bs=ob.aq_base
             else: bs=ob
-
             if (
                 (not obj_ids or absattr(bs.getId()) in obj_ids)
                 and
@@ -119,7 +118,11 @@
                 (not obj_searchterm or
                  (hasattr(ob, 'PrincipiaSearchSource') and
                   ob.PrincipiaSearchSource().find(str(obj_searchterm)) >= 0
-                  ))
+                  )
+                 or
+                 (hasattr(ob, 'SearchableText') and
+                  ob.SearchableText().find(str(obj_searchterm)) >= 0)
+                 )
                 and
                 (not obj_expr or expr_match(ob, obj_expr))
                 and




More information about the Zope-Checkins mailing list