Changeset 12810 for main/waeup.kofa/trunk/src

Timestamp:

23 Mar 2015, 10:40:18 (10 years ago)

Author:

Henrik Bettermann

Message:

Skip empty rows produced by spreadsheet software.

Location:

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

Files:

• students/tests/sample_student_data.csv (modified) (1 diff)
• students/tests/test_batching.py (modified) (1 diff)
• utils/batching.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/sample_student_data.csv

@@ -4 +4 @@
 ,Susann,Berson,3,1990-01-04,100002,aa@aa.ng,1234,F,courses validated
 ,Else,Mueller,4,1990-01-05,100003,aa@aa.ng,1234,f,school fee paid
+,,,,,,,,,
+,,,,,,,,,
 X888888,Alfons,Meier,5,1990-01-02,100004,aa@aa.ng,1234,m,courses validated
 X999999,Herbert,Mueller,6,1990-01-02,100005,aa@aa.ng,1234,m,courses registered

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

@@ -411 +411 @@
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, STUDENT_HEADER_FIELDS)
-        self.assertEqual(num_warns,0)
+        self.assertEqual(num_warns, 0)
+        # Nine students have been added.
         self.assertEqual(len(self.app['students']), 10)
+        # Two empty rows have been skipped.
+        self.assertEqual(num, 11)
         self.assertEqual(self.app['students']['X666666'].reg_number,'1')
         self.assertEqual(

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

@@ -273 +273 @@
         return errs, inv_errs, conv_dict
 
+
+    def emptyRow(self, row):
+        """Detect empty rows.
+        """
+        for value in row.values():
+            if value:
+                return False
+        return True
+
     def doImport(self, path, headerfields, mode='create', user='Unknown',
                  logger=None, ignore_empty=True):
@@ -307 +316 @@
         for raw_row in reader:
             num += 1
+            # Skip row if empty
+            if self.emptyRow(raw_row):
+                continue
             string_row = self.applyMapping(raw_row, mapping)
             if ignore_empty and mode in ('update',):
-                # replace empty strings with ignore-markers
+                # Replace empty strings with ignore-markers
                 for key, val in string_row.items():
                     if val == '':