Changeset 13607

Timestamp:

13 Jan 2016, 06:34:05 (9 years ago)

Author:

Henrik Bettermann

Message:

Fix certificate course importer. Empty mandatory fields were imported as <IGNORE>.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/university

Files:

• batching.py (modified) (1 diff)
• tests/sample_certificatecourse_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/university/batching.py

@@ -416 +416 @@
     def addEntry(self, obj, row, site):
         parent = self.getParent(row, site)
-        parent.addCertCourse(row['course'],
-                            row['level'], row.get('mandatory',None))
-                            # mandatory is not a required and might be missing
+        # mandatory is not a required and might be missing or can be
+        # the ignore-marker.
+        mandatory = row.get('mandatory', None)
+        if mandatory in (None, IGNORE_MARKER):
+            parent.addCertCourse(row['course'], row['level'])
+            return
+        parent.addCertCourse(row['course'], row['level'], mandatory)
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/university/tests/sample_certificatecourse_data.csv

@@ -1 @@
-certificate_code,course,department_code,faculty_code,level
-CRT1,CRS1,DEP1,FAC1,200
-CRT1,CRS1,DEP1,FAC1,100
-CRT2,CRS1,DEP1,FAC1,100
+certificate_code,course,department_code,faculty_code,level,mandatory
+CRT1,CRS1,DEP1,FAC1,200,1
+CRT1,CRS1,DEP1,FAC1,300,nonsense
+CRT1,CRS1,DEP1,FAC1,400,<IGNORE>
+CRT1,CRS1,DEP1,FAC1,100,
+CRT2,CRS1,DEP1,FAC1,100,

main/waeup.kofa/trunk/src/waeup/kofa/university/tests/test_batching.py

@@ -732 +732 @@
             self.csv_file_certificatecourse, CERTIFICATECOURSE_HEADER_FIELDS)
         content = open(fail_file).read()
-        self.assertEqual(num_warns,2)
+        self.assertEqual(num_warns,2) # the last two
         self.assertEqual(
             content,
-            'faculty_code,course,level,department_code,certificate_code,'
-            '--ERRORS--\r\nFAC1,CRS1,100,DEP1,CRT1,'
-            'This object already exists.\r\nFAC1,CRS1,100,DEP1,CRT2,'
-            'Not all parents do exist yet.\r\n'
-
+            'mandatory,level,faculty_code,course,department_code,'
+            'certificate_code,--ERRORS--\r\n'
+            '<IGNORE>,100,FAC1,CRS1,'
+            'DEP1,CRT1,This object already exists.\r\n'
+            '<IGNORE>,100,FAC1,CRS1,DEP1,CRT2,Not all parents do exist yet.\r\n'
             )
         logcontent = open(self.logfile).read()
@@ -746 +746 @@
             'INFO - system - CertificateCourse Processor - '
             'sample_certificatecourse_data - CRT1 - updated: '
-            'course=CRS1, level=200\n'
+            'mandatory=True, level=200, course=CRS1\n'
             in logcontent)
-
-        return
+        return