fixed bad conversion of custom types

postgres to_json is used to get attributes
as a result, quoting " charaters is not necessary (removed from
buffer_encode_json_str) since it's done by to_json

same remark for the "" enclosing the result in
wfs_geojson_display_results

Author: vmora

src/struct/buffer.c

@@ -550,14 +550,7 @@ buffer *buffer_encode_json_str(const char * str)
   buf = buffer_init();
 
   for( /* empty */ ; *str ; str++) {
-    switch(*str) {
-      case '"':
-        buffer_add_str(buf, "\\\"");
-        break;
-
-      default:
-        buffer_add(buf, *str);
-    }
+    buffer_add(buf, *str);
   }
 
   return buf;

src/wfs/wfs_get_feature.c

@@ -543,9 +543,13 @@ static buffer *wfs_retrieve_sql_request_select(ows * o, wfs_request * wr, buffer
     }
     /* Columns are written in quotation marks */
     else {
+      if (wr->format == WFS_GEOJSON)
+          buffer_add_str(select, "to_json(");
       buffer_add_str(select, "\"");
       buffer_copy(select, an->key);
       buffer_add_str(select, "\"");
+      if (wr->format == WFS_GEOJSON)
+          buffer_add_str(select, ")");
     }
 
     if (an->next) buffer_add_str(select, ",");
@@ -838,11 +842,10 @@ static void wfs_geojson_display_results(ows * o, wfs_request * wr, mlist * reque
           else buffer_add_str(prop, ", \"");
 
           buffer_copy(prop, an->key);
-          buffer_add_str(prop, "\": \"");
+          buffer_add_str(prop, "\": ");
           value_enc = buffer_encode_json_str(PQgetvalue(res, i, j));
           buffer_copy(prop, value_enc);
           buffer_free(value_enc);
-          buffer_add(prop, '"');
         }
       }