[Zope-Checkins] CVS: Zope2 - UnTextIndex.py:1.33.2.8

[Jim Fulton]

Update of /cvs-repository/Zope2/lib/python/SearchIndex
In directory korak:/tmp/cvs-serv24346

Modified Files:
      Tag: zope-2_3-branch
	UnTextIndex.py 
Log Message:
I give up. I can't reliably fix the breakage I see on zope.org, where
an UnTextIndex has a lexicon, but acquires one from the catalog
instead.  Fixing this will require rebuilding the index.



--- Updated File UnTextIndex.py in package Zope2 --
--- UnTextIndex.py	2001/03/17 17:30:41	1.33.2.7
+++ UnTextIndex.py	2001/03/17 17:57:14	1.33.2.8
@@ -203,12 +203,7 @@
 
     def _convertBTrees(self, threshold=200):
 
-        if hasattr(getattr(self, 'aq_base', self), 'lexicon'):
-            # some old text indexes are in a weird state in which their
-            # *real* lexicon is in an attribute 'lexicon'.
-            self._lexicon=getattr(self.lexicon, 'aq_base', self.lexicon)
-            del self.lexicon
-        elif type(self._lexicon) is type(''):
+        if type(self._lexicon) is type(''):
             # Turn the name reference into a hard reference. 
             self._lexicon=self.getLexicon(self._lexicon)