c220dba2c43751caccaf9a37a54556d87bd81a44 braney Thu Feb 6 19:29:29 2014 -0800 fix a problem with maf's that are read from stdin, in which case wedon't want to use udc. Probably we should get udc to work with stdin. diff --git src/lib/maf.c src/lib/maf.c index 8ffda67..8d80ded 100644 --- src/lib/maf.c +++ src/lib/maf.c @@ -1,38 +1,44 @@ /* maf.c - Read/write maf format. */ #include "common.h" #include "linefile.h" #include "errabort.h" #include "obscure.h" #include "dnautil.h" #include "axt.h" #include "maf.h" #include "hash.h" +#include "net.h" #include char *mafRegDefTxUpstream = "txupstream"; // transcription start size upstream region struct mafFile *mafMayOpen(char *fileName) /* Open up a maf file and verify header. */ { struct mafFile *mf; struct lineFile *lf; char *line, *word; char *sig = "##maf"; -if ((lf = lineFileUdcMayOpen(fileName, TRUE)) == NULL) +if ( hasProtocol(fileName)) + lf = lineFileUdcMayOpen(fileName, TRUE); +else + lf = lineFileMayOpen(fileName, TRUE); + +if (lf == NULL) return NULL; AllocVar(mf); mf->lf = lf; lineFileNeedNext(lf, &line, NULL); if (!startsWith(sig, line)) { errAbort("%s does not start with %s", fileName, sig); } line += strlen(sig); while ((word = nextWord(&line)) != NULL) { /* Parse name=val. */ char *name = word;