Merge lp:~therp-nl/banking-addons/6.1_lp1117319_abnamro_sepa_line into lp:banking-addons/6.1

[Ronald Portier (Therp)]

Make it possible to import abnamro statement files with extended sepa attributes in line.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for fixing this!

l.8,28 Maybe combine in a single dictionary of possible keys?
l.62 Looks like the last key/value pair is not stored in sepa_dict. You could copy this line after the end of the 'while' loop.

review: Needs Fixing

[lp:~therp-nl/banking-addons/6.1_lp1117319_abnamro_sepa_line]

162. By Ronald Portier (Therp) on 2013-02-06

[FIX] Improved on bug fix in previous revision, to
      not forget the last value in the sepa dictionary.

      Go through all items in sepa line in old school JSP nested loop.

163. By Ronald Portier (Therp) on 2013-02-08

[FIX] Updated parsing of abnamro sepa string to handle even more unlikely cases.

164. By Ronald Portier (Therp) on 2013-04-17

[FIX] More meaningfull names for index variable names.

Unmerged revisions

=== modified file 'account_banking_nl_abnamro/abnamro.py'
--- account_banking_nl_abnamro/abnamro.py	2012-10-27 19:53:50 +0000
+++ account_banking_nl_abnamro/abnamro.py	2013-02-06 22:51:18 +0000
@@ -155,28 +155,46 @@
             The string consists of slash separated KEY/VALUE pairs,
             but the slash is allowed to and known to occur in VALUE as well!
             """
-            items = field[1:].split('/') # skip leading slash
+            items = field[1:].split('/')  # skip leading slash
+            assert len(items) > 1, (
+                _('unable to parse SEPA string: %s - %s') %
+                (field, _('too few items')))
+            known_keys = [
+                'TRTP', 'IBAN', 'BIC', 'NAME', 'RTRN', 'EREF', 'SWOC', 'REMI',
+                'ADDR', 'BIC', 'CPRP', 'CREF', 'CSID', 'ISDT', 'MARF', 'NRTX',
+                'NRTXR', 'PREF', 'PURP', 'REFOB', 'RREF', 'RTYP', 'SVCL',
+                'SWOD'
+            ]
+            # Xtended keys have an extra part, separated from the first part
+            # with a double slash. For example: 'ORIG//CSID'.
+            # The double slash will make that the first part in items is
+            # followed by an empty string item, and then the other part of the
+            # key.
+            extended_keys = [
+                'BENM', 'ORDP', 'ORIG', 'ULTD', 'ULTB'
+            ]
+            known_keys.extend(extended_keys)
+            assert items[0] in known_keys, (
+                _('unable to parse SEPA string: %s - %s') %
+                (field, _('First key unknown %s') % items[0]))
             sepa_dict = {}
-            prev_key = False
-            known_keys = ['TRTP', 'IBAN', 'BIC', 'NAME', 'RTRN', 'EREF',
-                          'SWOC', 'REMI', ]
-            while items:
-                if len(items) == 1:
-                    raise osv.except_osv(
-                        _('Error !'),
-                        _("unable to parse SEPA string: %s") % field)
-                key = items.pop(0)
-                if key not in known_keys:
-                    # either an unknown key or a value containing a slash
-                    if prev_key:
-                        sepa_dict[prev_key] = sepa_dict[prev_key] + '/' + key
-                    else:
-                        raise osv.except_osv(
-                            _('Error !'),
-                            _("unable to parse SEPA string: %s") % field)
-                else:
-                    sepa_dict[key] = items.pop(0).strip()
-                    prev_key = key
+            item_index = 0
+            items_len = len(items)
+            while item_index < items_len:
+                sepa_key = items[item_index]
+                sepa_values = []
+                if  sepa_key in extended_keys:
+                    item_index += 2
+                    assert item_index < items_len, (
+                        _('SEPA key %s missing extention') % sepa_key)
+                    # For the moment no test on validity of extension
+                    sepa_key = '//'.join([sepa_key, items[item_index]])
+                item_index += 1
+                while (item_index < items_len
+                  and  items[item_index] not in known_keys):
+                    sepa_values.append(items[item_index].strip())
+                    item_index += 1
+                sepa_dict[sepa_key] = '/'.join(sepa_values)
             return sepa_dict
 
         def parse_type(field):