Changeset 4224 for waeup/branches/ulif-rewrite/src

Timestamp:

8 Jun 2009, 17:00:37 (15 years ago)

Author:

uli

Message:

Make use of new CSV file framework.

File:

• waeup/branches/ulif-rewrite/src/waeup/datacenter.py (modified) (5 diffs)

waeup/branches/ulif-rewrite/src/waeup/datacenter.py

@@ -10 +10 @@
 import grok
 from datetime import datetime
-from zope.component import getUtility
+from zope.component import getUtility, getMultiAdapter
 from zope.interface import Interface
+from waeup.csvfile import getCSVFile
 from waeup.interfaces import IWAeUPObject, IWAeUPCSVImporter, ICSVDataReceivers
 from waeup.utils.helpers import copyFileSystemTree
@@ -51 +52 @@
         result = []
         receivers = self.getReceivers()
+        files = self.getFiles()
         for receiver in receivers:
-            try:
-                importer = IWAeUPCSVImporter(receiver)
-                result.append(importer)
-            except:
-                pass
+            for file in files:
+                wrapped_file = getCSVFile(file.context)
+                try:
+                    importer = getMultiAdapter((wrapped_file, receiver),
+                                           IWAeUPCSVImporter)
+                    result.append(importer)
+                except:
+                    # No multi-adapter for this combination available...
+                    pass
         return result
     
@@ -97 +103 @@
                 attr = getattr(obj, attr_name)
                 # This might fail...
-                IWAeUPCSVImporter(attr)
+                #IWAeUPCSVImporter(attr)
                 result.append(attr)
             except:
@@ -118 +124 @@
             possible_importers = []
             for importer in importers:
-                try:
-                    # We could also try a complete parse...
-                    importer.checkHeader(filedescr.context)
-                except:
-                    continue
                 importer_context = (
-                    importer, self.getReceiverId(importer.context))
+                    importer, self.getReceiverId(importer.receiver))
                 possible_importers.append(importer_context)
             if len(possible_importers) == 0:
@@ -153 +154 @@
         return 'z%s' % struct.unpack('>Q', oid)[0]
 
-    def doImport(self, csvfile, receiverid, clear=None):
+    def doImport(self, path, receiverid, clear=None):
         receivers = self.getReceiverIds()
         if receiverid not in receivers.keys():
             raise ValueError('The requested data receiver cannot be found.')
         receiver = receivers[receiverid]
-        importer = IWAeUPCSVImporter(receiver)
+        filewrapper = getCSVFile(path)
+        if filewrapper is None:
+            raise ValueError('Format of CSV file not supported.')
+        importer = getMultiAdapter((filewrapper, receiver), IWAeUPCSVImporter)
         if clear is not None:
-            importer.doImport(csvfile, clear_old_data=clear)
+            importer.doImport(clear_old_data=clear)
         else:
-            importer.doImport(csvfile)
+            importer.doImport()
         return