[Checkins] SVN: zc.catalog/trunk/src/zc/catalog/ Make indexes work with advanced catalog view.

[Gary Poster]

Log message for revision 66115:
  Make indexes work with advanced catalog view.
  

Changed:
  U   zc.catalog/trunk/src/zc/catalog/configure.zcml
  U   zc.catalog/trunk/src/zc/catalog/index.py

-=-
Modified: zc.catalog/trunk/src/zc/catalog/configure.zcml
===================================================================
--- zc.catalog/trunk/src/zc/catalog/configure.zcml	2006-03-20 16:23:19 UTC (rev 66114)
+++ zc.catalog/trunk/src/zc/catalog/configure.zcml	2006-03-21 16:21:42 UTC (rev 66115)
@@ -34,4 +34,37 @@
         />
   </content>
 
+ <content class=".catalogindex.ValueIndex">
+     <require
+         permission="zope.ManageServices"
+         interface="zope.app.catalog.interfaces.IAttributeIndex
+                    zope.index.interfaces.IStatistics"
+         set_schema="zope.app.catalog.interfaces.IAttributeIndex"
+         />
+   </content>
+
+   <content class=".catalogindex.SetIndex">
+     <require
+         permission="zope.ManageServices"
+         interface="zope.app.catalog.interfaces.IAttributeIndex
+                    zope.index.interfaces.IStatistics"
+         set_schema="zope.app.catalog.interfaces.IAttributeIndex"
+         />
+   </content>
+
+   <content class=".catalogindex.NormalizationWrapper">
+     <require
+         permission="zope.ManageServices"
+         interface="zope.app.catalog.interfaces.IAttributeIndex
+                    zope.index.interfaces.IStatistics"
+         set_schema="zope.app.catalog.interfaces.IAttributeIndex"
+         />
+   </content>
+
+    <content class="BTrees.Length.Length">
+      <require
+        permission="zope.ManageServices"
+        attributes="__call__" />
+    </content>
+
 </configure>

Modified: zc.catalog/trunk/src/zc/catalog/index.py
===================================================================
--- zc.catalog/trunk/src/zc/catalog/index.py	2006-03-20 16:23:19 UTC (rev 66114)
+++ zc.catalog/trunk/src/zc/catalog/index.py	2006-03-21 16:21:42 UTC (rev 66115)
@@ -279,6 +279,12 @@
     index = normalizer = None
     collection_index = False
 
+    def documentCount(self):
+        return self.index.documentCount()
+
+    def wordCount(self):
+        return self.index.wordCount()
+
     def __init__(self, index, normalizer, collection_index=False):
         self.index = index
         self.normalizer = normalizer