eb9622ef972f4e2b51d355a210d61defc2f64fcc kate Tue Apr 24 20:25:04 2018 -0700 Fix table browser schema display for native track. refs #21109 diff --git src/hg/lib/hui.c src/hg/lib/hui.c index ae8b3ae..bd448af 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -36,30 +36,31 @@ #include "vcfUi.h" #include "vcf.h" #include "errCatch.h" #include "samAlignment.h" #include "makeItemsItem.h" #include "bedDetail.h" #include "pgSnp.h" #include "memgfx.h" #include "trackHub.h" #include "gtexUi.h" #include "genbank.h" #include "htmlPage.h" #include "longRange.h" #include "barChartUi.h" #include "interactUi.h" +#include "interact.h" #include "customComposite.h" #include "trackVersion.h" #include "hubConnect.h" #define SMALLBUF 256 #define MAX_SUBGROUP 9 #define ADD_BUTTON_LABEL "add" #define CLEAR_BUTTON_LABEL "clear" #define JBUFSIZE 2048 #define DEF_BUTTON "<IMG id=\"btn_%s\" src=\"../images/%s\" alt=\"%s\">\n" #define DEF_BUTTON_JS "setCheckBoxesThatContain('%s',true,false,'%s','','%s');" \ "setCheckBoxesThatContain('%s',false,false,'%s','_defOff','%s');" #define DEFAULT_BUTTON(nameOrId,anc,beg,contains) \ @@ -8784,31 +8785,31 @@ else if (tdbIsLongTabix(tdb)) asObj = longTabixAsObj(); else if (tdbIsBam(tdb)) asObj = bamAsObj(); else if (tdbIsVcf(tdb)) asObj = vcfAsObj(); else if (startsWithWord("makeItems", tdb->type)) asObj = makeItemsItemAsObj(); else if (sameWord("bedDetail", tdb->type)) asObj = bedDetailAsObj(); else if (sameWord("pgSnp", tdb->type)) asObj = pgSnpAsObj(); else if (sameWord("barChart", tdb->type)) asObj = asParseText(barChartAutoSqlString); else if (sameWord("interact", tdb->type)) - asObj = asParseText(barChartAutoSqlString); + asObj = interactAsObj(); else asObj = asFromTableDescriptions(conn, tdb->table); return asObj; } struct asObject *asForTdb(struct sqlConnection *conn, struct trackDb *tdb) // Get autoSQL description if any associated with table, ignoring errAborts if any. { struct errCatch *errCatch = errCatchNew(); struct asObject *asObj = NULL; // Wrap some error catching around asForTdbOrDie. if (errCatchStart(errCatch)) { asObj = asForTdbOrDie(conn, tdb); }