details: http://www.bx.psu.edu/hg/galaxy/rev/f9cc5deca786 changeset: 2355:f9cc5deca786 user: Anton Nekrutenko <anton@bx.psu.edu> date: Tue Apr 21 09:36:42 2009 -0400 description: Fixed finf_diag_hits plus a ttypo correction 2 file(s) affected in this change: tools/metag_tools/short_reads_figure_score.xml tools/taxonomy/find_diag_hits.py diffs (38 lines): diff -r 91e55ed1a0bd -r f9cc5deca786 tools/metag_tools/short_reads_figure_score.xml --- a/tools/metag_tools/short_reads_figure_score.xml Mon Apr 20 18:34:58 2009 -0400 +++ b/tools/metag_tools/short_reads_figure_score.xml Tue Apr 21 09:36:42 2009 -0400 @@ -78,7 +78,7 @@ | | -+- <---- Lower Extreme Value that is no more - that box length away from the box + than box length away from the box o <---- Outlier diff -r 91e55ed1a0bd -r f9cc5deca786 tools/taxonomy/find_diag_hits.py --- a/tools/taxonomy/find_diag_hits.py Mon Apr 20 18:34:58 2009 -0400 +++ b/tools/taxonomy/find_diag_hits.py Tue Apr 21 09:36:42 2009 -0400 @@ -154,20 +154,16 @@ rankName = rank if out_format: - cur.execute('select name,rank,N from %s_count where N = 1 and length(rank)>1' % rank) + cur.execute('select name,rank from %s_count where N = 1 and length(rank)>1' % rank) for item in cur.fetchall(): - out_string = '%s\t%s\t%d\t' % ( item[0], item[1], item[2] ) + out_string = '%s\t%s\t' % ( item[0], item[1] ) out_string += rankName - out_string += '\t' - out_string += str(taxRank[rankName]) print >>out_file, out_string else: cur.execute('select rank, count(*) from %s_count where N = 1 and length(rank)>1 group by rank' % rank) for item in cur.fetchall(): out_string = '%s\t%s\t' % ( item[0], item[1] ) out_string += rankName - out_string += '\t' - out_string += str(taxRank[rankName]) print >>out_file, out_string except Exception, e: stop_err("%s\n" % e)