3 Commits

4 changed files with 27 additions and 20 deletions

5
.gitignore vendored
View File

@ -1,8 +1,12 @@
/.gitignore
/.cproject
/.project
# /src/ # /src/
/src/ecoPCR /src/ecoPCR
/src/ecofind /src/ecofind
/src/*.P /src/*.P
/src/*.o
/src/ecogrep /src/ecogrep
# /src/libapat/ # /src/libapat/
@ -14,3 +18,4 @@
# /src/libthermo/ # /src/libthermo/
/src/libthermo/*.P /src/libthermo/*.P

View File

@ -1 +1 @@
0.8.0 1.0.0

Binary file not shown.

View File

@ -6,7 +6,7 @@
#include <getopt.h> #include <getopt.h>
#define VERSION "0.8.0" #define VERSION "1.0.1"
/* ----------------------------------------------- */ /* ----------------------------------------------- */
@ -80,7 +80,7 @@ static void PrintHelp()
PP "column 21 : sequence\n"); PP "column 21 : sequence\n");
PP "column 22 : definition\n"); PP "column 22 : definition\n");
PP "------------------------------------------\n"); PP "------------------------------------------\n");
PP " http://www.grenoble.prabi.fr/trac/ecoPCR/\n"); PP " https://git.metabarcoding.org/obitools/ecopcr/wikis/home\n");
PP "------------------------------------------\n\n"); PP "------------------------------------------\n\n");
PP "\n"); PP "\n");
@ -566,11 +566,11 @@ int main(int argc, char **argv)
) )
{ {
scname = taxonomy->taxons->taxon[seq->taxid].name; //scname = taxonomy->taxons->taxon[seq->taxid].name;
strncpy(head,seq->SQ,10); //strncpy(head,seq->SQ,10);
head[10]=0; //head[10]=0;
strncpy(tail,seq->SQ+seq->SQ_length-10,10); //strncpy(tail,seq->SQ+seq->SQ_length-10,10);
tail[10]=0; //tail[10]=0;
apatseq=ecoseq2apatseq(seq,apatseq,circular); apatseq=ecoseq2apatseq(seq,apatseq,circular);
@ -616,12 +616,13 @@ int main(int argc, char **argv)
length = posj - posi - o1->patlen - o2->patlen; length = posj - posi - o1->patlen - o2->patlen;
if (posj < posi) if (posj < posi)
length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen;
if (length && if ((length>0) && // For when primers touch or overlap
(!lmin || (length >= lmin)) && (!lmin || (length >= lmin)) &&
(!lmax || (length <= lmax))) (!lmax || (length <= lmax)))
{
printRepeat(seq,oligo1,oligo2,&tparm,o1,o2c,'D',kingdom_mode,posi,posj,erri,errj,taxonomy,delta); printRepeat(seq,oligo1,oligo2,&tparm,o1,o2c,'D',kingdom_mode,posi,posj,erri,errj,taxonomy,delta);
//printf("%s\tD\t%s...%s (%d)\t%d\t%d\t%d\t%d\t%s\n",seq->AC,head,tail,seq->SQ_length,o1Hits,o2cHits,posi,posj,scname); //printf("%s\tD\t%s...%s (%d)\t%d\t%d\t%d\t%d\t%s\n",seq->AC,head,tail,seq->SQ_length,o1Hits,o2cHits,posi,posj,scname);
}
} }
} }
} }
@ -666,13 +667,13 @@ int main(int argc, char **argv)
length = 0; length = 0;
if (posj > posi) if (posj > posi)
length=posj - posi + 1 - o2->patlen - o1->patlen; /* - o1->patlen : suppress by <EC> */ length = posj - posi + 1 - o2->patlen - o1->patlen; /* - o1->patlen : deleted by <EC> (prior to the OBITools3) */
if (posj < posi) if (posj < posi)
length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen;
if ((length>0) && // For when primers touch or overlap
if (length &&
(!lmin || (length >= lmin)) && (!lmin || (length >= lmin)) &&
(!lmax || (length <= lmax))) (!lmax || (length <= lmax)))
{
printRepeat(seq,oligo1,oligo2,&tparm,o2,o1c,'R',kingdom_mode,posi,posj,erri,errj,taxonomy,delta); printRepeat(seq,oligo1,oligo2,&tparm,o2,o1c,'R',kingdom_mode,posi,posj,erri,errj,taxonomy,delta);
//printf("%s\tR\t%s...%s (%d)\t%d\t%d\t%d\t%d\t%s\n",seq->AC,head,tail,seq->SQ_length,o2Hits,o1cHits,posi,posj,scname); //printf("%s\tR\t%s...%s (%d)\t%d\t%d\t%d\t%d\t%s\n",seq->AC,head,tail,seq->SQ_length,o2Hits,o1cHits,posi,posj,scname);
} }
@ -680,6 +681,7 @@ int main(int argc, char **argv)
} }
} }
} }
}
} /* End of taxonomic selection */ } /* End of taxonomic selection */