Repository: zeppelin Updated Branches: refs/heads/branch-0.6 e14b80b65 -> 45dc8d23b
[branch-0.6] Take care of comma/tab escape in csv/tsv download ### What is this PR for? This PR backports #1445 to branch-0.6 since using `./dev/test_zeppelin_pr.py` throws alert for backporting it. ### What type of PR is it? Bug Fix Author: meenakshisekar <[email protected]> Closes #1484 from minahlee/branch-0.6_ZEPPELIN-1001 and squashes the following commits: 58fda8e [meenakshisekar] Formatting errors corrected for build f5c7f61 [meenakshisekar] Changes committed as per review comments in PR e404075 [meenakshisekar] Altered the code as per PR suggestion 1465 574803c [meenakshisekar] Zeppelin-1001 Modified the data with comma/tab to be surronded by double quotes so that they are escaped. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/45dc8d23 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/45dc8d23 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/45dc8d23 Branch: refs/heads/branch-0.6 Commit: 45dc8d23baafaca7db5c190020d7a4f2af95df95 Parents: e14b80b Author: meenakshisekar <[email protected]> Authored: Mon Oct 3 08:01:49 2016 +0530 Committer: Mina Lee <[email protected]> Committed: Thu Oct 6 14:56:27 2016 +0900 ---------------------------------------------------------------------- .../src/app/notebook/paragraph/paragraph.controller.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/45dc8d23/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index 6b93731..afff000 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -2172,7 +2172,12 @@ angular.module('zeppelinWebApp') var row = $scope.paragraph.result.msgTable[r]; var dsvRow = ''; for (var index in row) { - dsvRow += row[index].value + delimiter; + var stringValue = (row[index].value).toString(); + if (stringValue.contains(delimiter)) { + dsvRow += '"' + stringValue + '"' + delimiter; + } else { + dsvRow += row[index].value + delimiter; + } } dsv += dsvRow.substring(0, dsvRow.length - 1) + '\n'; }
