Author: jmorliaguet
Date: Fri Jun 23 20:43:17 2006
New Revision: 3499

Modified:
   cpsskins/branches/paris-sprint-2006/setup/io/migration.py

Log:

- pass parameters in a dict

- fixed slot properties



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 
20:43:17 2006
@@ -55,7 +55,7 @@
         theme_names = self.getThemeNames()
         for theme_name in theme_names:
             self.importTheme(theme_name)
-            self.importImages(theme_name)
+            #self.importImages(theme_name)
 
     def getThemeNames(self):
         names = []
@@ -96,13 +96,18 @@
                 slot_path = '%s/%s.xml' % (pageblock_info['path'], slot_name)
                 slot_doc = parseString(archive[slot_path])
                 slot_node = slot_doc.childNodes[0]
-                slot_props = self.getProperties(slot_node, 'name', 'xpos')
+                slot_props = self.getProperties(slot_node, 'title', 
'box_group',
+                                                'xpos')
                 xpos = int(slot_props['xpos'])
+                slot_props['name'] = slot_props['box_group']
                 del slot_props['xpos']
-                self.addObject('cpsskins.canvas.slot', cells[xpos],
-                               **slot_props)
-
-    def addObject(self, type, container, name=u'', **props):
+                del slot_props['box_group']
+                print slot_props
+                self.addObject('cpsskins.canvas.slot', cells[xpos], slot_props)
+
+    def addObject(self, type, container, props=None, name=u''):
+        if props is None:
+            props = {}
         object = createObject(type, **props)
         namechooser = INameChooser(container)
         new_name = namechooser.chooseName(name, object)
@@ -128,7 +133,7 @@
             child_node = child_doc.childNodes[0]
             child_type = child_node.getAttribute('meta_type')
             props = self.getProperties(child_node, 'title')
-            object = self.addObject(meta_types[child_type], container, **props)
+            object = self.addObject(meta_types[child_type], container, props)
             self.importObject(child_node, object, current_path + '/' + name)
 
     def importImages(self, theme_name):
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to