3afecd6949c676cb08d6ade2ca191eba7c32859f braney Mon Jul 21 15:15:51 2014 -0700 in hubCheck, don't check for "type" field unless there's a bigDataUrlfield. This prevents errors on view and composite blocks in the trackDb.txt files. diff --git src/hg/lib/trackHubCheck.c src/hg/lib/trackHubCheck.c index 86d3f0b..90c16ad 100644 --- src/hg/lib/trackHubCheck.c +++ src/hg/lib/trackHubCheck.c @@ -36,34 +36,34 @@ strSwapChar(stripHtml, ')', ' '); strSwapChar(stripHtml, '(', ' '); strSwapChar(stripHtml, '[', ' '); strSwapChar(stripHtml, ']', ' '); fprintf(searchFp, "%s.%s\t%s\t%s\t%s\n",hub->url, tdb->track, tdb->shortLabel, tdb->longLabel, stripHtml); } else fprintf(searchFp, "%s.%s\t%s\t%s\n",hub->url, tdb->track, tdb->shortLabel, tdb->longLabel); } else #endif { char *relativeUrl = trackDbSetting(tdb, "bigDataUrl"); - char *type = trackDbRequiredSetting(tdb, "type"); if (relativeUrl != NULL) { + char *type = trackDbRequiredSetting(tdb, "type"); char *bigDataUrl = trackHubRelativeUrl(genome->trackDbFile, relativeUrl); verbose(2, "checking %s.%s type %s at %s\n", genome->name, tdb->track, type, bigDataUrl); if (startsWithWord("bigWig", type)) { /* Just open and close to verify file exists and is correct type. */ struct bbiFile *bbi = bigWigFileOpen(bigDataUrl); bbiFileClose(&bbi); } else if (startsWithWord("bigBed", type)) { /* Just open and close to verify file exists and is correct type. */ struct bbiFile *bbi = bigBedFileOpen(bigDataUrl); bbiFileClose(&bbi); } else if (startsWithWord("vcfTabix", type))