37896d69583d782c7e4f365e9d460eddee04a8e0 hiram Thu Nov 21 10:55:26 2013 -0800 temporary disable USE_HAL check to verify refs #12119 diff --git src/hg/hgTables/hal.c src/hg/hgTables/hal.c index 4ca2a4b..4e4a5f0 100644 --- src/hg/hgTables/hal.c +++ src/hg/hgTables/hal.c @@ -1,84 +1,85 @@ #include "common.h" #include "cart.h" #include "jksql.h" #include "grp.h" #include "hubConnect.h" #include "hdb.h" #include "maf.h" #include "hgTables.h" #include "trackHub.h" -#ifdef USE_HAL +// temp disable this to verify #12119 +// #ifdef USE_HAL #include "halBlockViz.h" -#endif // USE_HAL +// #endif // USE_HAL extern struct trackDb *curTrack; /* Currently selected track. */ extern char *database; extern struct hash *fullTableToTdbHash; /* All tracks and subtracks keyed by tdb->table field. */ boolean isHalTable(char *table) /* Return TRUE if table corresponds to a HAL file. */ { if (isHubTrack(table)) { struct trackDb *tdb = hashFindVal(fullTableToTdbHash, table); return startsWithWord("halSnake", tdb->type); } else return trackIsType(database, table, curTrack, "halSnake", ctLookupName); } struct trackDb *findTrackDb(struct trackDb *trackDb, char *table) // find a child of a composite that corresponds to this table { if (sameString(trackDb->table, table)) return trackDb; struct trackDb *subTrack = trackDb->subtracks; struct trackDb *childTrackDb; for(; subTrack; subTrack = subTrack->next) { if ((childTrackDb = findTrackDb(subTrack, table)) != NULL) return childTrackDb; } return NULL; } void doHalMaf(struct trackDb *parentTrack, char *table, struct sqlConnection *conn) /* Output regions as MAF. maf tables look bed-like enough for * cookedBedsOnRegions to handle intersections. */ { -#ifdef USE_HAL +// #ifdef USE_HAL struct region *region = NULL, *regionList = getRegions(); struct trackDb *tdb; if ((tdb = findTrackDb(parentTrack, table)) == NULL) errAbort("cannot find track named %s under %s\n", table, parentTrack->table); char *fileName = trackDbSetting(tdb, "bigDataUrl"); char *otherSpecies = trackDbSetting(tdb, "otherSpecies"); int handle = halOpenLOD(fileName); struct hal_species_t *speciesList = halGetSpecies(handle); for(; speciesList; speciesList = speciesList->next) { if (sameString(speciesList->name, otherSpecies)) break; } if (speciesList == NULL) errAbort("cannot find species %s in hal file %s\n", otherSpecies, fileName); speciesList->next = NULL; textOpen(); for (region = regionList; region != NULL; region = region->next) { halGetMAF(stdout, handle, speciesList, trackHubSkipHubName(database), region->chrom, region->start, region->end, FALSE); } -#else // USE_HAL -errAbort("hgTables not compiled with HAL support."); -#endif // USE_HAL +// #else // USE_HAL +// errAbort("hgTables not compiled with HAL support."); +// #endif // USE_HAL }