SQUISHED THE BOOG
diff --git a/asterix-app/src/main/resources/sdk/static/cherry/examples/cherry.html b/asterix-app/src/main/resources/sdk/static/cherry/examples/cherry.html
index f620df7..7059e24 100755
--- a/asterix-app/src/main/resources/sdk/static/cherry/examples/cherry.html
+++ b/asterix-app/src/main/resources/sdk/static/cherry/examples/cherry.html
@@ -124,8 +124,8 @@
<button id="submit-button">Submit</button>
<button id="clear-button">Clear</button>
<button id="show-query-button">Show Query</button><br />
- <!-- <input type="checkbox" value="Submit Asynchronously" name="async" id="asbox" />
- Submit asynchronously?-->
+ <input type="checkbox" value="Submit Asynchronously" name="async" id="asbox" />
+ Submit asynchronously?
</div>
</div><!-- end #submit-query -->
diff --git a/asterix-app/src/main/resources/sdk/static/cherry/js/cherry.js b/asterix-app/src/main/resources/sdk/static/cherry/js/cherry.js
index fa21aac..557b735 100755
--- a/asterix-app/src/main/resources/sdk/static/cherry/js/cherry.js
+++ b/asterix-app/src/main/resources/sdk/static/cherry/js/cherry.js
@@ -252,7 +252,7 @@
"http://localhost:19002/query",
{
"query" : "use dataverse twitter;\n" + f.val(),
- "mode" : "synchronous" // build_cherry_mode
+ "mode" : build_cherry_mode // "synchronous"
},
{
"sync" : cherryQuerySyncCallback,
@@ -357,12 +357,10 @@
*/
function cherryQueryAsyncCallback(res, extra) {
- // alert(res);
-
// Parse handle, handle id and query from async call result
var handle_query = extra["query_string"];
- var handle = res["handle"];
- var handle_id = handle.toString().split(',')[0];
+ var handle = res;
+ var handle_id = res["handle"].toString().split(',')[0];
// Add to stored map of existing handles
asyncQueryManager[handle_id] = {
@@ -372,7 +370,7 @@
"ready" : true
};
- $('#review-handles-dropdown').append('<a href="#" class="holdmenu"><span class="label" id="handle_' + handle_id + '">Handle ' + handle_id + '</span></a>');
+ $('#review-handles-dropdown').append('<a href="#" class="holdmenu"><span class="label" id="handle_' + handle_id + '">Handle ' + handle_id + '</span></a><br/>');
$('#handle_' + handle_id).hover(
function(){
@@ -399,11 +397,9 @@
// Generate new Asterix Core API Query
var ah = new AExpression();
-
- //alert("Handle: " + asyncQueryManager[handle_id]["handle"]);
ah.run(
"http://localhost:19002/query/result",
- asyncQueryManager[handle_id]["handle"],
+ { "handle" : JSON.stringify(asyncQueryManager[handle_id]["handle"])},
{
"sync" : function () { alert("hello world"); },
},