From sidnei at x3ng.com.br Mon Jun 2 07:18:12 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:13 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.28 Message-ID: <200306021118.h52BIC221928@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv21914/Extensions Modified Files: NZOMigrate.py Log Message: Fix ZWikiPages while copying over. === Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.27 => 1.28 === def ZWikiPage2ZWikiPage(self, obj, source, dest): obj = self.defaultMigrationMethod(obj, source, dest) + # ZWikiPages originally did not inherit from DublinCore, now they do, + # so we take our time to initialize DublinCore while copying over. + DefaultDublinCoreImpl.__init__(obj) return obj def ZCatalog2ZCatalog(self, obj, source, dest): @@ -1174,7 +1177,7 @@ if self._debug: import pdb pdb.set_trace() - + try: __traceback_info__ = (obj_url, obj.__class__.__name__, obj, source, dest) new_objs = mm(obj, source, dest) From sidnei at x3ng.com.br Mon Jun 2 07:23:06 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:13 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.29 Message-ID: <200306021123.h52BN6722610@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv22596/Extensions Modified Files: NZOMigrate.py Log Message: Avoid clashes with method names === Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.28 => 1.29 === dest = self._dest ignore = self._ignore_path source_id = source.getId() - if not hasattr(aq_base(dest), 'meta_type') or \ - not hasattr(aq_base(dest), 'objectIds'): - # maybe-not-object. eg: we acquired the 'view' method - self.log('Destination is invalid. %r \n' % dest) - return 'Ok.\n' if hasattr(source, 'objectIds') and \ hasattr(source, 'getPhysicalPath'): path = source.getPhysicalPath() @@ -1199,6 +1194,11 @@ new_objs = (new_objs, ) for new_obj in new_objs: + if not hasattr(aq_base(new_obj), 'meta_type'): + # maybe-not-object. eg: we acquired the 'view' method + self.log('New object is invalid. Probably acquired by mistake. %r.\n' % new_obj) + continue + if new_obj is None: self.log('Invalid object found when migrating: %s.\n' % obj_url) continue From sidnei at x3ng.com.br Mon Jun 2 17:19:59 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:13 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.30 Message-ID: <200306022119.h52LJxv10661@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv10636/Extensions Modified Files: NZOMigrate.py Log Message: Fixes to allow cataloging === Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.29 => 1.30 === from ZODB.POSException import POSKeyError from Acquisition import aq_base, aq_parent, aq_inner from Products.CMFCore.WorkflowCore import WorkflowException +from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl from Products.CMFCore.utils import getToolByName from Products.CMFCollector.CollectorIssue import CollectorIssue from DateTime import DateTime @@ -21,11 +22,17 @@ 'Tracker', 'Utilities', 'WikiCentral', 'projects', 'CatalogHelp', 'Help', \ 'SiteAnnouncement', 'WhatIsZope', 'ZopeArchitecture', 'ZopeNews', 'privacy.html', 'Members'] + migrate.sort() + migrate = migrate[migrate.index('Members'):] ignore_path = ['/%s' % o for o in source.objectIds() if o not in migrate] members_ignore = ['billqian', 'edward', 'epson', 'ltunes', 'michel', 'superuser', \ 'myUnreviewed', 'mail_password_form', \ 'mail_password_template', 'password_html', 'tim.kidder', 'update_html', \ 'index_html'] + mids = source.Members.objectIds() + mids.sort() + mids = mids[:mids.index('ewilliams')] + members_ignore.extend(mids) dont_migrate = ['/Members/%s' % o for o in members_ignore] ignore_path.extend(dont_migrate) if exceptions is None: @@ -168,13 +175,8 @@ username=username, assignees=assignees) except WorkflowException: - action = 'new_issue' - issue.portal_workflow.doActionFor(issue, - action, - comment=comment, - username=username, - assignees=assignees) - + pass # Leave as is. Probably pending. + new_status = issue.status().split('_')[0] transcript = issue.get_transcript() @@ -774,11 +776,12 @@ return None def ZWikiPage2ZWikiPage(self, obj, source, dest): - obj = self.defaultMigrationMethod(obj, source, dest) # ZWikiPages originally did not inherit from DublinCore, now they do, # so we take our time to initialize DublinCore while copying over. DefaultDublinCoreImpl.__init__(obj) - return obj + get_transaction().commit() + new_obj = self.defaultMigrationMethod(obj, source, dest) + return new_obj def ZCatalog2ZCatalog(self, obj, source, dest): self.log('Ignoring ZCatalog for now.\n') From sidnei at x3ng.com.br Mon Jun 2 17:20:29 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:13 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - __init__.py:1.24 Message-ID: <200306022120.h52LKTI10804@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV In directory cvs.zope.org:/tmp/cvs-serv10636 Modified Files: __init__.py Log Message: Fixes to allow cataloging === Products/ZopeOrg-NV/__init__.py 1.23 => 1.24 === import ZopeServiceProvider import ZopeOrgTypes import ZPublisher.Publish +import zLOG + +def log(message, summary='', severity=0, dup=1): + zLOG.LOG('ZopeOrg: ',severity,summary,message) #Hackish workaround to allow accesing the broken ZODB on ZopeOrg class ImplicitAcquirerWrapper: @@ -20,6 +24,28 @@ from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl DefaultDublinCoreImpl._DefaultDublinCoreImpl__FLOOR_DATE = DateTime(1979, 0) DefaultDublinCoreImpl._DefaultDublinCoreImpl__CEILING_DATE = DateTime(2979, 0) + +def SearchableText(self): + """ Used by the catalog for basic full text indexing """ + if not callable(self.Title): + log('Title should be method, found %s at %s .\n' % (type(self.Title), \ + self.absolute_url(relative=1))) + if not callable(self.Description): + log('Description should be method, found %s at %s .\n' % (type(self.Description), \ + self.absolute_url(relative=1))) + if not callable(self.EditableBody): + log('EditableBody should be method, found %s at %s .\n' % (type(self.EditableBody), \ + self.absolute_url(relative=1))) + title = callable(self.Title) and self.Title() or self.Title + description = callable(self.Description) and self.Description() or self.Description + body = callable(self.EditableBody) and self.EditableBody() or self.EditableBody + return "%s %s %s" % ( title + , description + , body + ) + +from Products.CMFDefault.Document import Document +Document.SearchableText = SearchableText Acquisition.ImplicitAcquirerWrapper = ImplicitAcquirerWrapper ZPublisher.Publish.rfind = rfind From sidnei at x3ng.com.br Mon Jun 16 16:04:41 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:13 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources Products/ZopeOrg-NV/skeleton/Resources - New directory Message-ID: <200306162004.h5GK4fx10051@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources In directory cvs.zope.org:/tmp/cvs-serv10040/Resources Log Message: Directory /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources added to the repository === Added directory Products/ZopeOrg-NV/skeleton/Resources === From sidnei at x3ng.com.br Mon Jun 16 16:05:05 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:13 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources/CaseStudies Products/ZopeOrg-NV/skeleton/Resources/CaseStudies - New directory Message-ID: <200306162005.h5GK55310202@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/CaseStudies In directory cvs.zope.org:/tmp/cvs-serv10191/Resources/CaseStudies Log Message: Directory /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/CaseStudies added to the repository === Added directory Products/ZopeOrg-NV/skeleton/Resources/CaseStudies === From sidnei at x3ng.com.br Mon Jun 16 16:05:32 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:13 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources/ZSP Products/ZopeOrg-NV/skeleton/Resources/ZSP - New directory Message-ID: <200306162005.h5GK5WG10226@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/ZSP In directory cvs.zope.org:/tmp/cvs-serv10215/Resources/ZSP Log Message: Directory /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/ZSP added to the repository === Added directory Products/ZopeOrg-NV/skeleton/Resources/ZSP === From sidnei at x3ng.com.br Mon Jun 16 16:05:40 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:13 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources/CaseStudies - index_html.cl:1.1 Message-ID: <200306162005.h5GK5e610254@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/CaseStudies In directory cvs.zope.org:/tmp/cvs-serv10233/Resources/CaseStudies Added Files: index_html.cl Log Message: Adding content listing skeleton === Added File Products/ZopeOrg-NV/skeleton/Resources/CaseStudies/index_html.cl === Title: Subject: Publisher: No publisher Description: Contributors: Effective_date: None Expiration_date: None Type: Content List Format: text/html Language: Rights: [macros] listing = here/nzo_listing_macros/macros/case_study footer = header = [default] result_source = catalog limit = 0 allowed_types = Case Study sort_order = asc sort_key = Date From sidnei at x3ng.com.br Mon Jun 16 16:05:40 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:13 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources/ZSP - index_html.cl:1.1 Message-ID: <200306162005.h5GK5eS10260@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/ZSP In directory cvs.zope.org:/tmp/cvs-serv10233/Resources/ZSP Added Files: index_html.cl Log Message: Adding content listing skeleton === Added File Products/ZopeOrg-NV/skeleton/Resources/ZSP/index_html.cl === Title: Subject: Publisher: No publisher Description: Contributors: Effective_date: None Expiration_date: None Type: Content List Format: text/html Language: Rights: [macros] listing = here/nzo_listing_macros/macros/zope_service_provider footer = header = [default] result_source = container limit = 0 allowed_types = Zope Service Provider sort_order = asc sort_key = Title From sidnei at x3ng.com.br Mon Jun 16 16:15:38 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:13 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.31 Message-ID: <200306162015.h5GKFcv11606@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv11590/Extensions Modified Files: NZOMigrate.py Log Message: Changing default username === Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.30 => 1.31 === return action_number = issue.action_number = issue.action_number + 1 - username = 'admin' + username = 'nzo_migration_tool' orig_supporters = issue.assigned_to() orig_status = issue.status().split('_')[0] From sidnei at x3ng.com.br Mon Jun 16 16:32:43 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:14 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.32 synchronizeSkeleton.py:1.30 Message-ID: <200306162032.h5GKWhX14115@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv14099/Extensions Modified Files: NZOMigrate.py synchronizeSkeleton.py Log Message: Improving migration and skeleton sync === Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.31 => 1.32 === assignees=assignees) except WorkflowException: pass # Leave as is. Probably pending. - + new_status = issue.status().split('_')[0] transcript = issue.get_transcript() @@ -381,7 +381,7 @@ udb = None if new_uid != uid: while p is not None: - if hasattr(p, 'acl_users'): + if hasattr(aq_base(p), 'acl_users'): acl_users = getattr(p, 'acl_users') try: user = acl_users.getUserById(new_uid).__of__(acl_users) @@ -391,7 +391,7 @@ # Found the right database. udb = acl_users.getPhysicalPath()[1:] break - p = aq_parent(aq_inner(p)) + p = aq_parent(aq_inner(p)) if udb is not None: ob.changeOwnership(user) #log('Changed ownership of %s from %s!%s to %s!%s.\n' % @@ -1141,6 +1141,7 @@ dest = self._dest ignore = self._ignore_path source_id = source.getId() + p_cat = getToolByName(dest, 'portal_catalog') if hasattr(source, 'objectIds') and \ hasattr(source, 'getPhysicalPath'): path = source.getPhysicalPath() @@ -1151,6 +1152,9 @@ oids.remove('acl_users') oids.insert(0, 'acl_users') for oid in oids: + if oid in p_cat.schema() or oid in p_cat.indexes(): + self.log('Oid %s at %s conflicts with catalog schema or index name.\n' % (oid, '/'.join(path))) + continue obj_path = list(path[:]) obj_path.append(oid) obj_url = '/'.join(obj_path) @@ -1201,7 +1205,7 @@ # maybe-not-object. eg: we acquired the 'view' method self.log('New object is invalid. Probably acquired by mistake. %r.\n' % new_obj) continue - + if new_obj is None: self.log('Invalid object found when migrating: %s.\n' % obj_url) continue === Products/ZopeOrg-NV/Extensions/synchronizeSkeleton.py 1.29 => 1.30 === , comment='' ) obj.reindexObject() + elif f_ext == '.cl': + container_obj.invokeFactory(id=f_name, type_name='Content List') + obj = getattr(container_obj, f_name) + from Products.CMFContentList.tests.test_getput import FakeRequest, FakeResponse + obj.PUT(FakeRequest({'BODY':f_data}), FakeResponse()) + wf_tool = getattr(container_obj, 'portal_workflow') + wf_objs = wf_tool.getWorkflowsFor(obj) + for wf_obj in wf_objs: + wf_obj.setReviewStateOf(ob=obj + , review_state='published' + , action='publish' + , comment='' + ) + obj.reindexObject() def _getProps( path ): From sidnei at x3ng.com.br Mon Jun 16 17:08:17 2003 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:14 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - nzo_listing_macros.pt:1.1 index_html.pt:1.2 Message-ID: <200306162108.h5GL8HT22200@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo In directory cvs.zope.org:/tmp/cvs-serv22184 Modified Files: index_html.pt Added Files: nzo_listing_macros.pt Log Message: Added listing macros from dev.nzo === Added File Products/ZopeOrg-NV/skins/nzo/nzo_listing_macros.pt ===
Company |
Location: Service Info: |
Summary Read More... |
Title
From sidnei at x3ng.com.br Mon Jun 16 17:10:15 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zopeorg_types - zsp_edit_form.pt:1.2
Message-ID: <200306162110.h5GLAFs22508@cvs.baymountain.com>
Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/zopeorg_types
In directory cvs.zope.org:/tmp/cvs-serv22483/skins/zopeorg_types
Modified Files:
zsp_edit_form.pt
Log Message:
One error in form action
=== Products/ZopeOrg-NV/skins/zopeorg_types/zsp_edit_form.pt 1.1 => 1.2 ===
Edit This- - |