Changeset 4222

Timestamp:

8 Jun 2009, 16:58:41 (16 years ago)

Author:

uli

Message:

Use new CSV file framework.

File:

• waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py (modified) (2 diffs)

waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py

@@ -6 +6 @@
 from zope.exceptions import DuplicationError
 from zope.interface import implementedBy
+from waeup.csvfile import CSVFile
+from waeup.csvfile.interfaces import ICSVFile
 from waeup.interfaces import IFacultyContainer, IFaculty, IWAeUPCSVImporter
 from waeup.utils.importexport import CSVImporter
 from waeup.viewlets import MainArea, LeftSidebar, Index, Add, FormWrapMixin
+
 
 class FacultyContainer(grok.Container):
@@ -49 +52 @@
         return implementedBy(FacultyContainer)
 
+
+#
+# CSV import stuff
+#
+class IFacultyCSVFile(ICSVFile):
+    """A CSV file that contains faculty data.
+    """
+
+class FacultyCSVFile(CSVFile):
+    """An abstraction of a CSV file containing faculties.
+    """
+    grok.implements(IFacultyCSVFile)
+    grok.provides(IFacultyCSVFile)
+    required_fields = ['code', 'title', 'title_prefix']
+
 class FacultyCSVImporter(CSVImporter):
-    """Importer to import CSV data into faculty containers.
+    """Shuffle data from faculty CSV files into faculty containers.
     """
-    grok.context(FacultyContainer)
+    # Tell, what kinds of objects we connect...
+    grok.adapts(IFacultyCSVFile, IFacultyContainer)
+    # Tell the world, that we are an importer...
     grok.implements(IWAeUPCSVImporter)
-    datatype = u'Faculty importer'
-    column_terms = ['code', 'title', 'title_prefix']
+    grok.provides(IWAeUPCSVImporter)
 
-    def doImport(self, filepath, clear_old_data=True, overwrite=True):
-        headers, data = self.getData(filepath)
-        if clear_old_data:
-            self.context.clear()
-        keys = self.context.keys()
-        for item in data:
-            data_dict = dict(map(None, headers, item))
+    datatype = u'Faculty Importer'
+
+    def doImport(self, clear_old_data=True, overwrite=True):
+        # CSVImporter instances have a `csvfile` and a `receiver`
+        # object defined which refer to the CSV file and the container.
+        for row in self.csvfile.getData():
             new_item = createObject(u'waeup.Faculty')
-            for key, val in data_dict.items():
-               setattr(new_item, key, val)
-            self.context.addFaculty(new_item)
+            for key, val in row.items():
+                setattr(new_item, key, val)
+            self.receiver.addFaculty(new_item)
         return
+
+