[Zope-Checkins] SVN: Zope/trunk/ - Collector #1808: manage_convertIndexes no longer tries to change the

[Andreas Jung]

Log message for revision 30782:
  
  
        - Collector #1808: manage_convertIndexes no longer tries to change the
          index types causing some trouble with CMF.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-06-13 10:37:24 UTC (rev 30781)
+++ Zope/trunk/doc/CHANGES.txt	2005-06-13 13:03:34 UTC (rev 30782)
@@ -34,6 +34,9 @@
 
     Bugs fixed
 
+      - Collector #1808: manage_convertIndexes no longer tries to change the
+        index types causing some trouble with CMF.
+
       - Collector #1548: Fix 'httplib' usage in ZPublisher.Client.
 
       - Collector #1792: applied patch for broken ZClasses

Modified: Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py	2005-06-13 10:37:24 UTC (rev 30781)
+++ Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py	2005-06-13 13:03:34 UTC (rev 30782)
@@ -935,12 +935,6 @@
                 idx_type = idx.meta_type
                 idx_id = idx.getId()
                 LOG.info('processing index %s' % idx_id)
-                if idx_type == 'FieldIndex' and idx_id in ('start', 'modified', 
-                                                           'end', 'created'):
-                    idx_type = 'DateIndex'
-                if idx_type == 'FieldIndex' and idx_id in ('effective', 
-                                                           'expires'):
-                    idx_type = 'DateRangeIndex'
                 indexed_attrs = getattr(idx, 'indexed_attrs', None)
                 self.delIndex(idx.getId())
                 self.addIndex(idx_id, idx_type)