src/hg/hgTables/wiggle.c 1.79
1.79 2010/06/03 18:54:00 kent
Fixing symbol conflict with table browser isBigWig function and new library function.
Index: src/hg/hgTables/wiggle.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/wiggle.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -b -B -U 4 -r1.78 -r1.79
--- src/hg/hgTables/wiggle.c 11 May 2010 01:43:25 -0000 1.78
+++ src/hg/hgTables/wiggle.c 3 Jun 2010 18:54:00 -0000 1.79
@@ -331,9 +331,9 @@
/* If table is type wig (not bedGraph), then intersection has already been
* performed on each input (other selected subtracks must be the same type
* as table).
* Otherwise, handle intersection here. */
-if (anyIntersection() && !isWiggle(database, table) && !isBigWig(table))
+if (anyIntersection() && !isWiggle(database, table) && !isBigWigTable(table))
{
char *track2 = cartString(cart, hgtaIntersectTrack);
char *table2 = cartString(cart, hgtaIntersectTable);
if (table2 && differentWord(table2, table))
@@ -342,9 +342,9 @@
struct trackTable *tt2 = trackTableNew(tdb2, table2, conn);
struct dataVector *dataVector2 = dataVectorFetchOneRegion(tt2, region,
conn);
char *op = cartString(cart, hgtaIntersectOp);
- boolean dv2IsWiggle = (isWiggle(database, table2) || isBigWig(table2) ||
+ boolean dv2IsWiggle = (isWiggle(database, table2) || isBigWigTable(table2) ||
isBedGraph(table2));
dataVectorIntersect(dataVector1, dataVector2,
dv2IsWiggle, sameString(op, "none"));
dataVectorFree(&dataVector2);