Changeset 4186

Timestamp:

27 May 2009, 09:58:01 (16 years ago)

Author:

uli

Message:

Move import functionality from viewlet to datacenter.

File:

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

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

@@ -157 +157 @@
         return 'z%s' % struct.unpack('>Q', oid)[0]
 
+    def doImport(self, csvfile, 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)
+        if clear is not None:
+            importer.doImport(csvfile, clear_old_data=clear)
+        else:
+            importer.doImport(csvfile)
+        return
+
         
 class IDataCenterFile(Interface):
@@ -269 +281 @@
     grok.require('waeup.manageUniversity')
     grok.template('master')
+    grok.context(DataCenter)
 
     def update(self, csvfile=None, clear=None, overwrite=None,
@@ -279 +292 @@
         if not SUBMIT:
             return
-        receivers = self.context.getReceiverIds()
-        if receiverid not in receivers.keys():
-            return
-        receiver = receivers[receiverid]
-        importer = IWAeUPCSVImporter(receiver)
-        importer.doImport(csvfile)
+        try:
+            self.context.doImport(csvfile, receiverid, clear=clear)
+        except ValueError:
+            self.flash('Could not import: %s' % os.path.basename(csvfile))
+            return
+        except:
+            self.flash('Import failed: %s' % sys.exc_info()[1])
+            return
+        self.flash('Successfully imported: %s' % os.path.basename(csvfile))
+        self.redirect(self.url(self.context))
         return
 
 class Import(object):
+    """Helper class to aggregate imports and their data.
+    """
     def __init__(self, filedescr, importers):
         self.file = filedescr