From: Brandon King Date: Wed, 23 Jan 2008 00:17:14 +0000 (+0000) Subject: Latest genome build, eland_config file temp. solution patch. X-Git-Tag: 0.1.0~3 X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=a11f8ed00a141c6217b258d334fa67aa30ed08e0 Latest genome build, eland_config file temp. solution patch. * As per Diane's suggestion, the config file being generated will only contain the species name, which will mean "use latest build" for this species. At a later time when the web UI has been updated to allow overriding this default and selecting a specific genome build to use (the species_name|build_num convention will return). See ticket:50 for more information. --- diff --git a/gaworkflow/frontend/eland_config/views.py b/gaworkflow/frontend/eland_config/views.py index 6175718..f23f7ae 100644 --- a/gaworkflow/frontend/eland_config/views.py +++ b/gaworkflow/frontend/eland_config/views.py @@ -316,29 +316,29 @@ def getElandConfig(flowcell, regenerate=False): genome_dict = {} #l1s = form['lane1_species'] - l1s = fcObj.lane_1_library.library_species.scientific_name + '|' + \ - fcObj.lane_1_library.library_species.use_genome_build + l1s = fcObj.lane_1_library.library_species.scientific_name #+ '|' + \ + #fcObj.lane_1_library.library_species.use_genome_build genome_dict.setdefault(l1s, []).append('1') - l2s = fcObj.lane_2_library.library_species.scientific_name + '|' + \ - fcObj.lane_2_library.library_species.use_genome_build + l2s = fcObj.lane_2_library.library_species.scientific_name #+ '|' + \ + #fcObj.lane_2_library.library_species.use_genome_build genome_dict.setdefault(l2s, []).append('2') - l3s = fcObj.lane_3_library.library_species.scientific_name + '|' + \ - fcObj.lane_3_library.library_species.use_genome_build + l3s = fcObj.lane_3_library.library_species.scientific_name #+ '|' + \ + #fcObj.lane_3_library.library_species.use_genome_build genome_dict.setdefault(l3s, []).append('3') - l4s = fcObj.lane_4_library.library_species.scientific_name + '|' + \ - fcObj.lane_4_library.library_species.use_genome_build + l4s = fcObj.lane_4_library.library_species.scientific_name #+ '|' + \ + #fcObj.lane_4_library.library_species.use_genome_build genome_dict.setdefault(l4s, []).append('4') - l5s = fcObj.lane_5_library.library_species.scientific_name + '|' + \ - fcObj.lane_5_library.library_species.use_genome_build + l5s = fcObj.lane_5_library.library_species.scientific_name #+ '|' + \ + #fcObj.lane_5_library.library_species.use_genome_build genome_dict.setdefault(l5s, []).append('5') - l6s = fcObj.lane_6_library.library_species.scientific_name + '|' + \ - fcObj.lane_6_library.library_species.use_genome_build + l6s = fcObj.lane_6_library.library_species.scientific_name #+ '|' + \ + #fcObj.lane_6_library.library_species.use_genome_build genome_dict.setdefault(l6s, []).append('6') - l7s = fcObj.lane_7_library.library_species.scientific_name + '|' + \ - fcObj.lane_7_library.library_species.use_genome_build + l7s = fcObj.lane_7_library.library_species.scientific_name #+ '|' + \ + #fcObj.lane_7_library.library_species.use_genome_build genome_dict.setdefault(l7s, []).append('7') - l8s = fcObj.lane_8_library.library_species.scientific_name + '|' + \ - fcObj.lane_8_library.library_species.use_genome_build + l8s = fcObj.lane_8_library.library_species.scientific_name #+ '|' + \ + #fcObj.lane_8_library.library_species.use_genome_build genome_dict.setdefault(l8s, []).append('8') genome_list = genome_dict.keys()