MonetDB: default - When converting json to str, use \n for newline.

[Sjoerd Mullender]

Changeset: 83dfa460bcf3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83dfa460bcf3
Modified Files:
        monetdb5/modules/atoms/json_atom.c
Branch: default
Log Message:

When converting json to str, use \n for newline.
In this way, output to the client is on a single line, something the
MAPI protocol likes.


diffs (47 lines):

diff --git a/monetdb5/modules/atoms/json_atom.c 
b/monetdb5/modules/atoms/json_atom.c
--- a/monetdb5/modules/atoms/json_atom.c
+++ b/monetdb5/modules/atoms/json_atom.c
@@ -63,11 +63,12 @@ int JSONtoString(str *s, int *len, json 
         return 0;
     }
        for (c =src; *c; c++)
-       switch(*c){
-       case '"':
-       case '\\':
-               cnt++;
-       }
+               switch(*c){
+               case '"':
+               case '\\':
+               case '\n':
+                       cnt++;
+               }
     ll = strlen(src);
     assert(ll <= (size_t) INT_MAX);
     l = (int) ll + cnt+3;
@@ -81,13 +82,18 @@ int JSONtoString(str *s, int *len, json 
        dst = *s;
        *dst++ = '"';
        for (c =src; *c; c++)
-       switch(*c){
-       case '"':
-       case '\\':
-               *dst++ = '\\';
-       default:
-               *dst++ = *c;
-       }
+               switch(*c){
+               case '"':
+               case '\\':
+                       *dst++ = '\\';
+               default:
+                       *dst++ = *c;
+                       break;
+               case '\n':
+                       *dst++ = '\\';
+                       *dst++ = 'n';
+                       break;
+               }
        *dst++ = '"';
        *dst = 0;
     *len = l-1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list