cd8540f3042b909432e4257588c13d9249e583f2 angie Wed Apr 1 16:49:33 2015 -0700 hgTables fixes to support bigBed and VCF tracks that have no mysql table, only a bigDataUrl setting that may point to a local file. refs #15059 diff --git src/hg/hgTables/hgTables.c src/hg/hgTables/hgTables.c index 5dbf879..7f0ff8b 100644 --- src/hg/hgTables/hgTables.c +++ src/hg/hgTables/hgTables.c @@ -546,55 +546,30 @@ return cloneString(table); else { char *chrom = hDefaultChrom(database); if (sqlTableExists(conn, table)) return cloneString(table); else { char buf[256]; safef(buf, sizeof(buf), "%s_%s", chrom, table); return cloneString(buf); } } } -char *chrnTable(struct sqlConnection *conn, char *table) -/* Return chrN_table if table is split, otherwise table. - * You can freeMem this when done. */ -{ -char buf[256]; -char *splitTable = chromTable(conn, table); -if (!sameString(splitTable, table)) - { - safef(buf, sizeof(buf), "chrN_%s", table); - freez(&splitTable); - return cloneString(buf); - } -else - return splitTable; -} - -void checkTableExists(struct sqlConnection *conn, char *table) -/* Check that table exists, or put up an error message. */ -{ -char *splitTable = chromTable(conn, table); -if (!sqlTableExists(conn, table)) - errAbort("Table %s doesn't exist", table); -freeMem(splitTable); -} - struct hTableInfo *hubTrackTableInfo(struct trackDb *tdb) /* Given trackDb entry for a hub track, wrap table info around it. */ { struct hTableInfo *hti = NULL; if (tdb->subtracks == NULL) { if (startsWithWord("bigBed", tdb->type) || startsWithWord("bigGenePred", tdb->type)) hti = bigBedToHti(tdb->track, NULL); else if (startsWithWord("bam", tdb->type)) hti = bamToHti(tdb->table); else if (startsWithWord("vcfTabix", tdb->type)) hti = vcfToHti(tdb->table, TRUE); } if (hti == NULL) {