e5dd7551b8031d28ac2f56c3e91f6d4c3db29ff2 markd Tue Mar 24 14:28:47 2020 -0700 handle slighly different header created by some version of RepeatMasker diff --git src/hg/makeDb/hgLoadOut/hgLoadOut.c src/hg/makeDb/hgLoadOut/hgLoadOut.c index b5bc692..68aba25 100644 --- src/hg/makeDb/hgLoadOut/hgLoadOut.c +++ src/hg/makeDb/hgLoadOut/hgLoadOut.c @@ -172,33 +172,34 @@ else carefulClose(&theFile); } void readOneOut(char *rmskFile) /* Read .out file rmskFile, check each line, and print OK lines to .tab. */ { struct lineFile *lf; char *line, *words[24]; int lineSize, wordCount; /* Open .out file and process header. */ lf = lineFileOpen(rmskFile, TRUE); if (!lineFileNext(lf, &line, &lineSize)) errAbort("Empty %s", lf->fileName); -if (!startsWith(" SW perc perc", line)) +if (!(startsWith(" SW perc perc", line) || + startsWith(" SW perc perc", line) || + startsWith(" bit perc perc", line))) { - if (!startsWith(" SW perc perc", line)) errAbort("%s doesn't seem to be a RepeatMasker .out file, first " "line seen:\n%s", lf->fileName, line); } lineFileNext(lf, &line, &lineSize); lineFileNext(lf, &line, &lineSize); /* Process line oriented records of .out file. */ while (lineFileNext(lf, &line, &lineSize)) { static struct rmskOut r; char *s; wordCount = chopLine(line, words); if (wordCount < 14) errAbort("Expecting 14 or 15 words line %d of %s",