2008-06-09 14:03:45 +00:00
parent 6a8bacd693
commit 82cf928d87
11 changed files with 6 additions and 2 deletions
--- a/src/obitools/seqdb/genbank/init.py
+++ b/src/obitools/seqdb/genbank/init.py
--- a/src/obitools/seqdb/genbank/graph/init.py
+++ b/src/obitools/seqdb/genbank/graph/init.py
--- a/src/obitools/seqdb/genbank/graph/algorithms/init.py
+++ b/src/obitools/seqdb/genbank/graph/algorithms/init.py
--- a/src/obitools/seqdb/genbank/graph/algorithms/clique.py
+++ b/src/obitools/seqdb/genbank/graph/algorithms/clique.py
--- a/src/obitools/seqdb/genbank/graph/algorithms/component.py
+++ b/src/obitools/seqdb/genbank/graph/algorithms/component.py
--- a/src/obitools/seqdb/genbank/graph/dag.py
+++ b/src/obitools/seqdb/genbank/graph/dag.py
--- a/src/obitools/seqdb/genbank/graph/rootedtree.py
+++ b/src/obitools/seqdb/genbank/graph/rootedtree.py
--- a/src/obitools/seqdb/genbank/graph/tree.py
+++ b/src/obitools/seqdb/genbank/graph/tree.py
--- a/src/obitools/seqdb/genbank/ncbi.py
+++ b/src/obitools/seqdb/genbank/ncbi.py
--- a/src/obitools/seqdb/genbank/parser.py
+++ b/src/obitools/seqdb/genbank/parser.py
--- a/src/obitools/utils/bioseq.py
+++ b/src/obitools/utils/bioseq.py
@ -7,11 +7,15 @@ def uniqSequence(seqIterator):
        s = str(seq)
        if s in uniques:
            s = uniques[s]
-            s['count']+=1
+            if 'count' in seq:
+                s['count']+=seq['count']
+            else:
+                s['count']+=1
            s['merged'].append(seq.id)
        else:
            uniques[s]=seq
-            seq['count']=1
+            if 'count' not in seq:
+                seq['count']=1
            seq['merged']=[seq.id]
            uniqSeq.append(seq)