diff --git a/tools/human_genome_variation/sift.xml b/tools/human_genome_variation/sift.xml index 443919e87fc..5c4f34e8104 100644 --- a/tools/human_genome_variation/sift.xml +++ b/tools/human_genome_variation/sift.xml @@ -2,7 +2,7 @@ predictions of functional sites - sift_variants_wrapper.sh "$input" "$output" "${input.metadata.dbkey}" "${GALAXY_DATA_INDEX_DIR}/sift_db.loc" "$chrom_col" "$pos_col" "$base" "$allele_col" "$strand_source.strand_col" "$output_opts" + sift_variants_wrapper.sh "$input" "$output" "${input.metadata.dbkey}" "${GALAXY_DATA_INDEX_DIR}/sift_db.loc" "$chrom_col" "$pos_col" "$base" "$allele_col" "$strand_source.strand_col" "$comment_source.comment_col" "$output_opts" @@ -13,12 +13,12 @@ - + - + @@ -33,6 +33,18 @@ + + + + + + + + + + + + @@ -66,7 +78,7 @@ - + diff --git a/tools/human_genome_variation/sift_variants_wrapper.sh b/tools/human_genome_variation/sift_variants_wrapper.sh index 67468c0a590..316dee75d2f 100755 --- a/tools/human_genome_variation/sift_variants_wrapper.sh +++ b/tools/human_genome_variation/sift_variants_wrapper.sh @@ -9,7 +9,8 @@ pos_col=$6 base=$7 allele_col=$8 strand_col=$9 -output_opts=${10} +comment_col=${10} +output_opts=${11} working_dir=$PWD sift_input="$working_dir/sift_input.txt" @@ -59,13 +60,23 @@ else strand_cvt='if ( '"${strand}"' == "+") { '"${strand}"' = "1" } else if ( '"${strand}"' == "-") { '"${strand}"' = "-1"}' fi +if [ "$comment_col" = "-" ]; then + is_comment=0 +else + is_comment=1 +fi + awk ' BEGIN {FS="\t";OFS=","} { $'"${chrom_col}"' = tolower($'"${chrom_col}"') sub(/^chr/, "", $'"${chrom_col}"') '"${strand_cvt}"' - print $'"${chrom_col}"', $'"${beg_col}"', $'"${end_col}"', '"${strand}"', $'"${allele_col}"' + if ('"${is_comment}"') { + print $'"${chrom_col}"', $'"${beg_col}"', $'"${end_col}"', '"${strand}"', $'"${allele_col}"', $'"${comment_col}"' + } else { + print $'"${chrom_col}"', $'"${beg_col}"', $'"${end_col}"', '"${strand}"', $'"${allele_col}"' + } } ' "$input_file" > "$sift_input"