Changeset 1392 in products

Timestamp:

Nov 24, 2009 10:45:53 AM (14 years ago)

Author:

piv

Message:

make it work for plone 2.1 in case we have directory import context

File:

• quintagroup.transmogrifier/branches/plone-2.1/quintagroup.transmogrifier/quintagroup/transmogrifier/exportimport.py (modified) (4 diffs)

quintagroup.transmogrifier/branches/plone-2.1/quintagroup.transmogrifier/quintagroup/transmogrifier/exportimport.py

@@ +1 @@
+import os
 import tempfile
 
@@ -86 +87 @@
 
 def importSiteStructure(context):
-    # this function is also called when adding Plone site, so call standard handler
-    if not context.readDataFile('.objects.xml', subdir='structure'):
-        try:
-            from Products.GenericSetup.interfaces import IFilesystemImporter
-            IFilesystemImporter(context.getSite()).import_(context, 'structure', True)
-        except ImportError:
-            pass
-        return
-
     transmogrifier = ITransmogrifier(context.getSite())
 
@@ -109 +101 @@
     transmogrifier._data = {}
 
+    # this function is also called when adding Plone site, so call standard handler
+    path = ''
+    if 'reader' in transmogrifier._raw:
+        path = transmogrifier._raw['reader'].get('path', '')
+    if not context.readDataFile('.objects.xml', subdir=os.path.join(path, 'structure')):
+        try:
+            from Products.GenericSetup.interfaces import IFilesystemImporter
+            IFilesystemImporter(context.getSite()).import_(context, 'structure', True)
+        except ImportError:
+            pass
+        return
+
     options = transmogrifier._raw['transmogrifier']
     sections = options['pipeline'].splitlines()
@@ -118 +122 @@
     # tarball replace it with given function argument
     while hasattr(last_section, 'previous'):
-        if isinstance(last_section, ReaderSection) and \
-            isinstance(last_section.import_context, gscontext.TarballImportContext):
-            last_section.import_context = context
         last_section = last_section.previous
         # end cycle if we get empty starter section