From ea0e1e5b70282cbfcd84c673dea0563b833faecf Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Tue, 2 May 2023 10:38:26 +0200 Subject: [PATCH] Small fixes in migrate.py --- wgmaster/migrate.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wgmaster/migrate.py b/wgmaster/migrate.py index db07d80..755a706 100755 --- a/wgmaster/migrate.py +++ b/wgmaster/migrate.py @@ -385,7 +385,7 @@ def migrate_members(in_dir: str, out_dir: str) -> None: given_name = given_name or '' if WG == 'MATZEN' and given_name.startswith(' '): - funktionaer = True # FIXME + funktionaer = True family_name = re.sub(r'\s+', ' ', family_name).strip() given_name = re.sub(r'\s+', ' ', given_name).strip().replace(', ', ',') @@ -607,7 +607,7 @@ def migrate_are_commitments(in_dir: str, out_dir: str) -> None: return [nr_str] elif nr_str.count('/') == 1: parts = nr_str.split('/') - if len(parts[0]) == len(parts[1]) and parts[0].isdigit() and parts[1].isdigit(): + if len(parts[0]) == len(parts[1]) and parts[0].isdigit() and parts[1].isdigit() and len(parts[0]) >= 3: return [parts[0], parts[1]] elif parts[0].isdigit() and len(parts[0]) <= 6 and parts[1].isdigit() and len(parts[1]) <= 3: return [nr_str] @@ -720,8 +720,8 @@ def migrate_are_commitments(in_dir: str, out_dir: str) -> None: if len(gstnrs) == 0: comment = f'KG {kgnr:05}: {parz}' gstnr = format_gstnr(gstnrs) or gstnr or parz - if parz != gstnr: - print(f'{parz or "None":32} -> {gstnr}') + if parz != gstnr.replace('+', '/'): + print(f'{parz or "None":36} -> {gstnr}') rdnr = REED_MAP[fb['RNR']][1] if fb['RNR'] else None to = fb['Bis'] if fb['Bis'] and fb['Bis'] < 3000 else None @@ -856,7 +856,6 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None: sortid = 'GV' attributes.add('HU') elif sortid == 'SV': - # FIXME probably Sortenverschnitt? sortid = 'SW' elif sortid == 'WC': # WEIẞBURGUNDER/CHARDONNAY