fa73f13755afca9f14b5509948a09508100e95bd larrym Fri Sep 2 15:12:17 2011 -0700 tolerate NULL name in jsonPrint (e.g. if printing jsonp) diff --git src/hg/lib/jsHelper.c src/hg/lib/jsHelper.c index a70a7de..d010079 100644 --- src/hg/lib/jsHelper.c +++ src/hg/lib/jsHelper.c @@ -650,32 +650,34 @@ } default: { errAbort("jsonPrintRecurse; invalid type: %d", json->type); break; } } freez(&indentBuf); } void jsonPrint(struct jsonElement *json, char *name, int indentLevel) { // print out a jsonElement char *indentBuf = makeIndentBuf(indentLevel); +if(name != NULL) hPrintf("// START %s\n%svar %s = ", name, indentBuf, name); jsonPrintRecurse(json, indentLevel); +if(name != NULL) hPrintf("%s;\n// END %s\n", indentBuf, name); freez(&indentBuf); } void jsonErrPrintf(struct dyString *ds, char *format, ...) // Printf a json error to a dyString for communicating with ajax code; format is: // {"error": error message here} { va_list args; va_start(args, format); dyStringPrintf(ds, "{\"error\": \""); struct dyString *buf = newDyString(1000); dyStringVaPrintf(buf, format, args); dyStringAppend(ds, javaScriptLiteralEncode(dyStringCannibalize(&buf))); dyStringPrintf(ds, "\"}");