[Checkins] SVN: zope.app.catalog/branches/nadako-sorting/ Adapt to zope.index KeywordIndex refactorings.

[Dan Korostelev]

Log message for revision 94443:
  Adapt to zope.index KeywordIndex refactorings.

Changed:
  _U  zope.app.catalog/branches/nadako-sorting/
  U   zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/browser/configure.zcml
  U   zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/classes.zcml
  U   zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/keyword.py

-=-

Property changes on: zope.app.catalog/branches/nadako-sorting
___________________________________________________________________
Deleted: svn:externals
   - zope.index svn://svn.zope.org/repos/main/zope.index/trunk


Modified: zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/browser/configure.zcml
===================================================================
--- zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/browser/configure.zcml	2008-12-30 11:57:13 UTC (rev 94442)
+++ zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/browser/configure.zcml	2008-12-30 12:07:15 UTC (rev 94443)
@@ -83,21 +83,21 @@
    />
 
 <addform
-    name="AddCaseSensitiveKeywordIndex"
-    label="Add a keyword index (case-sensitive)"
+    name="AddCaseInsensitiveKeywordIndex"
+    label="Add a keyword index (case-omsensitive)"
     schema="..interfaces.IAttributeIndex"
     permission="zope.ManageServices"
-    content_factory="..keyword.CaseSensitiveKeywordIndex"
+    content_factory="..keyword.CaseInsensitiveKeywordIndex"
     arguments="field_name"
     keyword_arguments="interface field_callable"
     />
 
 <addMenuItem
-    title="Keyword Index (case-sensitive)"
+    title="Keyword Index (case-insensitive)"
     description="Index items based on sequence of keywords"
-    class="..keyword.CaseSensitiveKeywordIndex"
+    class="..keyword.CaseInsensitiveKeywordIndex"
     permission="zope.ManageServices"
-    view="AddCaseSensitiveKeywordIndex"
+    view="AddCaseInsensitiveKeywordIndex"
    />
 
 <schemadisplay

Modified: zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/classes.zcml
===================================================================
--- zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/classes.zcml	2008-12-30 11:57:13 UTC (rev 94442)
+++ zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/classes.zcml	2008-12-30 12:07:15 UTC (rev 94443)
@@ -51,7 +51,7 @@
         />
   </class>
 
-  <class class=".keyword.CaseSensitiveKeywordIndex">
+  <class class=".keyword.CaseInsensitiveKeywordIndex">
     <require like_class=".keyword.KeywordIndex" /> 
   </class>
 

Modified: zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/keyword.py
===================================================================
--- zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/keyword.py	2008-12-30 11:57:13 UTC (rev 94442)
+++ zope.app.catalog/branches/nadako-sorting/src/zope/app/catalog/keyword.py	2008-12-30 12:07:15 UTC (rev 94443)
@@ -23,17 +23,17 @@
 import zope.app.catalog.interfaces
 
 class IKeywordIndex(zope.app.catalog.interfaces.IAttributeIndex,
-                    zope.app.catalog.interfaces.ICatalogIndex):
+                     zope.app.catalog.interfaces.ICatalogIndex):
     """Interface-based catalog keyword index"""
 
 class KeywordIndex(zope.app.catalog.attribute.AttributeIndex,
-                   zope.index.keyword.KeywordIndex,
-                   zope.app.container.contained.Contained):
+                    zope.index.keyword.KeywordIndex,
+                    zope.app.container.contained.Contained):
 
     zope.interface.implements(IKeywordIndex)
 
-class CaseSensitiveKeywordIndex(zope.app.catalog.attribute.AttributeIndex,
-                                zope.index.keyword.CaseSensitiveKeywordIndex,
-                                zope.app.container.contained.Contained):
+class CaseInsensitiveKeywordIndex(zope.app.catalog.attribute.AttributeIndex,
+                                      zope.index.keyword.CaseInsensitiveKeywordIndex,
+                                      zope.app.container.contained.Contained):
 
     zope.interface.implements(IKeywordIndex)