203206f36d9455bcea305ef8a1e7e399e1f925d9 tdreszer Thu Sep 23 16:14:37 2010 -0700 Made lookup of view optional in tdbIsView diff --git src/hg/lib/trackDbCustom.c src/hg/lib/trackDbCustom.c index 687e88e..0926f9d 100644 --- src/hg/lib/trackDbCustom.c +++ src/hg/lib/trackDbCustom.c @@ -775,12 +775,14 @@ boolean tdbIsView(struct trackDb *tdb,char **viewName) // Is this tdb a view? Will fill viewName if provided { -if(tdb && tdb->parent && tdb->subtracks) +if (tdbIsCompositeView(tdb)) { - char *view = trackDbLocalSetting(tdb, "view"); if(viewName) - *viewName = view; - return (view != NULL); + { + *viewName = trackDbLocalSetting(tdb, "view"); + assert(*viewName != NULL); + } + return TRUE; } return FALSE; }