git-svn-id: https://www.grenoble.prabi.fr/svn/LECASofts/ecoPCR/branches/refactoring@40 60f365c0-8329-0410-b2a4-ec073aeeaa1d
This commit is contained in:
@ -418,7 +418,6 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
seq = ecoseq_iterator(prefix);
|
seq = ecoseq_iterator(prefix);
|
||||||
|
|
||||||
|
|
||||||
checkedSequence = 0;
|
checkedSequence = 0;
|
||||||
positiveSequence= 0;
|
positiveSequence= 0;
|
||||||
amplifiatCount = 0;
|
amplifiatCount = 0;
|
||||||
@ -427,13 +426,13 @@ int main(int argc, char **argv)
|
|||||||
{
|
{
|
||||||
checkedSequence++;
|
checkedSequence++;
|
||||||
/**
|
/**
|
||||||
* check if the sequence should be ignored
|
* check if current sequence should be ignored
|
||||||
**/
|
**/
|
||||||
if ( (g > 0) && (eco_is_taxid_ignored(excluded_taxid, g, taxonomy->taxons->taxon[seq->taxid].taxid)) )
|
if ( (g > 0) && (eco_is_taxid_ignored(excluded_taxid, g, taxonomy->taxons->taxon[seq->taxid].taxid)) )
|
||||||
goto next;
|
goto next;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* check the sequence is included
|
* check current sequence is included
|
||||||
**/
|
**/
|
||||||
if ( (r > 0) && (!eco_is_taxid_included(taxonomy, restricted_taxid, r, taxonomy->taxons->taxon[seq->taxid].taxid)) )
|
if ( (r > 0) && (!eco_is_taxid_included(taxonomy, restricted_taxid, r, taxonomy->taxons->taxon[seq->taxid].taxid)) )
|
||||||
goto next;
|
goto next;
|
||||||
@ -520,5 +519,8 @@ int main(int argc, char **argv)
|
|||||||
seq = ecoseq_iterator(NULL);
|
seq = ecoseq_iterator(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ECOFREE(restricted_taxid, "Error: could not free restricted_taxid\n");
|
||||||
|
ECOFREE(excluded_taxid, "Error: could not free excluded_taxid\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user