--- imach/src/imach.c 2004/09/15 10:38:38 1.101 +++ imach/src/imach.c 2004/09/15 17:31:30 1.102 @@ -1,6 +1,9 @@ -/* $Id: imach.c,v 1.101 2004/09/15 10:38:38 brouard Exp $ +/* $Id: imach.c,v 1.102 2004/09/15 17:31:30 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.102 2004/09/15 17:31:30 brouard + Add the possibility to read data file including tab characters. + Revision 1.101 2004/09/15 10:38:38 brouard Fix on curr_time @@ -241,11 +244,11 @@ #define ODIRSEPARATOR '/' #endif -/* $Id: imach.c,v 1.101 2004/09/15 10:38:38 brouard Exp $ */ +/* $Id: imach.c,v 1.102 2004/09/15 17:31:30 brouard Exp $ */ /* $State: Exp $ */ -char version[]="Imach version 0.97b, May 2004, INED-EUROREVES "; -char fullversion[]="$Revision: 1.101 $ $Date: 2004/09/15 10:38:38 $"; +char version[]="Imach version 0.97c, September 2004, INED-EUROREVES "; +char fullversion[]="$Revision: 1.102 $ $Date: 2004/09/15 17:31:30 $"; int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ int nvar; int cptcovn=0, cptcovage=0, cptcoveff=0,cptcov; @@ -439,8 +442,8 @@ int nbocc(char *s, char occ) void cutv(char *u,char *v, char*t, char occ) { - /* cuts string t into u and v where u is ended by char occ excluding it - and v is after occ excluding it too : ex cutv(u,v,"abcdef2ghi2j",2) + /* cuts string t into u and v where u ends before first occurence of char 'occ' + and v starts after first occurence of char 'occ' : ex cutv(u,v,"abcdef2ghi2j",'2') gives u="abcedf" and v="ghi2j" */ int i,lg,j,p=0; i=0; @@ -4399,7 +4402,10 @@ int main(int argc, char *argv[]) i=1; while (fgets(line, MAXLINE, fic) != NULL) { if ((i >= firstobs) && (i <=lastobs)) { - + for(j=0; line[j] != '\n';j++){ /* Untabifies line */ + if(line[j] == '\t') + line[j] = ' '; + } for (j=maxwav;j>=1;j--){ cutv(stra, strb,line,' '); s[j][i]=atoi(strb); strcpy(line,stra);