b763a93bef738004614cb657ccab6805f94dda8e braney Thu Aug 15 19:06:39 2013 -0700 make HAL linked in by default, fix the problem with mismatched bases nothaving the right chars in them, start adding HAL to the table browser. refs #10637 diff --git src/hg/hgTables/joining.c src/hg/hgTables/joining.c index 8a2f920..c3c91d7 100644 --- src/hg/hgTables/joining.c +++ src/hg/hgTables/joining.c @@ -291,30 +291,40 @@ static void makeBigBedOrderedCommaFieldList(struct joinerDtf *dtfList, struct dyString *dy) /* Make comma-separated field list in same order as fields are in * big bed. */ { struct sqlConnection *conn = NULL; if (!trackHubDatabase(database)) conn = hAllocConn(dtfList->database); struct slName *fieldList = bigBedGetFields(dtfList->table, conn); makeOrderedCommaFieldList(fieldList, dtfList, dy); slFreeList(&fieldList); hFreeConn(&conn); } +static void makeHalOrderedCommaFieldList(struct joinerDtf *dtfList, + struct dyString *dy) +/* Make comma-separated field list in same order as fields are in + * big bed. */ +{ +struct slName *fieldList = halGetFields(dtfList->table); +makeOrderedCommaFieldList(fieldList, dtfList, dy); +slFreeList(&fieldList); +} + static void makeBamOrderedCommaFieldList(struct joinerDtf *dtfList, struct dyString *dy) /* Make comma-separated field list in same order as fields are in * big bed. */ { struct slName *fieldList = bamGetFields(dtfList->table); makeOrderedCommaFieldList(fieldList, dtfList, dy); slFreeList(&fieldList); } static void makeVcfOrderedCommaFieldList(struct joinerDtf *dtfList, struct dyString *dy) /* Make comma-separated field list in same order as fields are in * big bed. */ { @@ -1008,30 +1018,32 @@ doJoin = TRUE; } } if (! doJoin) { struct sqlConnection *conn = NULL; if (!trackHubDatabase(database)) conn = hAllocConn(dtfList->database); struct dyString *dy = dyStringNew(0); if (isBigBed(database, dtfList->table, NULL, ctLookupName)) makeBigBedOrderedCommaFieldList(dtfList, dy); + else if (isHalTable(dtfList->table)) + makeHalOrderedCommaFieldList(dtfList, dy); else if (isBamTable(dtfList->table)) makeBamOrderedCommaFieldList(dtfList, dy); else if (isVcfTable(dtfList->table)) makeVcfOrderedCommaFieldList(dtfList, dy); else if (isCustomTrack(dtfList->table)) makeCtOrderedCommaFieldList(dtfList, dy); else makeDbOrderedCommaFieldList(conn, dtfList->table, dtfList, dy); doTabOutTable(dtfList->database, dtfList->table, f, conn, dy->string); hFreeConn(&conn); } else { struct joiner *joiner = allJoiner; struct joinedTables *joined = joinedTablesCreate(joiner,