src/hg/instinct/lib/json.c 1.5
1.5 2010/02/10 21:35:35 jsanborn
fixed json wrapper to be to spec
Index: src/hg/instinct/lib/json.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/lib/json.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -B -U 4 -r1.4 -r1.5
--- src/hg/instinct/lib/json.c 4 Jun 2009 03:42:50 -0000 1.4
+++ src/hg/instinct/lib/json.c 10 Feb 2010 21:35:35 -0000 1.5
@@ -14,15 +14,17 @@
static char const rcsid[] = "$Id$";
void jsonWarning(char *format, va_list args)
{
-printf("({ 'warning' : \"");
+//printf("({ 'warning' : \"");
+printf("{ 'warning' : \"");
/* newline characters screws up JSON parser, so remove any that may be in format str*/
format = replaceChars(format, "\n", " ");
vfprintf(stdout, format, args);
-printf("\"})");
+//printf("\"})");
+printf("\"}");
exit(-1);
}
void jsonWarnAbort(char *line, ...)
@@ -36,15 +38,18 @@
void jsonEarlyWarningHandler(char *format, va_list args)
{ /* send error to client via JSON-formatted object, to avoid parsing error */
-printf("({ 'err' : \"");
+//printf("({ 'err' : \"");
+printf("{ 'err' : \"");
/* newline characters screws up JSON parser, so remove any that may be in format str*/
format = replaceChars(format, "\n", " ");
vfprintf(stdout, format, args);
-printf("\"})");
+//printf("\"})");
+printf("\"}");
+
exit(-1);
}
/* Default function, gets overwritten by each data type's particular append function */
@@ -315,11 +320,11 @@
slReverse(&js->objects);
struct dyString *dy = newDyString(100);
-dyStringPrintf(dy, "(");
+//dyStringPrintf(dy, "(");
appendObjects(js->objects, dy);
-dyStringPrintf(dy, ")");
+//dyStringPrintf(dy, ")");
return dy->string;
}