Author: jmorliaguet
Date: Fri Jun 23 11:43:07 2006
New Revision: 3495
Modified:
cpsskins/branches/paris-sprint-2006/setup/io/migration.py
Log:
- fixes
Modified: cpsskins/branches/paris-sprint-2006/setup/io/migration.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/io/migration.py (original)
+++ cpsskins/branches/paris-sprint-2006/setup/io/migration.py Fri Jun 23
11:43:07 2006
@@ -43,11 +43,9 @@
'Page Block': ('',),
}
- def __init__(self, file):
+ def __init__(self, file, themes):
self.file = file
-
- self.themes = ThemeManagementFolder()
- self.themes.registerUtilities()
+ self.themes = themes
self.archive = TarArchive(mode='r', data=file.read())
self.resources = getUtility(IResourceManager)
@@ -56,12 +54,9 @@
def __call__(self):
theme_names = self.getThemeNames()
for theme_name in theme_names:
- #self.importStyles(theme_name)
self.importTheme(theme_name)
self.importImages(theme_name)
- return self.themes
-
def getThemeNames(self):
names = []
for item in self.archive['themes/']:
@@ -97,7 +92,7 @@
# add slots into cells
for slot_name in self.getObjects(pageblock_node,
- u'Portal Box Group Templet'):
+ (u'Portal Box Group Templet',)):
slot_path = '%s/%s.xml' % (pageblock_info['path'], slot_name)
slot_doc = parseString(archive[slot_path])
slot_node = slot_doc.childNodes[0]
@@ -119,7 +114,7 @@
meta_type = node.getAttribute('meta_type')
meta_types = self.meta_types
children_types = self.children_types[meta_type]
- names = self.getObjects(node, children_types).keys()
+ names = self.getObjects(node, children_types)
self.objects.setdefault(meta_type, []).append({
'path': current_path,
@@ -133,8 +128,8 @@
child_node = child_doc.childNodes[0]
child_type = child_node.getAttribute('meta_type')
props = self.getProperties(child_node, 'title')
- self.addObject(meta_types[child_type], container, **props)
- self.importObject(child_node, container, current_path + '/' + name)
+ object = self.addObject(meta_types[child_type], container, **props)
+ self.importObject(child_node, object, current_path + '/' + name)
def importImages(self, theme_name):
resources = self.resources
@@ -162,14 +157,14 @@
return info
def getObjects(self, node=None, types=()):
- info = {}
+ objects = []
for obj in node.getElementsByTagName('object'):
- name = obj.getAttribute('name')
meta_type = obj.getAttribute('meta_type')
- if type and meta_type not in types:
+ if meta_type and meta_type not in types:
continue
- info[name] = meta_type
- return info
+ name = obj.getAttribute('name')
+ objects.append(name)
+ return objects
def getFileName(self, path):
return path.split('/')[-1]
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
