ae4d6b0988cc34e674209890007aa8b46381603e hiram Thu May 16 14:31:45 2019 -0700 now returning itemsReturned count for any getData track function refs #18869 diff --git src/hg/hubApi/apiUtils.c src/hg/hubApi/apiUtils.c index 536191b..d758bbf 100644 --- src/hg/hubApi/apiUtils.c +++ src/hg/hubApi/apiUtils.c @@ -32,35 +32,34 @@ if (debug) { char sizeString[64]; unsigned long long vmPeak = currentVmPeak(); sprintLongWithCommas(sizeString, vmPeak); jsonWriteString(jw, "vmPeak", sizeString); } if (measureTiming) { long nowTime = clock1000(); long long et = nowTime - processingStart; jsonWriteNumber(jw, "totalTimeMs", et); } +if (itemsReturned) + jsonWriteNumber(jw, "itemsReturned", itemsReturned); if (reachedMaxItems) - { jsonWriteBoolean(jw, "maxItemsLimit", TRUE); - jsonWriteNumber(jw, "itemsReturned", maxItemsOutput); - } jsonWriteObjectEnd(jw); fputs(jw->dy->string,stdout); } /* void apiFinishOutput(int errorCode, char *errorString, ... ) */ void apiErrAbort(int errorCode, char *errString, char *format, ...) /* Issue an error message in json format, and exit(0) */ { char errMsg[2048]; va_list args; va_start(args, format); vsnprintf(errMsg, sizeof(errMsg), format, args); struct jsonWrite *jw = apiStartOutput(); jsonWriteString(jw, "error", errMsg); jsonWriteNumber(jw, "statusCode", errorCode);