[EAGLE-355] fix advanced sql parse logic
Adjust the logic of expression parse
Author: jiljiang <jiljiang@ebay.com>
Closes #251 from zombieJ/branch-0.4.
(cherry picked from commit 6a3f152b3a5e44803f19592da6ce7f284232b37a)
Signed-off-by: Hao Chen <hao@apache.org>
diff --git a/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js b/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
index 50f377c..ee1597c 100644
--- a/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
+++ b/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
@@ -489,15 +489,16 @@
// >> Parse expression
$scope.policy.__.conditions = {};
var _condition = _policyUnit.expression.match(/from\s+(\w+)(\[(.*)])?(#window[^\)]*\))?\s+(select (\w+, )?(\w+)\((\w+)\) as [\w\d_]+ (group by (\w+) )?having ([\w\d_]+) ([<>=]+) ([^\s]+))?/);
- var _cond_stream = _condition[1];
- var _cond_query = _condition[3] || "";
- var _cond_window = _condition[4];
- var _cond_group = _condition[5];
- var _cond_groupUnit = _condition.slice(7,14);
if(!_condition) {
$scope.policy.__.advanced = true;
} else {
+ var _cond_stream = _condition[1];
+ var _cond_query = _condition[3] || "";
+ var _cond_window = _condition[4];
+ var _cond_group = _condition[5];
+ var _cond_groupUnit = _condition.slice(7,14);
+
// > StreamName
var _streamName = _cond_stream;
var _cond = _cond_query;
