From 4c90f3fd6ee25a086001e7f4445f6a0c10201a78 Mon Sep 17 00:00:00 2001
From: John Woodlock <john.woodlock@gmail.com>
Date: Tue, 22 Jan 2013 17:26:52 +0000
Subject: [PATCH] allow generateJsonFromGenericResultsetData to handle double
 quotes in strings

---
 .../dataqueries/service/GenericDataServiceImpl.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java
index 3139e0106..37ba207ce 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java
@@ -166,6 +166,8 @@ public class GenericDataServiceImpl implements GenericDataService {
         List<ResultsetDataRow> data = grs.getData();
         List<String> row;
         Integer rSize;
+        String doubleQuote = "\"";
+        String slashDoubleQuote = "\\\"";
         String currColType;
         String currVal;
         // logger.info("NO. of Rows: " + data.size());
@@ -176,7 +178,7 @@ public class GenericDataServiceImpl implements GenericDataService {
             rSize = row.size();
             for (int j = 0; j < rSize; j++) {
 
-                writer.append('\"' + columnHeaders.get(j).getColumnName() + '\"' + ": ");
+                writer.append(doubleQuote + columnHeaders.get(j).getColumnName() + doubleQuote + ": ");
                 currColType = columnHeaders.get(j).getColumnDisplayType();
                 currVal = row.get(j);
                 if (currVal != null) {
@@ -188,7 +190,7 @@ public class GenericDataServiceImpl implements GenericDataService {
                             writer.append("[" + localDate.getYear() + ", " + localDate.getMonthOfYear() + ", " + localDate.getDayOfMonth()
                                     + "]");
                         } else
-                            writer.append('\"' + currVal + '\"');
+                            writer.append(doubleQuote + replace(currVal, doubleQuote,slashDoubleQuote) + doubleQuote);
                     }
                 } else
                     writer.append("null");