Zope Subversion Repository

Zope: Products.CMFCore/trunk/Products/CMFCore/CatalogTool.py

- removed temporary hacks (obsolete with ZCatalog >= 2.13.21)

- give catalog brains the acquisition context they expect (I'm not happy with this hack, but at least it seems to work)

- fixed searchResults (the getURL method of brains expects self.REQUEST is available)

- allow to use CatalogTool as tool for now (as utility it still has some unresolved issues)

- converted three more tools

- call getSecurityManager().getUser() directly

Conform to repository policies.

merging catalog adapterization into the HEAD

- import cleanup

Cleaned up / normalized imports:

o Don't import from Globals;  instead, use real locations.

o Make other imports use the actual source module, rather than an
  intermediate (e.g., prefer importing 'ClassSecurityInfo' from
  'AccessControl.SecurityInfo' rather than from 'AccessControl').

o Avoid relative imports, which will break in later versions of Python.

- CatalogTool: If proxy roles are set on a script that uses the catalog
  and those proxy roles have been unset using the ZMI, which results
  in an empty tuple as proxy roles, then the catalog would not correctly
  determine what the current user is allowed to see.
  (https://bugs.launchpad.net/zope-cmf/+bug/161729)

copy latest CMFCore version

- reverted part of the tools-as-utilities changes:
portal_actions, portal_catalog, content_type_registry, cookie_authentication, portal_skins, portal_types, portal_url, portal_workflow and portal_uidhandler depend currently on self.REQUEST which is not available in utilities.

- added XXX comments to methods that need to be adjusted first

- removed z2 interfaces

- merging the jens_tools_as_utilities branch

Forward-port fix for #380 from 2.0 branch.

CMFCore.CatalogTool: Added 'cmf_uid' method to IndexableObjectWrapper
so that CMFUid UIDs are not acquired during indexing.
(http://www.zope.org/Collectors/CMF/446)

- fixed IndexableObjectWrapper's __providedBy__ to allow the use of adapters
- added some basic IndexableObjectWrapper tests

merged changes from yuppie-setup_cleanup branch:
- removed old install scripts
- removed PortalGenerator, manage_addCMFSite and factory_type_information data
- utils.ContentInit now ignores the 'fti' argument
- removed obsolete TypesTool.listDefaultTypeInformation method
- TypesTool.manage_addTypeInformation now ignores the 'typeinfo_name' argument
- updated DEPENDENCIES.txt (CMFDefault no longer depends on CMFTopic!)
- removed enumerateIndexes, enumerateLexicons, enumerateColumns and _initIndexes from CatalogTool
- fixed unit tests

merged goldegg-phase-1 branch back to trunk:
- landing GenericSetup
- switching to z3 interfaces, deprecating the old ones

some cleanup:
- removed '_actions' from tools: '_actions' is inherited from ActionProviderBase
- import cleanup
- whitespace cleanup

- removed support for Zope 2.8.0

- added missing 'pghandler' argument (http://www.zope.org/Collectors/CMF/379)

Merge from 37626 on 1.5 branch:

Refactored reindexObjectSecurity a bit. It now always reindexes the
catalog objects without changing their catalog uid. This is useful for
third-party code that indexes objects with special uids.

Migration reorg

added latest manage_convertIndexes from Zope-2_8-branch to override the broken one from Zope 2.8.0

removed obsolete Vocabulary (this did belong to the no longer used TextIndex)

 - Forward port fix for collector #345.

simplified code a bit

- get rid of 'not not' and types module
- import and whitespace cleanup

whitespace+typo

- CatalogTool: All default FieldIndex instances used for indexing
  DateTime values are now created as DateIndex instances instead. All
  default TextIndex instances are now created as ZCTextIndex instances.
  (CMF collector issues http://www.zope.org/Collectors/CMF/191 and
  http://www.zope.org/Collectors/CMF/302)

Better compatibility with existing range syntax implementation.

Collector #120: Take into account query restrictions on 'effective' or
'expires' attributes during a search.

Merged yuppie-post_1_5-cleanup-branch:
- removed a lot of deprecated code
- made CMFCollector work with CMF 1.4 *and* HEAD

Sorry for the noise - switching everything from ZPL 2.0 to ZPL 2.1

- added 'unrestrictedSearchResults' with a big CAUTION in the method doc string

 - Merge tseaver-permissiongeddon-branch.

- removed pre Zope 2.6.4 compatibility code
- some whitespace cleanup

- marked 'meta_type' index as deprecated

hope it's save to remove 'id' now

Merged yuppie-collector025-branch:
- Creator element no longer depends on Ownership. (Collector #25)
- TypeInfo's _finishConstruction() now calls reindexObject().
- Removed WorkflowMethod wrapper of Document.setFormat().

Oops! Fixed backwards compatibility.

- updated CatalogTool interface (Collector #206)
- reindexObjectSecurity() now uses update_metadata=0

some code modernization:
- death to string module
- death to apply
- import and whitespace cleanup

cleanup:
- removed pre 'Zope 2.4.3 with PageTemplates' backwards compatibility cruft
- replaced apply by direct calls

Permissions cleanup

 - Revert change which added executable owner to allowedRolesAndUsers.

Owners were not being added to allowedRolesAndUsers

Cleanup:
- Removed misleading comment. This is not a backwards compatibility issue. Using uncatalog_object in reindexing methods is deprecated.

Merged yuppie-collector123-branch:
- Changed _actions' making them tuples. (Collector #123)

Merged yuppie-buglets1-branch:
- Fixed buglets. (Collector #94 and #95)
- Removed string functions and useless imports.

Merged yuppie-collector096-branch:
- Cleaned up Interfaces and API Help. (Collector #96)
- Removed deprecated 'register' module and interface.

    - Multimodule checkin to convert calls from user.getUserName() to
      user.getId() where appropriate.  User names should not be used
      as immutable references, while user ids should.  The distinction
      is not clearly enforcd in the stock user folder or any current user
      folder implementations, but newer user folder implementations
      will rely upon it.

*added Metadata colums for id and getId
*added Index for getId
*use of id in the catalog is depricated and may go away, use getId

Pure stylistic and code formatting changes:
- Cleanup CMFCorePermissions imports.
- Always put security.declareProtected and friends on a single line
  and just in front of the definition they're protecting, so that
  automated coherency checking can be done using simple tools like
  grep.

Revert last change: [] is the default marker used by ZCatalog.Catalog.Catalog
to denote all the indexes.

Avoided mutable default arguments.  (They are a source of potential bugs.)

  - Merge 'utils' fixes (including 'scrubHTML' integration) from 1.3 branch.

Modified CatalogTool.reindexObject to filter out invalid indexes.

Added 'portal_type' to the standard indexes and metadata. This will be
needed when we clean up the Type() mess, so better put it early.

Made the security-related indexes of the portal catalog be updated for
all impacted objects whenever local roles are changed (Tracker #494).
This feature makes use of the 'path' index.

(XXX Tests should be written for those... I'm not familiar enough with
security-related tests to do that.)

Made 'path' (PathIndex) a standard index inside CMF. When upgrading from
earlier versions this index will have to be created by hand.

Noted this upgrade requirement in the INSTALL.txt file.

Added an optional idxs argument to reindexObject to ask it to only
update specific indexes. This will be helpful to only reindex
allowedRolesAndUsers when local roles change.

 - Make CMF's catalog independent of any indexes or metadata created by
   default on the catalog.  This change allows the same code to run
   under both Zope 2.5 and Zope 2.6 (2.6 catalogs do not create any
   indexes or schema by default).

Fixed CatalogTool to create a meta_type index; this is needed now that
ZCatalog doesn't create any default indexes when instantiated.

Now creates a Vocabulary for itself if ZCatalog doesn't

 - Undo brain-dead accidental commit.

 - Ensure that test file doesn't get mangled on Windows.

*Merging andrew_ttw_actions-branch into the head
*Adds TTW configuration of Action Providers
*Allows tools to have actions managed TTW
*Added unittests for ActionTool, ActionInformation, and
Expression
*Added TTW action management to all stock CMF tools
*Added Expression module for allowing actions and conditions of
actions to be TALES.

The code to generate the expires and effective headers for catalog queries
was broken

Big cleanup::

- replaced ZPLs with ZPL version 2.0
- added the LICENSE.txt for ZPL version 2.0
- added ZPL where it was missing (PTK Tracker issue 341)
- added CVS version string and module docstring where missing (PTK Tracker issue 341)

 - Cleanup computation of roles, effective range.

  - Updated CMFCore.CatalogTool to allow new, optional 'idxs'
    argument to 'catalog_object' (tracker #405).

  - Restored dots to 2.4 version of the runner in 'all_cmf_tests.py'.

.enumerateColumns(): "ModifiedDate" => "ModificationDate" (looks like
"ModifiedDate" was a typo in the first place, there are no other
references to such a metadata field in the CMF sources...)

 - Remove silly dependency on REQUEST (catalog already does the
   Right Thing (tm) when none available).

 - Factor out index and column lists, to ease customization (Tracker #289)

 - Index 'Type'.

Zope 2.4.0a2 compatibility.

 - Add "Overview" ZMI tab to all tools (explanations still need fleshing
   out).

Various minor changes to improve startup time

* Fix typo in catalog schema.

Merge getId changes from branch.

Fix for issue PTK(241)[]: use of .id instead of getId().

- Replace all usage of SimpleItem.id with SimpleItem.getId(). Hold on to
  your butts! I am pretty sure that I didn't miss anything and that I didn't
  break anything, but you never know.

- Remove surplus > from CMFDefault/dtml/discussionEdit.dtml.

- Add missing > to CMFTopic/skins/topic/topic_edit.dtml, this fixes the ugly
  layout.

 - Updated CatalogTool to handle searchable vs. displayable DublinCore
   dates properly.

 * Ensure that content metatypes show up in the types list of the
   portal_catalog tool (Tracker issue #209, thanks to Jeff
   Sasmor).

* Use named permission for 'inactive' content.

Oops--it's better to have Type rather than portal_type in the catalog.

Added portal_type metadata.

New workflow architecture, implementation, and a bugfix here and there.

* Initial checkin

	Diffs between and
	Generate output suitable for use with a patch program
	Type of Diff should be a Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

---

Sort log by: Not sorted Commit date Revision

---

webmaster@zope.org Powered by ViewCVS 1.0-dev

ViewCVS and CVS Help