[Zope-Checkins] CVS: Zope/lib/python/OFS - FindSupport.py:1.31.68.3

[Paul Winkler]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv24441

Modified Files:
      Tag: Zope-2_7-branch
	FindSupport.py 
Log Message:

Patch for collector 1317: FindSupport now supports cmf's SearchableText.


=== Zope/lib/python/OFS/FindSupport.py 1.31.68.2 => 1.31.68.3 ===
--- Zope/lib/python/OFS/FindSupport.py:1.31.68.2	Thu Jan  8 18:33:47 2004
+++ Zope/lib/python/OFS/FindSupport.py	Fri Jun  4 12:47:16 2004
@@ -118,8 +118,11 @@
                 and
                 (not obj_searchterm or
                  (hasattr(ob, 'PrincipiaSearchSource') and
-                  ob.PrincipiaSearchSource().find(str(obj_searchterm)) >= 0
-                  ))
+                  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