6411d5f0ae8b75f54dc71f28a6c0690a9d567895 braney Mon May 16 11:29:37 2011 -0700 make private (now unlisted) hubs use the same status table as the public hubs, no trash use diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index af46910..2a53671 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -3338,45 +3338,52 @@ void loadTrackHubs(struct track **pTrackList, struct trackHub **pHubList) /* Load up stuff from data hubs and append to lists. */ { struct hubConnectStatus *hub, *hubList = hubConnectStatusListFromCart(cart); for (hub = hubList; hub != NULL; hub = hub->next) { if (isEmpty(hub->errorMessage)) { /* error catching in so it won't just abort */ struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) addTracksFromTrackHub(hub->id, hub->hubUrl, pTrackList, pHubList); errCatchEnd(errCatch); - if (errCatch->gotError) - { struct sqlConnection *conn = hConnectCentral(); char query[256]; + if (errCatch->gotError) + { safef(query, sizeof(query), "update %s set errorMessage=\"%s\", lastNotOkTime=now() where id=%d" - , hubConnectTableName + , hubStatusTableName , errCatch->message->string , hub->id ); + } + else + { + safef(query, sizeof(query), + "update %s set errorMessage=\"\", lastOkTime=now() where id=%d" + , hubStatusTableName + , hub->id + ); + } sqlUpdate(conn, query); hDisconnectCentral(&conn); - } errCatchFree(&errCatch); - } } hubConnectStatusFreeList(&hubList); } boolean restrictionEnzymesOk() /* Check to see if it's OK to do restriction enzymes. */ { return (hTableExists("hgFixed", "cutters") && hTableExists("hgFixed", "rebaseRefs") && hTableExists("hgFixed", "rebaseCompanies")); } void fr2ScaffoldEnsemblLink(char *archive) /* print out Ensembl link to appropriate scaffold there */