diff --git a/python/obitools3/version.py b/python/obitools3/version.py index 7fb2630..65834bb 100755 --- a/python/obitools3/version.py +++ b/python/obitools3/version.py @@ -1,5 +1,5 @@ major = 3 minor = 0 -serial= '0-beta1c' +serial= '0-beta14d' version ="%d.%02d.%s" % (major,minor,serial) diff --git a/src/obi_ecopcr.c b/src/obi_ecopcr.c index 155eaf7..eaffa2b 100644 --- a/src/obi_ecopcr.c +++ b/src/obi_ecopcr.c @@ -1061,7 +1061,7 @@ int obi_ecopcr(const char* i_dms_name, length = 0; if (posj > posi) length = posj - posi - o1->patlen - o2->patlen; - if (posj < posi) + else if (circular > 0) length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; if ((length>0) && // For when primers touch or overlap (!min_len || (length >= min_len)) && @@ -1151,7 +1151,7 @@ int obi_ecopcr(const char* i_dms_name, length = 0; if (posj > posi) length = posj - posi + 1 - o2->patlen - o1->patlen; /* - o1->patlen : deleted by (prior to the OBITools3) */ - if (posj < posi) + else if (circular > 0) length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; if ((length>0) && // For when primers touch or overlap (!min_len || (length >= min_len)) && @@ -1232,7 +1232,7 @@ int obi_ecopcr(const char* i_dms_name, return -1; } - fprintf(stderr,"\rDone : 100 %% "); + fprintf(stderr,"\rDone : 100 %% \n"); return 0; return 0;