src/hg/hgTables/joining.c 1.52
1.52 2009/03/17 04:28:39 kent
Adding parameter to getHti, and creating a hti object for bigBed tables out of the associated .as information.
Index: src/hg/hgTables/joining.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/joining.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -b -B -U 4 -r1.51 -r1.52
--- src/hg/hgTables/joining.c 9 Jan 2009 00:58:27 -0000 1.51
+++ src/hg/hgTables/joining.c 17 Mar 2009 04:28:39 -0000 1.52
@@ -680,9 +680,9 @@
{
struct joinedTables *joined = joinedTablesNew(totalFieldCount,
totalKeyCount, maxRowCount);
struct hash *idHash = NULL;
-struct hTableInfo *hti = getHti(tj->database, tj->table);
+struct hTableInfo *hti = getHtiOnDb(tj->database, tj->table);
char *idField = getIdField(tj->database, curTrack, tj->table, hti);
if (idField != NULL)
idHash = identifierHash(tj->database, tj->table);
tjLoadSome(regionList, joined, 0, 0,
@@ -1108,9 +1108,9 @@
int *retFieldCount)
/* Get list of beds from database, in all regions, that pass filtering. */
{
/* A joining query may be required if the filter incorporates linked tables. */
-struct hTableInfo *hti = getHti(database, table);
+struct hTableInfo *hti = getHti(database, table, conn);
struct slName *fieldList = getBedFieldSlNameList(hti, database, table);
struct joinerDtf *dtfList = NULL;
struct joinerDtf *filterTables = NULL;
boolean doJoin = joinRequired(database, table,