ee9a6c5c63eba2d963a5d7581185b1004fffe964 angie Mon Apr 15 14:06:10 2013 -0700 Added indentifying name to annoStreamer for output header info and better error messages. refs #6152 diff --git src/lib/annoGrateWig.c src/lib/annoGrateWig.c index f916fc7..ca05d3d 100644 --- src/lib/annoGrateWig.c +++ src/lib/annoGrateWig.c @@ -77,32 +77,32 @@ self->lm); self->lmRowCount += slCount(rowsIn); if (retRJFilterFailed && *retRJFilterFailed) return NULL; struct annoRow *rowIn, *rowOutList = NULL;; for (rowIn = rowsIn; rowIn != NULL; rowIn = rowIn->next) tidyUp(rowIn, &rowOutList, primaryRow->start, primaryRow->end, callerLm); slReverse(&rowOutList); return rowOutList; } struct annoGrator *annoGrateWigNew(struct annoStreamer *wigSource) /* Create an annoGrator subclass for source with rowType == arWig. */ { if (wigSource->rowType != arWig) - errAbort("annoGrateWigNew: expected source->rowType arWig (%d), got %d", - arWig, wigSource->rowType); + errAbort("annoGrateWigNew: expected source->rowType arWig (%d), got %d from source %s", + arWig, wigSource->rowType, wigSource->name); struct annoGrateWig *self; AllocVar(self); struct annoGrator *gSelf = (struct annoGrator *)self; annoGratorInit(gSelf, wigSource); gSelf->integrate = agwIntegrate; self->mySource = annoGratorNew(wigSource); return gSelf; } struct annoGrator *annoGrateBigWigNew(char *fileOrUrl, struct annoAssembly *aa) /* Create an annoGrator subclass for bigWig file or URL. */ { struct annoStreamer *bigWigSource = annoStreamBigWigNew(fileOrUrl, aa); return annoGrateWigNew(bigWigSource); }