# HG changeset patch # User galaxyp # Date 1666713980 0 # Node ID 3b2874c58bcd71404e53b91e0707a51ca525cb97 # Parent 6b5ce9e2b0d012749f0e762d30bd6fe606a12cd8 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/pepquery2 commit b0bcec3ad7b4b4c682cfdf9257fe04f55dda8071 diff -r 6b5ce9e2b0d0 -r 3b2874c58bcd pepquery2.xml --- a/pepquery2.xml Sun Oct 02 23:50:18 2022 +0000 +++ b/pepquery2.xml Tue Oct 25 16:06:20 2022 +0000 @@ -32,6 +32,7 @@ #end if ## PepQuery command pepquery + -Xmx\$[ \${GALAXY_MEMORY_MB:-8192} / 1024 ]g #if $validation.task_type == "known" -s 2 $validation.decoy #else @@ -49,26 +50,33 @@ -db '$req_inputs.db_type.db_id' #end if #if $req_inputs.input_type.input_type_selector == 'peptide' - -t '$req_inputs.input_type.input_type_selector' + -t $req_inputs.input_type.input_type_selector -i '$req_inputs.input_type.multiple.input' #else - -t '$req_inputs.input_type.input_type_selector' - #if int(str($req_inputs.input_type.input_type_selector)) == 1 - -i '$req_inputs.input_type.multiple.input' + -t $req_inputs.input_type.input_type_selector + #if $req_inputs.input_type.input_type_selector == 'protein' + #if $req_inputs.input_type.multiple.protein_input_selector == 'identifier' + #set $prot_id = str($req_inputs.input_type.multiple.input).replace('|','\|') + -i '"$prot_id"' + #else + -i '$req_inputs.input_type.multiple.input' + #end if #else -i '$req_inputs.input_type.input' - #if int(str($req_inputs.input_type.input_type_selector)) == 2 + #if $req_inputs.input_type.input_type_selector == 'DNA' #if $req_inputs.input_type.frame == 'None' - -f '0' + -frame '0' #else - -f '$req_inputs.input_type.frame' + -frame '$req_inputs.input_type.frame' #end if #else -anno '$req_inputs.input_type.anno' #end if #end if #end if +#if $req_inputs.indexType -indexType $req_inputs.indexType +#end if #if $modifications.fixed_mod -fixMod '$modifications.fixed_mod' @@ -134,8 +142,8 @@ #end if $fast -o pepquery_output - | sed 's/No valid peptide/Error: No valid peptide/' | tee >(cat 1>&2) -#set $flist = str($outputs_selected).replace(',',' ') + | tee >(sed "s/\x1b[^m]*m//g" > log.txt) +#set $flist = str($outputs_selected).replace(',',' ').replace('ms_index','') && for i in $flist; do for f in `find pepquery_output/*/* -name \$i`; do cat \$f >> pepquery_output/\${i}; done; done && for f in `find pepquery_output/*/ -name parameter.txt`; do cp \$f pepquery_output/parameter.txt; done ]]> @@ -155,8 +163,8 @@ - - + +