winzer/elwig-misc
3
1
Fork 0
Code Pull Requests Activity

Small fixes in migrate.py

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-05-02 10:38:26 +02:00
parent e321ef42f3
commit ea0e1e5b70
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wgmaster/migrate.py
View File

@ -385,7 +385,7 @@ def migrate_members(in_dir: str, out_dir: str) -> None:
given_name = given_name or '' given_name = given_name or ''
if WG == 'MATZEN' and given_name.startswith(' '): if WG == 'MATZEN' and given_name.startswith(' '):
funktionaer = True # FIXME funktionaer = True
family_name = re.sub(r'\s+', ' ', family_name).strip() family_name = re.sub(r'\s+', ' ', family_name).strip()
given_name = re.sub(r'\s+', ' ', given_name).strip().replace(', ', ',') 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] return [nr_str]
elif nr_str.count('/') == 1: elif nr_str.count('/') == 1:
parts = nr_str.split('/') 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]] return [parts[0], parts[1]]
elif parts[0].isdigit() and len(parts[0]) <= 6 and parts[1].isdigit() and len(parts[1]) <= 3: elif parts[0].isdigit() and len(parts[0]) <= 6 and parts[1].isdigit() and len(parts[1]) <= 3:
return [nr_str] return [nr_str]
@ -720,8 +720,8 @@ def migrate_are_commitments(in_dir: str, out_dir: str) -> None:
if len(gstnrs) == 0: if len(gstnrs) == 0:
comment = f'KG {kgnr:05}: {parz}' comment = f'KG {kgnr:05}: {parz}'
gstnr = format_gstnr(gstnrs) or gstnr or parz gstnr = format_gstnr(gstnrs) or gstnr or parz
if parz != gstnr: if parz != gstnr.replace('+', '/'):
print(f'{parz or "None":32} -> {gstnr}') print(f'{parz or "None":36} -> {gstnr}')
rdnr = REED_MAP[fb['RNR']][1] if fb['RNR'] else None rdnr = REED_MAP[fb['RNR']][1] if fb['RNR'] else None
to = fb['Bis'] if fb['Bis'] and fb['Bis'] < 3000 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' sortid = 'GV'
attributes.add('HU') attributes.add('HU')
elif sortid == 'SV': elif sortid == 'SV':
# FIXME probably Sortenverschnitt?
sortid = 'SW' sortid = 'SW'
elif sortid == 'WC': elif sortid == 'WC':
# WEIẞBURGUNDER/CHARDONNAY # WEIẞBURGUNDER/CHARDONNAY