diff --git a/run_workflow_phaeoexplorer.py b/run_workflow_phaeoexplorer.py index e97f1fe313b1f13ec5279796a62965658e630f8a..fe77cef106fcc7f90a9cc62f6f7cf900b34b8582 100755 --- a/run_workflow_phaeoexplorer.py +++ b/run_workflow_phaeoexplorer.py @@ -492,7 +492,7 @@ class RunWorkflow(speciesData.SpeciesData): # In case of the Jbrowse workflow, we unfortunately have to manually edit the parameters instead of setting them # as runtime values, using runtime parameters makes the tool throw an internal critical error ("replace not found" error) # Scratchgmod test: need "http" (or "https"), the hostname (+ port) - if not self.config["menu_url"]: + if "menu_url" not in self.config.keys(): jbrowse_menu_url = "https://{hostname}/sp/{genus_sp}/feature/{Genus}/{species}/{id}".format(hostname=self.config["hostname"], genus_sp=self.genus_species, Genus=self.genus_uppercase, species=self.species, id="{id}") else: jbrowse_menu_url = self.config["menu_url"] diff --git a/speciesData.py b/speciesData.py index cf9da39cc8c1473f9d29c77b7f253cfb39c9be67..a2fcbdbfafabb742315fa73210b1c4f5fe102b7f 100755 --- a/speciesData.py +++ b/speciesData.py @@ -80,6 +80,7 @@ class SpeciesData: self.datasets = dict() self.config = None # Custom config used to set environment variables inside containers self.species_folder_name = "_".join(utilities.filter_empty_not_empty_items([self.genus_lowercase.lower(), self.species.lower(), self.strain.lower(), self.sex.lower()])["not_empty"]) + self.species_folder_name = self.species_folder_name .replace("-", "_") self.existing_folders_cache = {} self.bam_metadata_cache = {}