78dfd4b6e906a962da40780c799f92bb7ea1b3c1 kent Wed Jan 12 15:47:29 2011 -0800 Starting to integrate data hub into table browser. Still problems, so effectively is commented out at the moment. diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index a30c4b2..bb1d0ca 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -324,36 +324,40 @@ struct hashEl *hel = hashLookup(settings, key); if (hel != NULL) reprefixString((char **)&hel->val, prefix); } static void trackDbListAddNamePrefix(struct trackDb *tdbList, char *prefix) /* Surgically alter tdbList so that it works as if every track was * renamed so as to add a prefix to it's name. */ { struct trackDb *tdb; for (tdb = tdbList; tdb != NULL; tdb = tdb->next) { addPrefixToSetting(tdb->settingsHash, "track", prefix); addPrefixToSetting(tdb->settingsHash, "parent", prefix); reprefixString(&tdb->track, prefix); + if (tdb->table != NULL) + reprefixString(&tdb->table, prefix); } } void trackHubAddNamePrefix(char *hubName, struct trackDb *tdbList) /* For a hub named "xyz" add the prefix "hub_xyz_" to each track and parent field. */ { char namePrefix[PATH_LEN]; safef(namePrefix, sizeof(namePrefix), "hub_%s_", hubName); trackDbListAddNamePrefix(tdbList, namePrefix); } void trackHubAddGroupName(char *hubName, struct trackDb *tdbList) /* Add group tag that references the hubs symbolic name. */ { struct trackDb *tdb; +char grpName[16]; +safef(grpName, sizeof(grpName), "hub_%s", hubName); for (tdb = tdbList; tdb != NULL; tdb = tdb->next) { - tdb->grp = cloneString(hubName); + tdb->grp = cloneString(grpName); hashReplace(tdb->settingsHash, "group", tdb->grp); } }