From 42aa5b927e498b1ec5e48ae220c0d23ed065a88f Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Tue, 4 Nov 2014 01:31:12 +0100
Subject: [PATCH] fixed download of AQL query results in web interface

---
 CHANGELOG                                              | 8 ++++++--
 js/apps/system/aardvark/aardvark.js                    | 1 -
 js/apps/system/aardvark/frontend/js/views/queryView.js | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 55d9da933d..364de8e090 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 v2.3.0 (XXXX-XX-XX)
 -------------------
 
+* fixed non-working query results download in AQL editor of web interface
+
+* removed debug print message in AQL query export routine
+
 * fixed issue #1075: Aardvark: user name required even if auth is off #1075 
 
   The fix for this prefills the username input field with the current user's
@@ -16,8 +20,8 @@ v2.3.0 (XXXX-XX-XX)
   too.
 
 
-v2.3.0-beta (2014-11-01)
-------------------------
+v2.3.0-beta1 (2014-11-01)
+-------------------------
 
 * added dedicated `NOT IN` operator for AQL
 
diff --git a/js/apps/system/aardvark/aardvark.js b/js/apps/system/aardvark/aardvark.js
index fca0da4914..9535b8bf69 100644
--- a/js/apps/system/aardvark/aardvark.js
+++ b/js/apps/system/aardvark/aardvark.js
@@ -424,7 +424,6 @@ controller.get("/query/result/download/:query", function(req, res) {
 
   var internal = require("internal");
   query = internal.base64Decode(query);
-internal.print(query);
   try {
     parsedQuery = JSON.parse(query);
   }
diff --git a/js/apps/system/aardvark/frontend/js/views/queryView.js b/js/apps/system/aardvark/frontend/js/views/queryView.js
index 117abeb4cd..2edae8b6eb 100644
--- a/js/apps/system/aardvark/frontend/js/views/queryView.js
+++ b/js/apps/system/aardvark/frontend/js/views/queryView.js
@@ -304,7 +304,7 @@
       var inputEditor = ace.edit("aqlEditor");
       var query = inputEditor.getValue();
       if (query !== '' || query !== undefined || query !== null) {
-        window.open(encodeURI("query/result/download/" + query));
+        window.open(encodeURI("query/result/download/" + btoa(JSON.stringify({ query: query }))));
       }
       else {
         arangoHelper.arangoError("Query error", "could not query result.");