From 64231b9b447d914331e3becbd4f78e7a8f565d53 Mon Sep 17 00:00:00 2001
From: Loraine Gueguen <loraine.gueguen@sb-roscoff.fr>
Date: Tue, 4 May 2021 11:22:58 +0200
Subject: [PATCH] Add clean function in SpeciesData
---
speciesData.py | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/speciesData.py b/speciesData.py
index a2fcbdb..e6862d6 100755
--- a/speciesData.py
+++ b/speciesData.py
@@ -15,14 +15,21 @@ class SpeciesData:
"""
+ def clean_string(string):
+ if not string is None and string != "":
+ clean_string = string.replace(" ", "_").replace("-", "_").replace("(", "").replace(")", "").replace("'", "")
+ return clean_string
+ else:
+ return string
+
def __init__(self, parameters_dictionary):
# self.config_dictionary = None
self.parameters_dictionary = parameters_dictionary
- self.species = parameters_dictionary["description"]["species"].replace("(", "_").replace(")", "_").replace("-", "_")
- self.genus = parameters_dictionary["description"]["genus"].replace("(", "_").replace(")", "_").replace("-", "_")
- self.strain = parameters_dictionary["description"]["strain"].replace("(", "_").replace(")", "_").replace("-", "_")
- self.sex = parameters_dictionary["description"]["sex"].replace("(", "_").replace(")", "_").replace("-", "_")
- self.common = parameters_dictionary["description"]["common_name"].replace("(", "_").replace(")", "_").replace("-", "_")
+ self.species = self.clean_string(parameters_dictionary["description"]["species"])
+ self.genus = self.clean_string(parameters_dictionary["description"]["genus"])
+ self.strain = self.clean_string(parameters_dictionary["description"]["strain"])
+ self.sex = self.clean_string(parameters_dictionary["description"]["sex"])
+ self.common = self.clean_string(parameters_dictionary["description"]["common_name"])
self.date = datetime.today().strftime("%Y-%m-%d")
self.origin = parameters_dictionary["description"]["origin"]
--
GitLab