91d7992f30d5756c352c83ff563405551dc64e1c braney Tue Aug 16 16:37:01 2011 -0700 various changes concerning the soft-reset button for #4815 diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 3413ff4..88164e2 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -3411,51 +3411,34 @@ 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); - struct sqlConnection *conn = hConnectCentral(); - char query[256]; if (errCatch->gotError) - { - safef(query, sizeof(query), - "update %s set errorMessage=\"%s\", lastNotOkTime=now() where id=%d" - , hubStatusTableName - , errCatch->message->string - , hub->id - ); - } + hubSetErrorMessage( 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); + hubSetErrorMessage(NULL, hub->id); 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)