Fixes ReturnClause formatting bug, completes Query 10 Grouping & Limits
diff --git a/asterix-app/src/main/resources/sdk/static/example/demo.html b/asterix-app/src/main/resources/sdk/static/example/demo.html
index c3a98b6..4eaff8a 100644
--- a/asterix-app/src/main/resources/sdk/static/example/demo.html
+++ b/asterix-app/src/main/resources/sdk/static/example/demo.html
@@ -317,7 +317,7 @@
<div class="how-to-run">
</div>
- <div class="result-output" id="result9">
+ <div class="result-output" id="result9a">
</div>
<button id="run9a">Run #9-A</button>
@@ -341,7 +341,7 @@
<div class="how-to-run">
</div>
- <div class="result-output" id="result10">
+ <div class="result-output" id="result9b">
</div>
<button id="run9b">Run #9-B</button>
@@ -367,7 +367,7 @@
<div class="how-to-run">
</div>
- <div class="result-output" id="result11">
+ <div class="result-output" id="result10">
</div>
<button id="run10">Run #10</button>
diff --git a/asterix-app/src/main/resources/sdk/static/example/js/demo.js b/asterix-app/src/main/resources/sdk/static/example/js/demo.js
index 5115e26..b5c5ae8 100644
--- a/asterix-app/src/main/resources/sdk/static/example/js/demo.js
+++ b/asterix-app/src/main/resources/sdk/static/example/js/demo.js
@@ -202,7 +202,6 @@
var expression10 = new FLWOGRExpression({
"dataverse" : "TinySocial",
"success" : function(res) {
- alert(JSON.stringify(res));
$('#result10').html(res["results"]);
}
})
@@ -226,7 +225,7 @@
}
));
- alert("EXPRESSION 10 \n" + expression10.val());
+ expression10.run();
});
// 11 - Left Outer Fuzzy Join
diff --git a/asterix-app/src/main/resources/sdk/static/js/asterix-sdk-stable.js b/asterix-app/src/main/resources/sdk/static/js/asterix-sdk-stable.js
index 699a078..ad8421d 100644
--- a/asterix-app/src/main/resources/sdk/static/js/asterix-sdk-stable.js
+++ b/asterix-app/src/main/resources/sdk/static/js/asterix-sdk-stable.js
@@ -441,9 +441,9 @@
for (returnValue in expression) {
if (expression[returnValue] instanceof AExpression) {
- returnStatements.push(returnValue + " : " + expression[returnValue].val());
+ returnStatements.push('"' + returnValue + '" ' + " : " + expression[returnValue].val());
} else if (typeof expression[returnValue] == "string") {
- returnStatements.push(returnValue + " : " + expression[returnValue]);
+ returnStatements.push('"' + returnValue + '" ' + " : " + expression[returnValue]);
}
}
this._properties["clause"] += returnStatements.join(",\n");