Changeset 12812

Timestamp:

23 Mar 2015, 11:32:12 (10 years ago)

Author:

Henrik Bettermann

Message:

Skip empty rows produced by spreadsheet software.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

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

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data.csv

@@ -3 +3 @@
 Y777777,Claus,Finau,2,1990-01-03,bb@aa.ng,1234,m,requested
 ,Susann,Berson,3,1990-01-04,cc@aa.ng,1234,F,requested
+,,,,,,,,
+,, ,,,  ,,,
+,,,<IGNORE>,, ,,,
 ,Else,Mueller,4,1990-01-05,dd@aa.ng,1234,f,approved
 X888888,Alfons,Meier,5,1990-01-02,ee@aa.ng,1234,m,requested

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py

@@ -259 +259 @@
         self.assertEqual(num_warns,0)
         self.assertEqual(len(self.app['customers']), 10)
+        # Three empty rows have been skipped.
+        self.assertEqual(num, 12)
         self.assertEqual(self.app['customers']['X666666'].reg_number,'1')
         self.assertEqual(

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

@@ -274 +274 @@
         return errs, inv_errs, conv_dict
 
+    def emptyRow(self, row):
+        """Detect empty rows.
+        """
+        for value in row.values():
+            if value.strip() and not value in (None, IGNORE_MARKER):
+                return False
+        return True
+
     def doImport(self, path, headerfields, mode='create', user='Unknown',
                  logger=None, ignore_empty=True):
@@ -308 +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',):