From b430243df0b1a6e04cf8f4627dec0d6d3455d51b Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Wed, 17 Apr 2024 16:09:23 +0100
Subject: [PATCH] merging changes made in main by jake
---
coordinator/ProcessorSurveysnewODK2.py | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/coordinator/ProcessorSurveysnewODK2.py b/coordinator/ProcessorSurveysnewODK2.py
index 02533a3..5b40c50 100644
--- a/coordinator/ProcessorSurveysnewODK2.py
+++ b/coordinator/ProcessorSurveysnewODK2.py
@@ -94,7 +94,9 @@ def get_newODK2_form_as_csv(form_credentials: dict, jobPath: str, config: dict,
'site_information/area_unit' : 'None',
'site_information/field_area' : 'None',
'site_information/field_area_in_ha' : 'site_information-field_area',
- #'site_information/variety_eth' : 'site_information-variety',
+ 'site_information/variety_eth' : 'site_information/variety_eth',
+ 'site_information/variety_name' : 'site_information/variety_name',
+ 'site_information/variety_other' : 'site_information/variety_other',
'site_information/survey_site_other' : 'None',
'major_observed_diseases' : 'None',
'SR/SR_incidence' : ('parse_cases',(('name_out','stem_rust-stemrust_incidence'),('cases', cases_incident),('fillna','none'))),
@@ -209,6 +211,19 @@ def get_newODK2_form_as_csv(form_credentials: dict, jobPath: str, config: dict,
dataframe_processed = parse_columns(dataframe_raw,column_parser_dict)
+ # Handle the different columns that may containt the variety name
+ coln1 = 'site_information/variety_eth'
+ coln2 = 'site_information/variety_name'
+ coln3 = 'site_information/variety_other'
+ dataframe_processed['site_information-variety'] = dataframe_processed.loc[:,coln1]
+ na_vars = dataframe_processed['site_information-variety'].isna()
+ dataframe_processed.loc[na_vars,'site_information-variety'] = dataframe_processed.loc[na_vars,coln2]
+ na_vars = dataframe_processed['site_information-variety'].isna()
+ dataframe_processed.loc[na_vars,'site_information-variety'] = dataframe_processed.loc[na_vars,coln3]
+ del dataframe_processed[coln1]
+ del dataframe_processed[coln2]
+ del dataframe_processed[coln3]
+
logger.debug('Saving processed csv file')
dataframe_processed.to_csv(csv_processed_path,index=False,quoting=csv.QUOTE_MINIMAL)
--
GitLab