src/hg/hgTables/intersect.c 1.53
1.53 2010/05/11 01:43:25 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/hgTables/intersect.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/intersect.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -b -B -U 4 -r1.52 -r1.53
--- src/hg/hgTables/intersect.c 4 Jan 2010 19:12:22 -0000 1.52
+++ src/hg/hgTables/intersect.c 11 May 2010 01:43:25 -0000 1.53
@@ -626,14 +626,14 @@
struct slRef *tdbRef;
for (tdbRef = tdbRefList; tdbRef != NULL; tdbRef = tdbRef->next)
{
subtrack = tdbRef->val;
- if (! sameString(curTable, subtrack->tableName) &&
- isSubtrackMerged(subtrack->tableName) &&
+ if (! sameString(curTable, subtrack->table) &&
+ isSubtrackMerged(subtrack->table) &&
sameString(subtrack->type, primaryType))
{
struct bed *bedList2 =
- getRegionAsBed(db, subtrack->tableName, region, NULL,
+ getRegionAsBed(db, subtrack->table, region, NULL,
idHash, lm, retFieldCount);
bedList = slCat(bedList, bedList2);
}
}
@@ -659,16 +659,16 @@
struct slRef *tdbRef;
for (tdbRef = tdbRefList; tdbRef != NULL; tdbRef = tdbRef->next)
{
subtrack = tdbRef->val;
- if (! sameString(curTable, subtrack->tableName) &&
- isSubtrackMerged(subtrack->tableName) &&
+ if (! sameString(curTable, subtrack->table) &&
+ isSubtrackMerged(subtrack->table) &&
sameString(subtrack->type, primaryType))
{
- struct hTableInfo *hti2 = getHtiOnDb(database, subtrack->tableName);
+ struct hTableInfo *hti2 = getHtiOnDb(database, subtrack->table);
struct lm *lm2 = lmInit(64*1024);
struct bed *bedList2 =
- getRegionAsBed(db, subtrack->tableName, region, NULL, idHash,
+ getRegionAsBed(db, subtrack->table, region, NULL, idHash,
lm2, NULL);
if (firstTime)
firstTime = FALSE;
else