561f452458624b64c61e2ead5cdcb705b5fcadd1 max Sat Oct 23 13:22:18 2021 -0700 fixing up missing files in last commit, refs #28324 diff --git src/hg/hgHubConnect/hgHubConnect.c src/hg/hgHubConnect/hgHubConnect.c index b483490..a1c5b5f 100644 --- src/hg/hgHubConnect/hgHubConnect.c +++ src/hg/hgHubConnect/hgHubConnect.c @@ -491,38 +491,38 @@ void printSearchAndFilterBoxes(int searchEnabled, char *hubSearchTerms, char *dbFilter) /* Create the text boxes for search and database filtering along with the required * javscript */ { printf("<FORM ACTION=\"%s\" NAME=\"searchHubForm\">\n", "../cgi-bin/hgHubConnect"); if (searchEnabled) { cgiMakeHiddenVar(hgHubDoSearch, "on"); cgiMakeHiddenVar(hgHubDbFilter, ""); cartSaveSession(cart); printf("The list below can be filtered on words in the description pages or assemblies.<BR>" "Search terms: " "<input name=\"hubSearchTerms\" id=\"hubSearchTerms\" class=\"hubField\" " - "type=\"text\" size=\"50\" value=\"%s\"> \n", + "placeholder='e.g. methylation' type=\"text\" size=\"50\" value=\"%s\"> \n", hubSearchTerms!=NULL?hubSearchTerms:""); printf("\n"); } printf("Assembly: " "<input name=\"%s\" id=\"hubDbFilter\" class=\"hubField\" " - "type=\"text\" size=\"10\" value=\"%s\"> \n" + "type=\"text\" size=\"15\" value=\"%s\" placeholder='empty or e.g. hg38'> \n" "<input name=\"hubSearchButton\" id='hubSearchButton' " "class=\"hubField\" type=\"submit\" value=\"Search Public Hubs\">\n", hgHubDbFilter, dbFilter!=NULL?dbFilter:""); puts("</FORM>"); } void printSearchTerms(char *hubSearchTerms) /* Write out a reminder about the current search terms and a note about * how to navigate detailed search results */ { printf("Displayed list <B>restricted by search terms:</B> %s\n", hubSearchTerms); puts("<input name=\"hubDeleteSearchButton\" id='hubDeleteSearchButton' " "class=\"hubField\" type=\"button\" value=\"Show All Hubs\">\n"); @@ -1205,30 +1205,31 @@ } static bool outputPublicTable(struct sqlConnection *conn, char *publicTable, char *statusTable, struct hash **pHash) /* Put up the list of public hubs and other controls for the page. */ { char *hubSearchTerms = cartOptionalString(cart, hgHubSearchTerms); char *dbFilter = cartOptionalString(cart, hgHubDbFilter); char *lcDbFilter = cloneString(dbFilter); if (isNotEmpty(lcDbFilter)) tolowers(lcDbFilter); // make sure all the public hubs are in the hubStatus table. long lastTime= clock1000(); addPublicHubsToHubStatus(cart, conn, publicTable, statusTable); +if (measureTiming) printf("Time of addPublicHubsToHubStatus: %ld <br>", (clock1000()-lastTime)); // build full public hub lookup hash, taking each URL to struct hubEntry * for that hub struct hash *hubLookup = buildPublicLookupHash(conn, publicTable, statusTable, pHash); puts("<div id=\"publicHubs\" class=\"hubList\">"); puts("<div class='tabSection' style='border-bottom:none'>"); printf( "<P>" "Track data hubs are collections of external tracks that can be added to the UCSC Genome Browser. " "Click \"Connect\" below to show the \"Genomes\" page with all assemblies covered by a hub. " "Hub tracks then show up under the hub's own blue bar track group under the browser graphic, " @@ -1397,31 +1398,31 @@ static void doClearHub(struct cart *theCart) { char *url = cartOptionalString(cart, hgHubDataText); printf("<pre>clearing hub %s\n",url); if (url != NULL) hubClearStatus(url); else errAbort("must specify url in %s\n", hgHubDataText); printf("<pre>Completed\n"); } static void checkTrackDbs(struct hubConnectStatus *hubList) { -//long beforeCheck = clock1000(); +long beforeCheck = clock1000(); struct hubConnectStatus *hub = hubList; for(; hub; hub = hub->next) { struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { hubAddTracks(hub, database); } errCatchEnd(errCatch); if (errCatch->gotError) { hub->errorMessage = cloneString(errCatch->message->string); hubUpdateStatus( errCatch->message->string, hub);