diff --git a/scripts/taxonomy/readme.txt b/scripts/taxonomy/readme.txt index 1436617881a..4e643c8e41c 100644 --- a/scripts/taxonomy/readme.txt +++ b/scripts/taxonomy/readme.txt @@ -4,7 +4,7 @@ How to prepare NCBI taxonomy for Galaxy Metagenomic Toolkit 1. run runTest.sh If this script produces NO messages -> everything is OK -2. run processRaxonomy.sh +2. run processTaxonomy.sh This script does several things: - downloads taxonomy dump tarball from NCBI ftp site - downloads very large gi2taxId files for nucleotide and protein entries of GenBank diff --git a/scripts/taxonomy/tax2_Node2Name.py b/scripts/taxonomy/tax2_Node2Name.py index aef3472a0e1..becfd8d643d 100644 --- a/scripts/taxonomy/tax2_Node2Name.py +++ b/scripts/taxonomy/tax2_Node2Name.py @@ -106,6 +106,7 @@ def main(): # contains a single 'scientific name' type try: if field[2] == 'scientific name': + field[1] = field[1].replace('\t','_') sqlTemplate = string.Template('insert into names values($taxId, "$name", "$syn")') sql = sqlTemplate.substitute(taxId = int(field[0]), name = field[1], syn = field[2]) cur.execute(sql) diff --git a/tool_conf.xml.sample b/tool_conf.xml.sample index eb28080f817..27b370da5a5 100644 --- a/tool_conf.xml.sample +++ b/tool_conf.xml.sample @@ -35,6 +35,7 @@ + diff --git a/tools/filters/ChangeCase1/1.0.0/changeCase.pl b/tools/filters/ChangeCase1/1.0.0/changeCase.pl new file mode 100644 index 00000000000..589bcee8d91 --- /dev/null +++ b/tools/filters/ChangeCase1/1.0.0/changeCase.pl @@ -0,0 +1,25 @@ +#! /usr/bin/perl -w + +use strict; +use warnings; + + +# Changes case to upper or lower in specified columns +# changeCase.pl [filename] [output] [upper|lower] + +die "Check arguments\n" unless @ARGV == 3; + +open (IN, "<$ARGV[0]") or die "Cannot open $ARGV[0]:$!\n"; +open (OUT, ">$ARGV[1]") or die "Cannot create $ARGV[1]:$!\n"; + +while () { + if ($ARGV[2] eq "up") { + print OUT uc($_); + } elsif ($ARGV[2] eq "lo") { + print OUT lc($_); + } +} + +close IN; +close OUT; + diff --git a/tools/filters/ChangeCase1/1.0.0/changeCase.xml b/tools/filters/ChangeCase1/1.0.0/changeCase.xml new file mode 100644 index 00000000000..219cc5380f1 --- /dev/null +++ b/tools/filters/ChangeCase1/1.0.0/changeCase.xml @@ -0,0 +1,30 @@ + + to upper or lower + changeCase.pl $input $out_file1 "$upperLower" + + + + + + + + + + + + + + + + + + + +This tool changes case for lower to upper and vice versa. + +.. class:: infomark + +If you want to change case on a specific column use this tool in combination with *Text Manipulation->Cut* + + +