dbd8fef5786457ba53375f006c4eaedf3d256110 hiram Fri Apr 5 11:46:55 2019 -0700 now output correct string or number json types refs #18869 diff --git src/hg/hubApi/hubApi.c src/hg/hubApi/hubApi.c index 0d955b2..867efe9 100644 --- src/hg/hubApi/hubApi.c +++ src/hg/hubApi/hubApi.c @@ -1074,30 +1074,31 @@ cgiVarSet("ignoreCookie", "1"); getDbAndGenome(cart, &database, &genome, oldVars); initGenbankTableNames(database); initSupportedTypes(); initUrlPrefix(); /* global variable for all workers to honor this limit */ maxItemsOutput = cartUsualInt(cart, "maxItemsOutput", maxItemsOutput); if (maxItemsOutput > maxItemLimit) /* safety check */ maxItemsOutput = maxItemLimit; if (maxItemsOutput < 1) /* safety check */ maxItemsOutput = 1; debug = cartUsualBoolean(cart, "debug", debug); + int timeout = cartUsualInt(cart, "udcTimeout", 300); if (udcCacheTimeout() < timeout) udcSetCacheTimeout(timeout); knetUdcInstall(); char *pathInfo = getenv("PATH_INFO"); /* nothing on incoming path, then display the WEB page instead */ if (sameOk("/",pathInfo)) pathInfo = NULL; boolean commandError = FALSE; /*expect no more than MAX_PATH_INFO number of words*/ char *words[MAX_PATH_INFO]; if (isNotEmpty(pathInfo)) @@ -1244,38 +1245,40 @@ hPrintf("
Or, enter a hub URL: "); hPrintf("\n", otherHubUrl); hWrites(" "); hButton("goOtherHub", "go"); hPrintf("
Or, select a UCSC database name: "); maxDbNameWidth *= 9; // 9 should be font width here char widthPx[SMALLBUF]; safef(widthPx, sizeof(widthPx), "width: %dpx", maxDbNameWidth); cgiMakeDropListClassWithIdStyleAndJavascript("ucscGenome", "ucscGenome", ucscDbList, ucscDataBaseCount, ucscDb, NULL, widthPx, events); hWrites(" "); hButton("goUcscDb", "go"); -boolean depthSearch = cartUsualBoolean(cart, "depthSearch", FALSE); +// boolean depthSearch = cartUsualBoolean(cart, "depthSearch", FALSE); +// hPrintf("
\n  "); +// hCheckBox("depthSearch", cartUsualBoolean(cart, "depthSearch", FALSE)); +// hPrintf(" perform full bbi file measurement : %s (will time out if taking longer than %ld seconds)
\n", depthSearch ? "TRUE" : "FALSE", timeOutSeconds); + hPrintf("
\n  "); -hCheckBox("depthSearch", cartUsualBoolean(cart, "depthSearch", FALSE)); -hPrintf(" perform full bbi file measurement : %s (will time out if taking longer than %ld seconds)
\n", depthSearch ? "TRUE" : "FALSE", timeOutSeconds); -hPrintf("\n  "); + allTrackSettings = cartUsualBoolean(cart, "allTrackSettings", FALSE); hCheckBox("allTrackSettings", allTrackSettings); -hPrintf(" display all track settings for each track : %s
\n", allTrackSettings ? "TRUE" : "FALSE"); +hPrintf(" display all track settings for each track
\n"); hPrintf("
\n"); // if (debug) // cgiMakeHiddenVar("debug", "1"); hPrintf("\n"); hPrintf("

\n"); if (sameWord("go", goUcscDb)) /* requested UCSC db track list */ { tracksForUcscDb(ucscDb); } else { hPrintf("

Examine %s at: %s

\n", sameWord("go",goPublicHub) ? "public hub" : "other hub", urlInput); hPrintf("