[Zope3-checkins] SVN: Zope3/branches/jim-index/ Updated
configure.zcml, restored zope.app.zptpage.textindex and supporting
Gintautas Miliauskas
gintas at pov.lt
Sat Jun 12 10:09:57 EDT 2004
Log message for revision 25395:
Updated configure.zcml, restored zope.app.zptpage.textindex and supporting
files in package-includes/
-=-
Copied: Zope3/branches/jim-index/package-includes/catalog-configure.zcml (from rev 25040, Zope3/trunk/package-includes/catalog-configure.zcml)
Property changes on: Zope3/branches/jim-index/package-includes/catalog-configure.zcml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Copied: Zope3/branches/jim-index/package-includes/index-configure.zcml (from rev 25040, Zope3/trunk/package-includes/index-configure.zcml)
Property changes on: Zope3/branches/jim-index/package-includes/index-configure.zcml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Copied: Zope3/branches/jim-index/package-includes/zope.app.catalog-configure.zcml (from rev 25040, Zope3/trunk/package-includes/zope.app.catalog-configure.zcml)
Copied: Zope3/branches/jim-index/package-includes/zope.app.zptpage.textindex-configure.zcml (from rev 25040, Zope3/trunk/package-includes/zope.app.zptpage.textindex-configure.zcml)
Property changes on: Zope3/branches/jim-index/package-includes/zope.app.zptpage.textindex-configure.zcml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: Zope3/branches/jim-index/src/zope/app/catalog/browser/catalog.py
===================================================================
--- Zope3/branches/jim-index/src/zope/app/catalog/browser/catalog.py 2004-06-12 14:09:52 UTC (rev 25394)
+++ Zope3/branches/jim-index/src/zope/app/catalog/browser/catalog.py 2004-06-12 14:09:57 UTC (rev 25395)
@@ -16,7 +16,7 @@
$Id$
"""
from zope.app.container.browser.adding import Adding
-from zope.app.catalog.interfaces.catalog import ICatalog
+from zope.app.catalog.interfaces import ICatalog
class CatalogEditView:
"Provides a user interface for configuring a catalog"
Modified: Zope3/branches/jim-index/src/zope/app/catalog/browser/configure.zcml
===================================================================
--- Zope3/branches/jim-index/src/zope/app/catalog/browser/configure.zcml 2004-06-12 14:09:52 UTC (rev 25394)
+++ Zope3/branches/jim-index/src/zope/app/catalog/browser/configure.zcml 2004-06-12 14:09:57 UTC (rev 25395)
@@ -1,4 +1,4 @@
-<zope:configure
+<zope:configure
xmlns:zope="http://namespaces.zope.org/zope"
xmlns="http://namespaces.zope.org/browser"
i18n_domain="zope"
@@ -12,12 +12,12 @@
permission="zope.ManageContent"
/>
- <icon
- name="zmi_icon"
- for="zope.app.catalog.interfaces.catalog.ICatalog"
+ <icon
+ name="zmi_icon"
+ for="zope.app.catalog.interfaces.ICatalog"
file="catalog_icon.gif"
/>
-
+
<addMenuItem
title="Site Catalog"
description="A Catalog allows indexing and searching of objects"
@@ -27,7 +27,7 @@
<!-- Standard container 'contents' tab -->
<page
- for="zope.app.catalog.interfaces.catalog.ICatalog"
+ for="zope.app.catalog.interfaces.ICatalog"
name="contents.html"
menu="zmi_views"
title="Indexes"
@@ -38,7 +38,7 @@
<!-- This hooks up a custom add menu. -->
<view
- for="zope.app.catalog.interfaces.catalog.ICatalog"
+ for="zope.app.catalog.interfaces.ICatalog"
name="+"
menu="zmi_actions" title="Add"
class="zope.app.catalog.browser.catalog.IndexAdding"
@@ -46,10 +46,10 @@
<page name="index.html" attribute="index" />
<page name="action.html" attribute="action" />
</view>
-
+
<!-- the add menu is browser.IndexAdding -->
<menu id="catalog_index_menu" title="Add Index" />
-
+
<!-- Add a couple of items to the add menu -->
<!-- TextIndex -->
<addform
@@ -62,7 +62,7 @@
keyword_arguments="interface"
description="A full text index"
/>
-
+
<!-- FieldIndex -->
<addform
name="AddFieldIndexToCatalog"
@@ -74,7 +74,7 @@
keyword_arguments="interface"
description="An index of a specific field"
/>
-
+
<!-- KeywordIndex -->
<addform
name="AddKeywordIndexToCatalog"
@@ -86,13 +86,13 @@
keyword_arguments="interface"
description="A keyword index of a specific field"
/>
-
+
<!-- the Advanced tab of the Catalog -->
<pages
- for="zope.app.catalog.interfaces.catalog.ICatalog"
+ for="zope.app.catalog.interfaces.ICatalog"
class="zope.app.catalog.browser.catalog.CatalogEditView"
permission="zope.ManageContent">
-
+
<page name="index.html" template="advanced.pt"
menu="zmi_views" title="Advanced"/>
<page name="subscribe.html" attribute="subscribe"/>
Modified: Zope3/branches/jim-index/src/zope/app/catalog/configure.zcml
===================================================================
--- Zope3/branches/jim-index/src/zope/app/catalog/configure.zcml 2004-06-12 14:09:52 UTC (rev 25394)
+++ Zope3/branches/jim-index/src/zope/app/catalog/configure.zcml 2004-06-12 14:09:57 UTC (rev 25395)
@@ -4,75 +4,53 @@
>
<content class=".catalog.Catalog">
- <implements
+ <implements
interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
/>
- <factory
- id="zope.app.catalog"
+ <factory
+ id="zope.app.catalog"
/>
- <require
- interface="zope.app.catalog.interfaces.catalog.ICatalogView"
- permission="zope.View"
+ <require
+ interface="zope.app.catalog.interfaces.ICatalogQuery"
+ permission="zope.Public"
/>
- <require
- interface="zope.app.catalog.interfaces.catalog.ICatalogQuery"
- permission="zope.Public"
+ <require
+ interface="zope.app.catalog.interfaces.ICatalogEdit"
+ permission="zope.ManageContent"
/>
- <require
- interface="zope.app.catalog.interfaces.catalog.ICatalogEdit"
- permission="zope.ManageContent"
- />
- <require
+ <require
interface="zope.app.container.interfaces.IContainer"
- permission="zope.ManageContent"
+ permission="zope.ManageContent"
/>
</content>
-<subscriber
- factory=".catalog.CatalogBaseRemoveSubscriber"
- provides="zope.app.event.interfaces.ISubscriber"
- for=".interfaces.catalog.ICatalog
- zope.app.container.interfaces.IObjectRemovedEvent"
- />
-
-<subscriber
- factory=".catalog.CatalogBaseAddSubscriber"
- provides="zope.app.event.interfaces.ISubscriber"
- for=".interfaces.catalog.ICatalog
- zope.app.container.interfaces.IObjectAddedEvent"
- />
-
<content class=".catalog.CatalogUtility">
- <factory
- id="zope.app.catalogutility"
+ <factory
+ id="zope.app.catalogutility"
/>
- <require
- interface="zope.app.catalog.interfaces.catalog.ICatalogView"
+ <require
+ interface="zope.app.catalog.interfaces.ICatalogQuery"
permission="zope.View"
/>
- <require
- interface="zope.app.catalog.interfaces.catalog.ICatalogQuery"
- permission="zope.View"
- />
- <require
- interface="zope.app.catalog.interfaces.catalog.ICatalogEdit"
+ <require
+ interface="zope.app.catalog.interfaces.ICatalogEdit"
permission="zope.ManageContent"
/>
- <require
+ <require
interface="zope.app.container.interfaces.IContainer"
permission="zope.ManageContent"
/>
</content>
<content class=".catalog.ResultSet">
- <require
+ <require
attributes="__iter__ __len__"
permission="zope.Public"/>
</content>
- <!-- Include browser package -->
+<!-- Include browser package -->
- <include package=".browser" />
+<include package=".browser" />
</configure>
Copied: Zope3/branches/jim-index/src/zope/app/zptpage/textindex (from rev 25040, Zope3/trunk/src/zope/app/zptpage/textindex)
More information about the Zope3-Checkins
mailing list