opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve a bunch of merge conflicts.

Browse Source
This commit is contained in:
Daniel Blankenberg
2008-10-31 11:28:09 -04:00
parent 1de07ed5c1 35168f40a5
commit ec188a33cb
24 changed files with 463 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/data_source/microbial_import_code.py
+7 -2
View File
@@ -80,7 +80,7 @@ def load_microbial_data( GALAXY_DATA_INDEX_DIR, sep='\t' ):
return microbe_info
#post processing, set build for data and add additional data to history
from galaxy import datatypes, config, jobs
from galaxy import datatypes, config, jobs, tools
from shutil import copyfile
def exec_after_process(app, inp_data, out_data, param_dict, tool, stdout, stderr):
@@ -96,7 +96,12 @@ def exec_after_process(app, inp_data, out_data, param_dict, tool, stdout, stderr
#if not (kingdom or group or org):
if not (kingdom or org):
print "Parameters are not available."
#workflow passes galaxy.tools.parameters.basic.UnvalidatedValue instead of values
if isinstance( kingdom, tools.parameters.basic.UnvalidatedValue ):
kingdom = kingdom.value
if isinstance( org, tools.parameters.basic.UnvalidatedValue ):
org = org.value
GALAXY_DATA_INDEX_DIR = app.config.tool_data_path
microbe_info = load_microbial_data( GALAXY_DATA_INDEX_DIR, sep='\t' )
new_stdout = ""