[Z3lab-checkins] r2837 - cpsskins/branches/jmo-perspectives/standard/io

[jmorliaguet]

Author: jmorliaguet
Date: Fri Apr 14 11:42:16 2006
New Revision: 2837

Modified:
   cpsskins/branches/jmo-perspectives/standard/io/effect.py
   cpsskins/branches/jmo-perspectives/standard/io/storage.py
   cpsskins/branches/jmo-perspectives/standard/io/style.py
   cpsskins/branches/jmo-perspectives/standard/io/widget.py
Log:

- fixed the style importer

- importers return the imported object



Modified: cpsskins/branches/jmo-perspectives/standard/io/effect.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/io/effect.py    (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/effect.py    Fri Apr 14 
11:42:16 2006
@@ -67,4 +67,5 @@
         editObject(effect, props)
 
         storage.add(effect)
+        return effect
 

Modified: cpsskins/branches/jmo-perspectives/standard/io/storage.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/io/storage.py   (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/storage.py   Fri Apr 14 
11:42:16 2006
@@ -21,6 +21,7 @@
 from zope.component import adapts, getMultiAdapter, queryMultiAdapter
 from zope.interface import implements
 
+from cpsskins.elements.interfaces import IIdentifiable
 from cpsskins.storage.interfaces import IStorage
 from cpsskins.setup.interfaces import IDataExporter, IDataImporter
 
@@ -74,5 +75,9 @@
                                              name=element_type)
 
                 if importer is not None:
-                    importer.load(element_def)
+                    old_uri = element_def.getAttribute('uri')
+                    element = importer.load(element_def)
+                    new_uri = IIdentifiable(element).getURI()
+
+                    print '%s -> %s' % (old_uri, new_uri)
 

Modified: cpsskins/branches/jmo-perspectives/standard/io/style.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/io/style.py     (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/style.py     Fri Apr 14 
11:42:16 2006
@@ -21,7 +21,7 @@
 from zope.component import adapts
 from zope.interface import implements
 
-from cpsskins.standard.formats.style import IStyle
+from cpsskins.standard.formats.style import IStyle, Style
 from cpsskins.elements.interfaces import IIdentifiable
 from cpsskins.setup.interfaces import IDataExporter, IDataImporter
 
@@ -56,8 +56,9 @@
         self.request = request
 
     def load(self, dom):
-        context = self.context
+        storage = self.context
 
+        style = Style()
         for style in dom.getElementsByTagName('style'):
             for sel in style.getElementsByTagName('selector'):
                 sel_name = sel.getAttribute('name')
@@ -66,5 +67,7 @@
                     name = prop.getAttribute('name')
                     value = prop.getAttribute('value')
                     style_props[name] = value
-                context[sel_name] = style_props
+                style[sel_name] = style_props
 
+        storage.add(style)
+        return style

Modified: cpsskins/branches/jmo-perspectives/standard/io/widget.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/io/widget.py    (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/widget.py    Fri Apr 14 
11:42:16 2006
@@ -66,4 +66,5 @@
         editObject(widget, props)
 
         storage.add(widget)
+        return widget
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins