c432455b9bdc07ca22b2093c49fe6dc40d12a42a hiram Fri Feb 25 11:21:13 2011 -0800 per Mark's advice, move html printout from hdb to hui diff --git src/hg/lib/hdb.c src/hg/lib/hdb.c index bee468b..a892adb 100644 --- src/hg/lib/hdb.c +++ src/hg/lib/hdb.c @@ -25,32 +25,30 @@ #include "liftOver.h" #include "liftOverChain.h" #include "grp.h" #include "twoBit.h" #include "ra.h" #include "genbank.h" #include "chromInfo.h" #ifndef GBROWSE #include "axtInfo.h" #include "ctgPos.h" #include "hubConnect.h" #include "customTrack.h" #include "hgFind.h" #endif /* GBROWSE */ #include "hui.h" -#include "bigBed.h" -#include "bigWig.h" static char const rcsid[] = "$Id: hdb.c,v 1.433 2010/05/21 16:39:57 angie Exp $"; #ifdef LOWELAB #define DEFAULT_PROTEINS "proteins060115" #define DEFAULT_GENOME "Pyrobaculum aerophilum" #else #define DEFAULT_PROTEINS "proteins" #define DEFAULT_GENOME "Human" #endif static struct sqlConnCache *hdbCc = NULL; /* cache for primary database connection */ static struct sqlConnCache *centralCc = NULL; static char *centralDb = NULL; @@ -4927,72 +4925,15 @@ char *bbiNameFromSettingOrTable(struct trackDb *tdb, struct sqlConnection *conn, char *table) /* Return file name from bigDataUrl or little table. */ { char *fileName = cloneString(trackDbSetting(tdb, "bigDataUrl")); if (fileName == NULL) { char query[256]; safef(query, sizeof(query), "select fileName from %s", table); fileName = sqlQuickString(conn, query); if (fileName == NULL) errAbort("Missing fileName in %s table", table); } return fileName; } - -void printUpdateTime(char *database, struct trackDb *tdb, - struct customTrack *ct) -/* display table update time */ -{ -/* have not decided what to do for a composite container */ -if (tdbIsComposite(tdb)) - return; -struct sqlConnection *conn = NULL; -char *tableName = NULL; -if (isCustomTrack(tdb->track)) - { - if (ct) - { - conn = hAllocConn(CUSTOM_TRASH); - tableName = ct->dbTableName; - } - } -else if (startsWith("big", tdb->type)) - { - char *tableName = hTableForTrack(database, tdb->table); - struct sqlConnection *conn = hAllocConnTrack(database, tdb); - char *bbiFileName = bbiNameFromSettingOrTable(tdb, conn, tableName); - hFreeConn(&conn); - struct bbiFile *bbi = NULL; - if (startsWith("bigBed", tdb->type)) - bbi = bigBedFileOpen(bbiFileName); - if (startsWith("bigWig", tdb->type)) - bbi = bigWigFileOpen(bbiFileName); - time_t timep = 0; - if (bbi) - { - timep = bbiUpdateTime(bbi); - bbiFileClose(&bbi); - } - printBbiUpdateTime(&timep); - } -else - { - tableName = hTableForTrack(database, tdb->table); - conn = hAllocConnTrack(database, tdb); - } -if (tableName) - { - char *date = firstWordInLine(sqlTableUpdate(conn, tableName)); - if (date != NULL) - printf("<B>Data last updated: </B>%s<BR>\n", date); - } -hFreeConn(&conn); -} - -void printBbiUpdateTime(time_t *timep) -/* for bbi files, print out the timep value */ -{ - printf ("<B>Data last updated: </B>%s<BR>\n", - sqlUnixTimeToDate(timep, FALSE)); -}