From 3edc7e80e2f4552d64b47bc8a0b0cfdc0ea16374 Mon Sep 17 00:00:00 2001 From: kjod Date: Fri, 2 Jun 2017 11:15:37 +0100 Subject: [PATCH] Fixed unit of measure bug --- ZOOM/lib/tools.py | 9 ++++++--- ZOOM/manual_mapping/manual_mapper.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ZOOM/lib/tools.py b/ZOOM/lib/tools.py index 98ea7b13..a3ea5ce0 100644 --- a/ZOOM/lib/tools.py +++ b/ZOOM/lib/tools.py @@ -97,7 +97,7 @@ def identify_col_dtype(column_values, file_heading, dicts, sample=None): #only t error_counter.append((dicts[temp_value],counter)) dtypes_found.append(dicts[temp_value]) except Exception: - print("Unicode error") + print("Unicode error, checking if another datatype") """if value in iso2_codes_dict:#try:#change to if statements, expections more costly than ifs check_dtype = "iso2" @@ -354,6 +354,7 @@ def convert_df(mappings,relationship_dict, left_over_dict, df_data, dtypes_dict, new_df = pd.DataFrame( columns = columns) counter = 0 + new_df['unit_of_measure'] = 0 for i in range(len(df_data[columns_set[0]])):#columns[0] bad idea, fix #for col in columns_set: @@ -386,8 +387,10 @@ def convert_df(mappings,relationship_dict, left_over_dict, df_data, dtypes_dict, new_df[left_over_dict[col]][counter] = df_data[col.replace("~", " ")][i] if col.replace("~", " ") in empty_unit_measure_value: - new_df['unit_of_measure'] = empty_unit_measure_value[col.replace("~", " ")] - + #print("getting unit of measure") + #print(col.replace("~", " ")) + #print(empty_unit_measure_value[col.replace("~", " ")]) + new_df['unit_of_measure'][counter] = empty_unit_measure_value[col.replace("~", " ")] #new_df = df_data[mappings[key]] #map value diff --git a/ZOOM/manual_mapping/manual_mapper.py b/ZOOM/manual_mapping/manual_mapper.py index 743a8366..a63eddc1 100644 --- a/ZOOM/manual_mapping/manual_mapper.py +++ b/ZOOM/manual_mapping/manual_mapper.py @@ -111,11 +111,12 @@ def manual_mapper(data): if unit_of_measure_value: if len(unit_of_measure_value.keys()) < 2 :#chect each entry emoty unit_of measure a dict - #print(unit_of_measure_value) mappings['unit_of_measure'] = ['unit_of_measure'] df_data['unit_of_measure'] = unit_of_measure_value[unit_of_measure_value.keys()[0]] dtypes_dict[mappings['unit_of_measure'][0]] = [('str', 'str')] else: + #print("Unit of measure values") + #print(unit_of_measure_value) mappings['unit_of_measure'] = ['unit_of_measure'] dtypes_dict[mappings['unit_of_measure'][0]] = [('str', 'str')]