064a6ba7c9f9e4a2055cd8363f6128ac475c576e galt Fri Feb 25 15:30:32 2011 -0800 squashed my dev branch bigNetErrDisplay to test making code review easier; this code helps hgTracks display big network warnings and errors with a yellow background; it supports bigWig, bigBed, bam, and multiWig; In the case of multiWig, it can only draw the yellow background once at the beginning, and is limited to only drawing the first track that has a network error since overlapping multiple error messages would be unreadable diff --git src/hg/lib/bamFile.c src/hg/lib/bamFile.c index b1db8e2..ce69c11 100644 --- src/hg/lib/bamFile.c +++ src/hg/lib/bamFile.c @@ -206,32 +206,31 @@ samfile_t *fh = samopen(bamFileName, "rb", NULL); if (fh == NULL) { boolean usingUrl = (strstr(fileOrUrl, "tp://") || strstr(fileOrUrl, "https://")); struct dyString *urlWarning = dyStringNew(0); if (usingUrl) { char *udcFuseRoot = cfgOption("udcFuse.mountPoint"); boolean usingUdc = (udcFuseRoot != NULL && startsWith(udcFuseRoot, bamFileName)); if (usingUdc) dyStringAppend(urlWarning, " (using udcFuse)"); dyStringAppend(urlWarning, ". If you are able to access the URL with your web browser, " "please try reloading this page."); } - warn("failed to open %s%s", fileOrUrl, urlWarning->string); - return NULL; + errAbort("Failed to open %s%s", fileOrUrl, urlWarning->string); } return fh; } void bamClose(samfile_t **pSamFile) /* Close down a samefile_t */ { if (pSamFile != NULL) { samclose(*pSamFile); *pSamFile = NULL; } }