23f8d773ae8d7d57314f9d57692c96a8194f0019 chmalee Fri Oct 11 10:02:55 2019 -0700 Fixing bug where hubCheck thought composites with only one child were multiWigs with only one child, refs #18870#note-61 diff --git src/hg/utils/hubCheck/hubCheck.c src/hg/utils/hubCheck/hubCheck.c index 11bb485..424c8d8 100644 --- src/hg/utils/hubCheck/hubCheck.c +++ src/hg/utils/hubCheck/hubCheck.c @@ -650,31 +650,32 @@ int retVal = 0; // for now all the combination style stanzas can get checked here, but // in the future they might need their own routines if (! (tdbIsComposite(tdb) || tdbIsCompositeView(tdb) || tdbIsContainer(tdb)) ) return retVal; struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { // check that subgroup lines are syntactically correct: // "subGroup name Title tag1=value1 ..." (void)membersForAllSubGroupsGet(tdb, NULL); // check that multiWigs have > 1 track - if (tdbIsContainer(tdb) && slCount(tdb->subtracks) < 2) + char *multiWigSetting = trackDbLocalSetting(tdb, "container"); + if (multiWigSetting && slCount(tdb->subtracks) < 2) { errAbort("container multiWig %s has only one subtrack. multiWigs must have more than one subtrack", tdb->track); } } errCatchEnd(errCatch); if (errCatch->gotError || errCatch->gotWarning) { // don't add a new line because one will already be inserted by the errCatch->message trackDbErr(errors, errCatch->message->string, genome, tdb, options->htmlOut); retVal = 1; } return retVal; }