src/hg/hgGenome/import.c 1.19
1.19 2010/05/11 01:43:24 kent
Refactoring to split the trackDb.tableName field into separate track and table fields. Similarly track.mapName field goes to the same track and table fields.
Index: src/hg/hgGenome/import.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgGenome/import.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -B -U 4 -r1.18 -r1.19
--- src/hg/hgGenome/import.c 23 Apr 2010 04:20:19 -0000 1.18
+++ src/hg/hgGenome/import.c 11 May 2010 01:43:24 -0000 1.19
@@ -169,9 +169,9 @@
for (track = trackList; track != NULL; track = track->next)
{
if (!hashLookup(groupsInDatabase, track->grp))
warn("Track %s has group %s, which isn't in grp table",
- track->tableName, track->grp);
+ track->track, track->grp);
}
/* Create dummy group for all tracks. */
AllocVar(group);
@@ -227,9 +227,9 @@
if (group != NULL && sameString(group->name, "all"))
group = NULL;
for (track = trackList; track != NULL; track = track->next)
{
- if (sameString(name, track->tableName) &&
+ if (sameString(name, track->table) &&
(group == NULL || sameString(group->name, track->grp)))
return track;
}
return NULL;
@@ -252,9 +252,9 @@
struct trackDb *track = NULL;
if (name != NULL)
{
- /* getFullTrackList tweaks tdb->tableName mrna to all_mrna, so in
+ /* getFullTrackList tweaks tdb->table mrna to all_mrna, so in
* case mrna is passed in (e.g. from hgc link to schema page)
* tweak it here too: */
if (sameString(name, "mrna"))
name = "all_mrna";
@@ -288,11 +288,11 @@
for (tdb = list; tdb != NULL; tdb = next)
{
next = tdb->next;
/* Change the mrna track to all_mrna to avoid confusion elsewhere. */
- if (sameString(tdb->tableName, "mrna"))
+ if (sameString(tdb->table, "mrna"))
{
- tdb->tableName = cloneString("all_mrna");
+ tdb->table = cloneString("all_mrna");
}
}
/* Create dummy group for custom tracks if any */
@@ -347,11 +347,11 @@
struct slName *subList = NULL;
slSort(&(track->subtracks), trackDbCmp);
for (subTdb = track->subtracks; subTdb != NULL; subTdb = subTdb->next)
{
- name = slNameNew(subTdb->tableName);
+ name = slNameNew(subTdb->table);
slAddTail(&subList, name);
- hashAdd(uniqHash, subTdb->tableName, NULL);
+ hashAdd(uniqHash, subTdb->table, NULL);
}
pList = slCat(pList, subList);
}
}
@@ -364,9 +364,9 @@
/* Return list of all tables associated with track. */
{
struct hash *uniqHash = newHash(8);
struct slName *name, *nameList = NULL;
-char *trackTable = track->tableName;
+char *trackTable = track->table;
hashAdd(uniqHash, trackTable, NULL);
if (useJoiner)
{
@@ -414,10 +414,10 @@
{
if (track == NULL)
return cartString(cart, var);
-else if (isCustomTrack(track->tableName))
- return track->tableName;
+else if (isCustomTrack(track->table))
+ return track->table;
else
{
struct slName *tableList = tablesForTrack(track, TRUE);
@@ -624,9 +624,9 @@
for (track = fullTrackList; track != NULL; track = track->next)
{
if (allTracks || sameString(selGroup->name, track->grp))
{
- hPrintf(" <OPTION VALUE=\"%s\"%s>%s\n", track->tableName,
+ hPrintf(" <OPTION VALUE=\"%s\"%s>%s\n", track->table,
(track == selTrack ? " SELECTED" : ""),
track->shortLabel);
}
}
@@ -651,9 +651,9 @@
{
struct trackDb *subTdb;
for (subTdb=track->subtracks; subTdb != NULL; subTdb = subTdb->next)
{
- if (sameWord(subTdb->tableName, table))
+ if (sameWord(subTdb->table, table))
{
tdb = subTdb;
break;
}
@@ -1450,9 +1450,9 @@
hti = getHti(database, curTable);
isPositional = htiIsPositional(hti);
}
-if (!curTrack || !sameString(curTrack->tableName, curTable))
+if (!curTrack || !sameString(curTrack->table, curTable))
{
struct trackDb *tdb = hTrackDbForTrack(database, curTable);
curTrack = tdb;
}