Author: jmorliaguet
Date: Tue May 2 00:14:53 2006
New Revision: 3014
Modified:
cpsskins/branches/paris-sprint-2006/setup/io.py
cpsskins/branches/paris-sprint-2006/standard/io/relation.py
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
Log:
- fixes
- added a benchmark timer in debug mode (typically: export 0.1s / import 0.5s)
Modified: cpsskins/branches/paris-sprint-2006/setup/io.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/io.py (original)
+++ cpsskins/branches/paris-sprint-2006/setup/io.py Tue May 2 00:14:53 2006
@@ -95,11 +95,11 @@
context = self.context
node = self.node
- document = self.getDocument()
+ document = self.document
type = IType(context)
- element_el = document.createElement(IType(context).resourcename)
+ element_el = document.createElement(type.resourcename)
element_el.setAttribute(u'id', unicode(IRelatable(context)))
if type.contentname != type.resourcename:
@@ -107,7 +107,6 @@
# properties
schema = type.getContentType()
-
for attr, field in zope.schema.getFieldsInOrder(schema):
if attr in self.ignored_fields:
continue
Modified: cpsskins/branches/paris-sprint-2006/standard/io/relation.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/io/relation.py (original)
+++ cpsskins/branches/paris-sprint-2006/standard/io/relation.py Tue May 2
00:14:53 2006
@@ -31,7 +31,7 @@
context = self.context
node = self.node
- document = self.getDocument()
+ document = self.document
relation_el = document.createElement(IType(context).contentname)
relation_el.setAttribute(u'predicate', str(context))
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py Tue May
2 00:14:53 2006
@@ -17,6 +17,9 @@
"""
__docformat__ = "reStructuredText"
+import time
+import logging
+
from xml.dom.minidom import parseString, DOMImplementation, Node
from zope.app import zapi
@@ -37,6 +40,8 @@
from cpsskins.setup.snapshot import Snapshot
from cpsskins.utils import getThemeManager
+logger = logging.getLogger("cpsskins")
+
class SiteDesignerView:
"""Site designer view"""
@@ -209,12 +214,16 @@
return getThemeManager(self.context).getSnapshotStorage()
def createSnapshot(self):
- data = self.exportSite()
+ start = time.time()
+ data = self.exportSite()
snapshots = self.getSnapshotStorage()
snapshot = Snapshot(data=data)
snapshots.add(snapshot, snapshot.filename)
+ logger.debug(u"Snapshot '%s' created in %f seconds.",
+ snapshot.filename, time.time()-start)
+
self.request.response.setHeader('content-type', 'text/x-json')
return json.write({'form': {
'snapshot': snapshot.filename,
@@ -239,9 +248,15 @@
def importSnapshot(self, filename=u''):
if not filename:
raise ValueError("No snaphost filename specified.")
+
+ start = time.time()
+
snapshots = self.getSnapshotStorage()
self.importSite(snapshots[filename])
+ logger.debug(u"Snapshot '%s' imported in %f seconds.", filename,
+ time.time()-start)
+
### Storage ######################################################
def exportStorage(self, name=u''):
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
