src/hg/hgc/regMotif.c 1.22

1.22 2010/05/11 01:43:29 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/hgc/regMotif.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgc/regMotif.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -b -B -U 4 -r1.21 -r1.22
--- src/hg/hgc/regMotif.c	9 Jul 2009 20:42:30 -0000	1.21
+++ src/hg/hgc/regMotif.c	11 May 2010 01:43:29 -0000	1.22
@@ -120,9 +120,9 @@
 {
 int start = cartInt(cart, "o");
 struct dnaSeq *seq = NULL;
 struct dnaMotif *motif = loadDnaMotif(item, motifTable);
-char *table = tdb->tableName;
+char *table = tdb->table;
 int rowOffset = hOffsetPastBin(database, seqName, table);
 char query[256];
 struct sqlResult *sr;
 char **row;
@@ -163,12 +163,12 @@
 char fullTable[64];
 boolean hasBin = FALSE;
 char *motifTable = "flyregMotif";
 struct dnaMotif *motif = NULL;
-boolean isVersion2 = sameString(tdb->tableName, "flyreg2");
+boolean isVersion2 = sameString(tdb->table, "flyreg2");
 
 genericHeader(tdb, item);
-hFindSplitTable(database, seqName, tdb->tableName, fullTable, &hasBin);
+hFindSplitTable(database, seqName, tdb->table, fullTable, &hasBin);
 dyStringPrintf(query, "select * from %s where chrom = '%s' and ",
 	       fullTable, seqName);
 hAddBinToQuery(start, end, query);
 dyStringPrintf(query, "chromStart = %d and name = '%s'", start, item);
@@ -265,9 +265,9 @@
 {
 struct dnaMotif *motif = loadDnaMotif(item, motifTable);
 int start = cartInt(cart, "o");
 struct dnaSeq *seq = NULL;
-char *table = tdb->tableName;
+char *table = tdb->table;
 int rowOffset = hOffsetPastBin(database, seqName, table);
 char query[256];
 struct sqlResult *sr;
 char **row;
@@ -538,15 +538,15 @@
 {
 char query[256];
 struct sqlResult *sr;
 char **row;
-int rowOffset = hOffsetPastBin(database, seqName, tdb->tableName);
+int rowOffset = hOffsetPastBin(database, seqName, tdb->table);
 struct sqlConnection *conn = hAllocConn(database);
 struct transRegCodeProbe *probe = NULL;
 
 cartWebStart(cart, database, "ChIP-chip Probe Info");
 safef(query, sizeof(query), "select * from %s where name = '%s'",
-	tdb->tableName, item);
+	tdb->table, item);
 sr = sqlGetResult(conn, query);
 if ((row = sqlNextRow(sr)) != NULL)
     probe = transRegCodeProbeLoad(row+rowOffset);
 sqlFreeResult(&sr);