Merge branch 'master' of ssh://git.renater.fr:2222/xtandempipeline

src/core/proteinxtp.cpp

@@ -180,10 +180,6 @@ void ProteinXtp::parseAccession2dbxref() {
             _dbxref_list.push_back(DbXref(ExternalDatabase::AGI_LocusCode, temp.at(0)));
             continue;
         }
-        if (ncbi_gi.indexIn(accession, 0) != -1) {
-            _dbxref_list.push_back(DbXref(ExternalDatabase::NCBI_gi, accession));
-            continue;
-        }
 
         if (swiss_prot.indexIn(accession, 0) != -1) {
             qDebug() << "ProteinXtp::parseAccession2dbxref accession SwissProt " << accession;
@@ -208,6 +204,9 @@ void ProteinXtp::parseAccession2dbxref() {
             if ((access_list.at(i-1) == "tr")&&(accession.size() == 6)) {
                 _dbxref_list.push_back(DbXref(ExternalDatabase::TrEMBL, accession));
             }
+            if ((access_list.at(i-1) == "gb")&&(ncbi_gi.indexIn(accession, 0) != -1)) {
+                _dbxref_list.push_back(DbXref(ExternalDatabase::NCBI_gi, accession));
+            }
 
         }