c62d21f5442cdf3cb285a7a4ada56483c8874686 max Fri Mar 7 21:27:07 2014 -0800 Adding possibility to paste URLs of bam/bigWig/bigbed, without acustom track header line, into the hgCustom upload box (refs #12813) diff --git src/hg/lib/customPp.c src/hg/lib/customPp.c index 53942ac..cd37356 100644 --- src/hg/lib/customPp.c +++ src/hg/lib/customPp.c @@ -1,28 +1,29 @@ /* customPp - custom track preprocessor. This handles the line-oriented * input/output for the custom track system. The main services it provides * are taking care of references to URLs, which are treated as includes, * and moving lines that start with "browser" to a list. * * Also this allows unlimited "pushBack" of lines, which is handy, since * the system will analyse a number of lines of a track to see what format * it's in. */ #include "common.h" #include "linefile.h" #include "net.h" #include "customPp.h" +#include "customTrack.h" #ifdef PROGRESS_METER #include "udc.h" #endif struct customPp *customDocPpNew(struct lineFile *lf) /* Return customPp that will ignore browser lines, for doc files */ { struct customPp *cpp = customPpNew(lf); cpp->ignoreBrowserLines = TRUE; return cpp; } struct customPp *customPpNew(struct lineFile *lf) /* Return customPp on lineFile */ @@ -36,67 +37,97 @@ void customPpFree(struct customPp **pCpp) /* Close files and free up customPp. */ { struct customPp *cpp = *pCpp; if (cpp) { lineFileCloseList(&cpp->fileStack); slFreeList(&cpp->browserLines); slFreeList(&cpp->reusedLines); freeMem(cpp->inReuse); slFreeList(&cpp->skippedLines); } } +static char* bigUrlToTrackLine(char *url) +/* given the URL to a big file, create a custom track + * line for it, has to be freed. Return NULL + * if it's not a big file URL */ +{ +struct netParsedUrl npu; +netParseUrl(url, &npu); + +char baseName[PATH_LEN]; +char ext[FILEEXT_LEN]; +splitPath(npu.file, NULL, baseName, ext); +char *trackName = baseName; + +eraseTrailingSpaces(ext); +char *type = customTrackTypeFromBigFile(ext); +if (type==NULL) + return url; + +char buf[4000]; +safef(buf, sizeof(buf), "track name=%s bigDataUrl=%s type=%s\n", trackName, url, type); + +freeMem(type); +return cloneString(buf); +} + char *customPpNext(struct customPp *cpp) /* Return next line. */ { /* Check first for line to reuse. */ struct slName *reused = cpp->reusedLines; if (reused) { /* We need to keep line actually reusing in memory until next * call to customPpNext, so we move it to inReuse rather than * immediately freeing it. */ freeMem(cpp->inReuse); cpp->reusedLines = reused->next; cpp->inReuse = reused; return reused->name; } /* Get next line from file on top of stack. If at EOF * go to next file in stack. If get a http:// or https:// or ftp:// line * open file this references and push it onto stack. Meanwhile * squirrel away 'browser' lines. */ struct lineFile *lf; while ((lf = cpp->fileStack) != NULL) { char *line; if (lineFileNext(lf, &line, NULL)) { if (startsWith("http://", line) || startsWith("https://", line) || startsWith("ftp://", line)) { + if (customTrackIsBigData(line)) + line = bigUrlToTrackLine(line); + else + { lf = netLineFileOpen(line); slAddHead(&cpp->fileStack, lf); #ifdef PROGRESS_METER off_t remoteSize = 0; remoteSize = remoteFileSize(line); cpp->remoteFileSize = remoteSize; #endif continue; } + } else if (!cpp->ignoreBrowserLines && startsWith("browser", line)) { char afterPattern = line[7]; if (isspace(afterPattern) || afterPattern == 0) { slNameAddTail(&cpp->browserLines, line); continue; } } return line; } else { cpp->fileStack = lf->next; lineFileClose(&lf);