diff --git a/.DS_Store b/.DS_Store
index c61c9d3..fd81e22 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/app.js b/app.js
index 899d480..1c2fce9 100755
--- a/app.js
+++ b/app.js
@@ -13,7 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 This code is written by Prateek Reddy Yammanuru, Shiva Manognya Kandikuppa, Uday Kumar Mydam, Nirup TNL, Sandeep Reddy G, Deepak Kumar
- and updated by Ashish Gupta, Tarun Mohandas, Suriya Prakash, Srinivasa Burli, Jishnu Surendran and Bhairavi Balakrishnan*/
+ and updated by Ashish Gupta, Tarun Mohandas, Suriya Prakash, Srinivasa Burli, Jishnu Surendran and Bhairavi Balakrishnan,
+ enhanced by wave 4 team - Baskaran,Neel,Pallabee,Rahil,Shefali*/
 
 //var mongoose = require('./mongoose');
 //var db = mongoose();
@@ -66,8 +67,6 @@ var dimensionRouter = require('./routes/defineData/dimensions');
 var measuresRouter = require('./routes/defineData/measures');
 var namespaceRouter = require('./routes/defineData/logdata');
 var expressions=require('./routes/realTimeLogs/queryBuilder/expressions.js')
-// wave 4 code starts here
-//require('./database');
 var saveQuery = require('./routes/queryBuilder/saveQuery');
 
 // wave 4 code ends here
diff --git a/bin/www b/bin/www
index e2426ea..21e0a58 100755
--- a/bin/www
+++ b/bin/www
@@ -19,7 +19,7 @@ var app = require('../app');
 var debug = require('debug')('LogAggregatorExpress:server');
 var http = require('http');
 
-var port = normalizePort(process.env.PORT || '8686')
+var port = normalizePort(process.env.PORT || '8585')
 app.set('port', port);
 
 var server = http.createServer(app);
diff --git a/components/RTdatamapper/RTdatamapper.js b/components/RTdatamapper/RTdatamapper.js
index 0a2a5e4..0f810f7 100644
--- a/components/RTdatamapper/RTdatamapper.js
+++ b/components/RTdatamapper/RTdatamapper.js
@@ -4,55 +4,68 @@ var WebSocketClient = require('websocket').client;
 var WebSocketServer = require('ws').Server;
 // var wss = new WebSocketServer({port: 8484});
 var WebSocket1 = new WebSocketClient();
+var sift = require('sift');
 var wss = new WebSocketServer({
   port: 5050
 });
 var serverWs;
 wss.on('connection', function(ws) {
   console.log('CONNECTED');
-  ws.send('Connected');
+  // ws.send('Connected');
   serverWs = ws;
-  //ws.setMaxListeners(ws.getMaxListeners() + 1);
 });
-
-module.exports = function(namespaceId, measures) {
-  console.log("inside component", measures);
-
-  WebSocket1.on('connect', function(connection) {
-    console.log("Connected..Waiting for some message");
-    var streamData = {};
-    _('message', connection).map(function(msg) {
+var measures = [];
+var source;
+// var forwardPort;
+module.exports = function(namespaceId,Namespace) {
+  Namespace.findNamespace(namespaceId, function(err, namespace) {
+    if (namespace != null) {
+      // console.log("routes",namespace.dimensions);
+      // res.send(namespace.dimensions);
+      measures = [];
+      measures = namespace.measures;
+      source = namespace.source;
+      //console.log(measures);
+      console.log("called --------------------------------------------------------------------------------------------------------------");
+    }
+  });
+};
+console.log("inside component", measures);
+WebSocket1.on('connect', function(connection) {
+  console.log("Connected..Waiting for some message");
+  streamData = {};
+  _('message', connection).map(function(msg) {
+    var sourceData = JSON.parse(msg.utf8Data)[0];
+    if (source === sourceData) {
       streamData = JSON.parse(msg.utf8Data)[2];
-      var keys = Object.keys(streamData); //array of keys in the streaming data
-      for (var k = 0; k < measures.length; k++) {
-        for (var i = 0; i < keys.length; i++) {
-          if (keys[i] === measures[k].eventField) {
-            var keyValue = keys[i];
-            if (measures[k].measureType === "radioField") {
-              var displayValue = measures[k].displayName;
-              streamData[displayValue] = true;
-            } else {
-              if (streamData[keyValue] === measures[k].eventValue) {
-                var displayValue = measures[k].displayName;
-                streamData[displayValue] = true;
-              } else {
-                var displayValue = measures[k].displayName;
-                streamData[displayValue] = false;
-              }
-            }
-          }
+      console.log(streamData);
+      // var keys = Object.keys(streamData); //array of keys in the streaming data
+      var condition;
+      var sifter;
+      for (var k = 0; k < measures.length; k++)
+      {
+      var displayValue=measures[k].displayName;
+        // streamdata, keys
+        if(measures[k].measureType === "fieldMeasure") {
+          condition = {};
+
+          condition[measures[k].eventField] = {$exists: true};
+          sifter = sift(condition);
+          streamData[displayValue] = sifter(streamData) ? streamData[measures[k].eventField] : 0
+        } else {
+          condition = {};
+          condition[measures[k].eventField] = measures[k].eventValue;
+          sifter = sift(condition);
+          streamData[displayValue] = sifter(streamData) ? 1 : 0;
         }
       }
       if (serverWs) {
         serverWs.send(JSON.stringify(streamData));
       }
-      console.log(streamData);
-    }).done(function() {
-      console.log('Done');
-    });
+    }
+    // console.log(streamData);
+  }).done(function() {
+    console.log('Done');
   });
-  WebSocket1.connect('ws://172.23.238.253:7070');
-
-  // function msg
-  /* ending of program*/
-}
+});
+WebSocket1.connect('ws://172.23.238.253:7070');
diff --git a/components/aggregator/avg-aggregator.js b/components/aggregator/avg-aggregator.js
index ee6c0a4..45cc0c2 100644
--- a/components/aggregator/avg-aggregator.js
+++ b/components/aggregator/avg-aggregator.js
@@ -3,9 +3,11 @@ module.exports=function (arr){
     var i=0;
     var sum=0;
     var avg=0;
+
     for(i=0;i<len;i++)
     {
-        sum=sum+arr[i];
+        var k=parseInt(arr[i]);
+        sum=sum+k;
     }
     avg=sum/len;
     return avg;
diff --git a/components/aggregator/max-aggregator.js b/components/aggregator/max-aggregator.js
index 20899a7..ff1881a 100644
--- a/components/aggregator/max-aggregator.js
+++ b/components/aggregator/max-aggregator.js
@@ -1,5 +1,9 @@
 module.exports=function (arr){
     var max=0;
+    for(var i=0;i<arr.length;i++)
+    {
+        arr[i]=parseInt(arr[i]);
+    }
     max = Math.max.apply(null, arr);
     return max;
 }
diff --git a/components/aggregator/min-aggregator.js b/components/aggregator/min-aggregator.js
index 31332dc..a0bcb21 100644
--- a/components/aggregator/min-aggregator.js
+++ b/components/aggregator/min-aggregator.js
@@ -1,4 +1,10 @@
 module.exports=function (arr){
+
+
+    for(var i=0;i<arr.length;i++)
+    {
+        arr[i]=parseInt(arr[i]);
+    }
     var min=0;
     min = Math.min.apply(null, arr);
     return min;
diff --git a/components/aggregator/sum.js b/components/aggregator/sum-aggregator.js
similarity index 82%
rename from components/aggregator/sum.js
rename to components/aggregator/sum-aggregator.js
index af690d2..ebcf4a3 100644
--- a/components/aggregator/sum.js
+++ b/components/aggregator/sum-aggregator.js
@@ -7,8 +7,8 @@ module.exports=function (arr){
     var sum=0;
     for(i=0;i<len;i++)
     {
-        sum=sum+arr[i];
+        sum=sum+parseInt(arr[i]);
     }
 
     return sum;
-}
\ No newline at end of file
+}
diff --git a/components/queryexecutor/mainquery.js b/components/queryexecutor/mainquery.js
index 71dfbb6..6f4407b 100644
--- a/components/queryexecutor/mainquery.js
+++ b/components/queryexecutor/mainquery.js
@@ -1,68 +1,100 @@
 var _ = require('highland');
 var QueryExecutor = require('./query-executor');
-var query = {
-  select:['remote','host','method','code'],
-  eval: {
-    val1: {
-      rolling: {
-        evaluate: 'average',
-        over: {
-          count: 10
-        },
-        on: 'code' // measure
-      }
-    },
-    val2: {
-      rolling: {
-        evaluate: 'average',
-        over: {
-          count: 10
-        },
-        on: 'insertions'
-      }
-    },
-  },
-  project: {
-    // $highlight: {$condition: {val1: {$eq: eval['val2']}}}
-    $highlight: {$condition: 'val1 ==val2'}
-  },
-  to: 'streamB'
-};
+// var query = {
+//   select:['remote','host','method','code'],
+//   eval: {
+//     val1: {
+//       rolling: {
+//         evaluate: 'average',
+//         over: {
+//           count: 10
+//         },
+//         on: 'code' // measure
+//       }
+//     },
+//     val2: {
+//       rolling: {
+//         evaluate: 'average',
+//         over: {
+//           count: 10
+//         },
+//         on: 'insertions'
+//       }
+//     },
+//   },
+//   project: {
+//     // $highlight: {$condition: {val1: {$eq: eval['val2']}}}
+//     $highlight: {$condition: 'val1 ==val2'}
+//   },
+//   to: 'streamB'
+// };
 
 var WebSocketClient = require('websocket').client;
 var WebSocket1 = new WebSocketClient();
 var WebSocketServer = require('ws').Server;
-var wss = new WebSocketServer({port: 8080});
+var wss = new WebSocketServer({port: 9000});
 var serverWs;
 
 wss.on('connection', function(ws) {
-  console.log('CONNECTED');
-  ws.send('Connected');
+  //console.log('CONNECTED');
+  // ws.send('Connected');
   serverWs = ws;
-  ws.setMaxListeners(ws.getMaxListeners() + 1);
+  //ws.setMaxListeners(ws.getMaxListeners() + 1);
 });
 
-module.exports=function (queryy) {
+var isClientConnected = false;
+var stream;
+var con;
+var pipeline;
+
 
-  var executor = new QueryExecutor(query);
-  var pipeline = executor.getPipeline();
-  WebSocket1.on('connect', function(connection) {
-    console.log("Connected..Waiting for some message");
-    var streamData = {};
-    _('message', connection).pipe(_.pipeline(_.map(function(msg) {
-      console.log('data received');
-      return JSON.parse(msg.utf8Data)[2];
-    })
-  ))
-    .pipe(pipeline)
-    .pipe(_.pipeline(
-      _.map(function(msg) {
-        if(serverWs) {
-          serverWs.send(JSON.stringify(msg));
-        }
-      })
-    )).done();
+function bootstrapStream() {
+    console.log("connected in mainQuery");
+    stream=_('message',con);
+    stream.pipe(_.pipeline(_.map(function(msg) {
+    streamData=msg;
+    console.log('data received ');
+    return JSON.parse(streamData.utf8Data);
+  })
+ ))
+ .pipe(pipeline)
+ .pipe(_.pipeline(
+  _.map(function(msg) {
+    if(serverWs) {
+    serverWs.send(JSON.stringify(msg));
+    }
+  })
+ )).done();
+}
+
+module.exports=function (queryy) {
+  var executor = new QueryExecutor(queryy);
+  pipeline = executor.getPipeline();
 
-    connection.setMaxListeners(connection.getMaxListeners() + 1);
-  });
+  if (isClientConnected) {
+    // isClientConnected=false;
+    console.log('before stream destroyed ');
+    // for (var variable in stream) {
+    // console.log('>>> '+variable);
+    // }
+    stream.end(function() {
+      console.log('after stream destroyed');
+      bootstrapStream();
+    });
+    console.log('after stream destroyed');
+  }
+else{
+      WebSocket1.on('connect', function(connection) {
+      isClientConnected = true;
+      console.log(" Connected..Waiting for some message inQuery");
+      var streamData = {};
+      connection.on('close', function() {
+      console.log('connection closed ***');
+      });
+       con=connection;
+       bootstrapStream();
+//      connection.setMaxListeners(connection.getMaxListeners() + 1);
+    });
+    WebSocket1.connect('ws://localhost:5050');
+  }
 }
diff --git a/components/queryexecutor/query-executor.js b/components/queryexecutor/query-executor.js
index 81fe07b..6012f51 100644
--- a/components/queryexecutor/query-executor.js
+++ b/components/queryexecutor/query-executor.js
@@ -1,36 +1,70 @@
-var sift = require('sift');
-var _ = require('highland');
-var rollingCount=require('../rollingCount/index');
-var QueryExecutor = function(query) {
+  var sift = require('sift');
+  var _ = require('highland');
+  var rollingCount=require('../rollingCount/AccumulateOverCount.js');
+  var sum = require('../aggregator/sum-aggregator');
+  var count = require('../aggregator/count-aggregator');
+  var average = require('../aggregator/avg-aggregator');
+  var min = require('../aggregator/min-aggregator');
+  var max = require('../aggregator/max-aggregator');
+  var rollingTime=require('../rollingTime/time-accumulator.js')
+
+  function getAggregator(aggregator) {
+
+    switch (aggregator) {
+      case 'average':
+      return average;
+      break;
+      case 'min':
+      return min;
+      break;
+      case 'max':
+      return max;
+      break;
+      case 'average':
+      return average;
+      break;
+      case 'count':
+      return count;
+      break;
+      case 'sum':
+      return sum;
+      break;
+      default:
+
+    }
+  }
+
+  var QueryExecutor = function(query) {
   var self = this;
   self.query = query;
-   var RC=new Array();
-   var RT=new Array();
-  self.getPipeline = function() {
-    return self.createPipeline(self.query);
+  var RC=new Array();
+  var RT=new Array();
+
+  if(query.eval.val1.rolling.over.time){
+  RT.push(new rollingTime(query.eval.val1.rolling.over.time,getAggregator(query.eval.val1.rolling.evaluate))); //rollingTime not available
+  }
+  else {
+  RC.push(new rollingCount(query.eval.val1.rolling.over.count,getAggregator(query.eval.val1.rolling.evaluate)));//assume every computation is either rollingTime or rollingCount
+  }
+  if(query.eval.val2.rolling.over.count){
+  RC.push(new rollingCount(query.eval.val2.rolling.over.count,getAggregator(query.eval.val2.rolling.evaluate)));
+  }
+  else {
+  RT.push(new rollingTime(query.eval.val2.rolling.over.time,getAggregator(query.eval.val2.rolling.evaluate)));  //assume every computation is either rollingTime or rollingCount
   }
 
+  self.getPipeline = function() {
+  return self.createPipeline(self.query);
+  }
   self.createPipeline = function(query) {
+    // console.log("$$$$$$$$$$4 "+JSON.stringify(query));
     var pipeline = [];
-
     if(query.hasOwnProperty('from') && query.from.hasOwnProperty('where')) {
-      var sifter = sift(query.from.where);
-      pipeline.push(_.filter(sifter));
+    var sifter = sift(query.from.where);
+    pipeline.push(_.filter(sifter));
     }
     pipeline.push(_.map(function(obj) {
-      // console.log('in query exec ');
-      if(query.eval.val1.rolling.over.time){
-      RT.push(new rollingTime(query.eval.val1.rolling.over.time)); //rollingTime not available
-      }
-      else {
-        RC.push(new rollingCount(query.eval.val1.rolling.over.count));//assume every computation is either rollingTime or rollingCount
-      }
-      if(query.eval.val2.rolling.over.count){
-      RC.push(new rollingCount(query.eval.val1.rolling.over.count));
-      }
-      else {
-      RT.push(new rollingTime(query.eval.val1.rolling.over.time));  //assume every computation is either rollingTime or rollingCount
-      }
+
       var siftobj=new Object();
       expkeys=query.select;
       siftobj.filter=function(value) {
@@ -41,17 +75,20 @@ var QueryExecutor = function(query) {
       var RTCount=0,
           RCCount=0;
       if(query.eval.val1.rolling.over.time){
-      temp.val1=RT[RTCount++][query.eval.val1.rolling.evaluate](value[query.eval.val1.rolling.on]); //rollingTime not available
+      temp.val1=RT[RTCount++].evaluate(value[query.eval.val1.rolling.on]);
+      console.log("over time is "+temp.val1 +'and actual value passed is '+value[query.eval.val1.rolling.on]);
       }
       else {
-        temp.val1=RC[RCCount++][query.eval.val1.rolling.evaluate](value[query.eval.val1.rolling.on]);//assume every computation is either rollingTime or rollingCount
+        temp.val1=RC[RCCount++].evaluate(value[query.eval.val1.rolling.on]);//assume every computation is either rollingTime or rollingCount
       }
-      if(query.eval.val1.rolling.over.count){
-        temp.val2=RC[RCCount++][query.eval.val1.rolling.evaluate](value[query.eval.val1.rolling.on]); //rollingTime not available
+      if(query.eval.val2.rolling.over.count){
+        temp.val2=RC[RCCount++].evaluate(value[query.eval.val2.rolling.on]); //rollingTime not available
       }
       else {
-        temp.val2=RT[RTCount++][query.eval.val1.rolling.evaluate](value[query.eval.val1.rolling.on]);//assume every computation is either rollingTime or rollingCount
+        temp.val2=RT[RTCount++].evaluate(value[query.eval.val2.rolling.on]);//assume every computation is either rollingTime or rollingCount
+        console.log("over time is "+temp.val2 +'and actual value passed is '+value[query.eval.val2.rolling.on]);      
       }
+      // console.log("in pipe############### "+JSON.stringify(query));
       return temp;
       }
       var data={
@@ -64,8 +101,13 @@ var QueryExecutor = function(query) {
       condition=condition.replace('val2','tempdata.val2')
                                                  //filter that returns true/false depending on query condition
                                                  //{val1: {$gte: '$val2'}}//query.project.$highlight.$condition
-      tempdata.highlight=eval(condition)                  //highlight set to true/false depending on val1 and val2
-      console.log(tempdata);
+                                                 //highlight set to true/false depending on val1 and val2
+       if(tempdata.val1 && tempdata.val2){
+       tempdata.highlight=eval(condition)
+       }
+       else {
+       tempdata.highlight=false;
+       }
       return tempdata; //object with select parameters and highlight
     }));
     return _.pipeline.apply(this, pipeline);
diff --git a/components/queryexecutor/query-executor.js.org b/components/queryexecutor/query-executor.js.org
new file mode 100644
index 0000000..311f95f
--- /dev/null
+++ b/components/queryexecutor/query-executor.js.org
@@ -0,0 +1,81 @@
+var sift = require('sift');
+var _ = require('highland');
+var rollingCount=require('../rollingCount/index');
+var QueryExecutor = function(query) {
+  var self = this;
+  self.query = query;
+   var RC=new Array();
+   var RT=new Array();
+  self.getPipeline = function() {
+    return self.createPipeline(self.query);
+  }
+
+  self.createPipeline = function(query) {
+    var pipeline = [];
+
+    if(query.hasOwnProperty('from') && query.from.hasOwnProperty('where')) {
+      var sifter = sift(query.from.where);
+      pipeline.push(_.filter(sifter));
+    }
+    pipeline.push(_.map(function(obj) {
+      // console.log('in query exec ');
+      if(query.eval.val1.rolling.over.time){
+      RT.push(new rollingTime(query.eval.val1.rolling.over.time)); //rollingTime not available
+      }
+      else {
+        RC.push(new rollingCount(query.eval.val1.rolling.over.count));//assume every computation is either rollingTime or rollingCount
+      }
+      if(query.eval.val2.rolling.over.count){
+      RC.push(new rollingCount(query.eval.val1.rolling.over.count));
+      }
+      else {
+      RT.push(new rollingTime(query.eval.val1.rolling.over.time));  //assume every computation is either rollingTime or rollingCount
+      }
+      var siftobj=new Object();
+      expkeys=query.select;
+      siftobj.filter=function(value) {
+      var temp=new Object();
+      for (var i = 0; i < expkeys.length; i++) {
+        temp[expkeys[i]]=value[expkeys[i]];
+      }
+      var RTCount=0,
+          RCCount=0;
+      if(query.eval.val1.rolling.over.time){
+      temp.val1=RT[RTCount++][query.eval.val1.rolling.evaluate](value[query.eval.val1.rolling.on]); //rollingTime not available
+      }
+      else {
+        temp.val1=RC[RCCount++][query.eval.val1.rolling.evaluate](value[query.eval.val1.rolling.on]);//assume every computation is either rollingTime or rollingCount
+      }
+      if(query.eval.val1.rolling.over.count){
+        temp.val2=RC[RCCount++][query.eval.val1.rolling.evaluate](value[query.eval.val1.rolling.on]); //rollingTime not available
+      }
+      else {
+        temp.val2=RT[RTCount++][query.eval.val1.rolling.evaluate](value[query.eval.val1.rolling.on]);//assume every computation is either rollingTime or rollingCount
+      }
+      return temp;
+      }
+      var data={
+        filter:obj
+      };
+      var testQuery=sift(siftobj);
+      var tempdata=testQuery(data);  //testQuery returns object with val1 and val2 set
+      var condition=query.project.$highlight.$condition;
+      condition=condition.replace('val1','tempdata.val1');
+      condition=condition.replace('val2','tempdata.val2')
+                                                 //filter that returns true/false depending on query condition
+                                                 //{val1: {$gte: '$val2'}}//query.project.$highlight.$condition
+                                                 //highlight set to true/false depending on val1 and val2
+       if(tempdata.val1 && tempdata.val2){
+       tempdata.highlight=eval(condition)
+       }
+       else {
+      tempdata.highlight=false;
+       }
+      // console.log(tempdata);
+      return tempdata; //object with select parameters and highlight
+    }));
+    return _.pipeline.apply(this, pipeline);
+  };
+};
+
+exports = module.exports = QueryExecutor;
diff --git a/components/queryexecutor/query-executor.js.org.latest b/components/queryexecutor/query-executor.js.org.latest
new file mode 100644
index 0000000..4f7e0f0
--- /dev/null
+++ b/components/queryexecutor/query-executor.js.org.latest
@@ -0,0 +1,89 @@
+var sift = require('sift');
+var _ = require('highland');
+var rollingCount=require('../rollingCount/index.js');
+var sum = require('../aggregator/sum-aggregator');
+var count = require('../aggregator/count-aggregator');
+var average = require('../aggregator/avg-aggregator');
+var min = require('../aggregator/min-aggregator');
+var max = require('../aggregator/max-aggregator');
+var rollingTime=require('../rollingTime/time-accumulator.js')
+
+
+var QueryExecutor = function(query) {
+var self = this;
+self.query = query;
+var RC=new Array();
+var RT=new Array();
+
+if(query.eval.val1.rolling.over.time){
+RT.push(new rollingTime(query.eval.val1.rolling.over.time,average)); //rollingTime not available
+}
+else {
+RC.push(new rollingCount(query.eval.val1.rolling.over.count));//assume every computation is either rollingTime or rollingCount
+}
+if(query.eval.val2.rolling.over.count){
+RC.push(new rollingCount(query.eval.val1.rolling.over.count));
+}
+else {
+RT.push(new rollingTime(query.eval.val1.rolling.over.time,average));  //assume every computation is either rollingTime or rollingCount
+}
+
+self.getPipeline = function() {
+return self.createPipeline(self.query);
+}
+self.createPipeline = function(query) {
+  var pipeline = [];
+  if(query.hasOwnProperty('from') && query.from.hasOwnProperty('where')) {
+  var sifter = sift(query.from.where);
+  pipeline.push(_.filter(sifter));
+  }
+  pipeline.push(_.map(function(obj) {
+    // console.log('in query exec ');
+    var siftobj=new Object();
+    expkeys=query.select;
+    siftobj.filter=function(value) {
+    var temp=new Object();
+    for (var i = 0; i < expkeys.length; i++) {
+      temp[expkeys[i]]=value[expkeys[i]];
+    }
+    var RTCount=0,
+        RCCount=0;
+    if(query.eval.val1.rolling.over.time){
+    temp.val1=RT[RTCount++][evaluate](value[query.eval.val1.rolling.on]); //rollingTime not available
+    }
+    else {
+      temp.val1=RC[RCCount++][query.eval.val1.rolling.evaluate](value[query.eval.val1.rolling.on]);//assume every computation is either rollingTime or rollingCount
+    }
+    if(query.eval.val1.rolling.over.count){
+      temp.val2=RC[RCCount++][query.eval.val1.rolling.evaluate](value[query.eval.val1.rolling.on]); //rollingTime not available
+    }
+    else {
+      temp.val2=RT[RTCount++][evaluate](value[query.eval.val1.rolling.on]);//assume every computation is either rollingTime or rollingCount
+    }
+    return temp;
+    }
+    var data={
+      filter:obj
+    };
+    var testQuery=sift(siftobj);
+    var tempdata=testQuery(data);  //testQuery returns object with val1 and val2 set
+    var condition=query.project.$highlight.$condition;
+    condition=condition.replace('val1','tempdata.val1');
+    condition=condition.replace('val2','tempdata.val2')
+                                               //filter that returns true/false depending on query condition
+                                               //{val1: {$gte: '$val2'}}//query.project.$highlight.$condition
+                                               //highlight set to true/false depending on val1 and val2
+     if(tempdata.val1 && tempdata.val2){
+     tempdata.highlight=eval(condition)
+     }
+     else {
+    tempdata.highlight=false;
+     }
+    // console.log(tempdata);
+    return tempdata; //object with select parameters and highlight
+  }));
+  return _.pipeline.apply(this, pipeline);
+};
+};
+
+exports = module.exports = QueryExecutor;
diff --git a/components/rollingCount/accumulateOverCount.js b/components/rollingCount/accumulateOverCount.js
index 1e000a1..1b4f98c 100644
--- a/components/rollingCount/accumulateOverCount.js
+++ b/components/rollingCount/accumulateOverCount.js
@@ -2,21 +2,21 @@
 
 module.exports=function AccumulateOverCount(count, evalFunc) {
    // var self = this;
-    console.log('evalFunc1: ' + this.evalFunc);
     this.count = count;
     this.evalFunc = evalFunc;
+   //  console.log('evalFunc1: ' + this.evalFunc);
     var fn=evalFunc;
     arr= new Array(count);
     var counter=0;
 
-    this.eval = function(line) {
+    this.evaluate = function(line) {
         if(counter<count-1)
         {
             arr[counter]=line;
         //   console.log(arr);
 
             counter++;
-            return undefined;
+            return null;
         }
         else {
             var k = counter%count;
@@ -28,4 +28,4 @@ module.exports=function AccumulateOverCount(count, evalFunc) {
             return this.evalFunc(arr);
         }
     }
-};
\ No newline at end of file
+};
diff --git a/components/rollingTime/time-accumulator.js b/components/rollingTime/time-accumulator.js
index a1035d1..059d1df 100644
--- a/components/rollingTime/time-accumulator.js
+++ b/components/rollingTime/time-accumulator.js
@@ -1,18 +1,26 @@
 module.exports = function(time, evalFunc) {
   this.windowDuration = time;
   this.evalFunc = evalFunc;
-
+  console.log(this.evalFunc);
+  this.t0;
+  this.currentTime;
 
   this.evaluate = function(line) {
     //creating array if it doesn't exist
-    //console.log(line);
+
     if (typeof lineArr == "undefined" || !(lineArr instanceof Array)) {
       lineArr = [];
     }
     //accumulating data for 10secs
     if (typeof line !== 'undefined') {
       var obj = {};
-      obj.line = line.trim();
+      if(typeof line === 'string'){
+      console.log('in time accumulator as string '+line);
+       }
+       else {
+         obj.line=line;
+          console.log('in time accumulator as number '+line);
+       }
       obj.date = new Date();
       lineArr.push(obj);
     }
@@ -22,15 +30,15 @@ module.exports = function(time, evalFunc) {
     }
     //Get current time
     currentTime = new Date();
-    //Check if window active
+    // console.log('#######################'+currentTime.getTime());
     var diffMs = (currentTime.getTime() - t0.getTime());
     console.log("Time diff: " + diffMs);
 
-    if (diffMs < 100) {
+    if (diffMs < parseInt(this.windowDuration)) {
       //window not yet active
       console.log('not yet active');
       return null;
-    } else if (diffMs >= 100) {
+    } else if (diffMs >= parseInt(this.windowDuration)) {
       //window active now
       console.log('active now');
       pastDate = new Date();
@@ -51,7 +59,7 @@ module.exports = function(time, evalFunc) {
           break;
         }
       }
-      //console.log(dataArr);
+      console.log('data arrayyyyyyy '+dataArr);
       return this.evalFunc(dataArr);
     }
   }
diff --git a/models/expression.js b/models/expression.js
index a7c1995..1dbbadb 100644
--- a/models/expression.js
+++ b/models/expression.js
@@ -12,6 +12,7 @@ obj.save(function(err,doc) {
     if (err) {
     console.error(err);
     cb(err,null);
+
     }
     else {
     console.log(doc);
@@ -33,7 +34,7 @@ expSchema.statics.searchQuery=function searchQuery(searchquery,cb) {
 //
 // expschema.post('save',function(query) {
 // mainquery(query);
-// })
+//   })
 
 
 
diff --git a/models/namespaceSchema.js b/models/namespaceSchema.js
index 49cb9d2..51672df 100644
--- a/models/namespaceSchema.js
+++ b/models/namespaceSchema.js
@@ -1,5 +1,5 @@
 var mongoose = require('mongoose');
-var RTdatamapper = require('../components/RTdatamapper/RTdatamapper');
+var getMeasure = require('../components/RTdatamapper/RTdatamapper');
 
 var namespaceSchema = new mongoose.Schema({
   name:String,
@@ -35,17 +35,25 @@ namespaceSchema.statics.findNamespace=function(name,cb){
     });
   };
 
-  namespaceSchema.post('save',function (namespace) {
-      // if (!err){
-      console.log('nid' +namespace._id + '||' +namespace.measures);
-        RTdatamapper(namespace._id,namespace.measures);
+  namespaceSchema.statics.findNamespaceName=function(name,cb){
+   this.findOne(
+   {name : name})
+   .exec(function(err,namespace){
+     if(!err)
+     {
+       cb(null,namespace);
+     }
+     else
+       {
+         cb(err,null);
+       }
+     });
+   };
 
-      //  log.info('post saving...', this);
-      // }
-      // else{
-      //     console.log('error occured in hook' + err);
-      // }
-    });
+  // namespaceSchema.post('save',function (namespace) {
+  //   //  console.log('nid' +namespace._id + '||' +namespace.measures);
+  //     getMeasure(namespace.measures);
+  //   });
 
 
 module.exports=namespaceSchema;
diff --git a/npm-debug.log.a1d4e2a4f569f81c5ad4fa417425f8f6 b/npm-debug.log.a1d4e2a4f569f81c5ad4fa417425f8f6
new file mode 100644
index 0000000..af79148
--- /dev/null
+++ b/npm-debug.log.a1d4e2a4f569f81c5ad4fa417425f8f6
@@ -0,0 +1,36 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/bin/node', '/usr/bin/npm', 'start' ]
+2 info using npm@2.11.3
+3 info using node@v0.12.7
+4 verbose node symlink /usr/bin/node
+5 verbose run-script [ 'prestart', 'start', 'poststart' ]
+6 info prestart LogAggregatorExpress@0.0.0
+7 info start LogAggregatorExpress@0.0.0
+8 verbose unsafe-perm in lifecycle true
+9 info LogAggregatorExpress@0.0.0 Failed to exec start script
+10 verbose stack Error: LogAggregatorExpress@0.0.0 start: `node ./bin/www`
+10 verbose stack Exit status 1
+10 verbose stack     at EventEmitter.<anonymous> (/usr/lib/node_modules/npm/lib/utils/lifecycle.js:213:16)
+10 verbose stack     at EventEmitter.emit (events.js:110:17)
+10 verbose stack     at ChildProcess.<anonymous> (/usr/lib/node_modules/npm/lib/utils/spawn.js:24:14)
+10 verbose stack     at ChildProcess.emit (events.js:110:17)
+10 verbose stack     at maybeClose (child_process.js:1015:16)
+10 verbose stack     at Process.ChildProcess._handle.onexit (child_process.js:1087:5)
+11 verbose pkgid LogAggregatorExpress@0.0.0
+12 verbose cwd /vagrant
+13 error Linux 3.13.0-65-generic
+14 error argv "/usr/bin/node" "/usr/bin/npm" "start"
+15 error node v0.12.7
+16 error npm  v2.11.3
+17 error code ELIFECYCLE
+18 error LogAggregatorExpress@0.0.0 start: `node ./bin/www`
+18 error Exit status 1
+19 error Failed at the LogAggregatorExpress@0.0.0 start script 'node ./bin/www'.
+19 error This is most likely a problem with the LogAggregatorExpress package,
+19 error not with npm itself.
+19 error Tell the author that this fails on your system:
+19 error     node ./bin/www
+19 error You can get their info via:
+19 error     npm owner ls LogAggregatorExpress
+19 error There is likely additional logging output above.
+20 verbose exit [ 1, true ]
diff --git a/package.json b/package.json
index 92c6037..d3ae0bc 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "formidable": "^1.0.17",
     "highland": "^2.7.4",
     "method-override": "~2.2.0",
-    "mongoose": "^3.9.7",
+    "mongoose": "~3.8.0",
     "morgan": "~1.6.1",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
diff --git a/public/.DS_Store b/public/.DS_Store
index e63f0ed..b48710d 100644
Binary files a/public/.DS_Store and b/public/.DS_Store differ
diff --git a/public/controllers/gitLog/controllers/indexController.js b/public/controllers/gitLog/controllers/indexController.js
index daf2081..71b7dd0 100644
--- a/public/controllers/gitLog/controllers/indexController.js
+++ b/public/controllers/gitLog/controllers/indexController.js
@@ -591,12 +591,10 @@ app.controller('myController', function($scope, $http) {
         }
         $scope.groupedby = " groupedby " + column_details;
         }
-<<<<<<< HEAD
+// HEAD
         else{
           $scope.groupedby = "";
         }
-=======
->>>>>>> d44739083ddbc064be8db6dc69eaeb8b51da203b
 
         if(obj.filters !== undefined && obj.filters.length !== 0){
 
@@ -610,7 +608,6 @@ app.controller('myController', function($scope, $http) {
 
             console.log("filter_details",filter_details);
           }
-<<<<<<< HEAD
           $scope.filteredby = "and filtered by " + filter_details;
           }
           else{
@@ -631,14 +628,6 @@ app.controller('myController', function($scope, $http) {
 
 
 
-=======
-          $scope.filteredby = " filteredBy " + filter_details;
-          }
-
-          //column_details = "&" + column_details;
-          $scope.description_data= "This graph in plotted between " + obj["row"]["displayName"] + " and " + obj["measure"]["primary"]["displayName"];
->>>>>>> d44739083ddbc064be8db6dc69eaeb8b51da203b
-
        console.log("description_data",$scope.description_data);
       console.log("we are in getgit data function");
 
diff --git a/public/controllers/realTimeLogs/defineData/defineDataController.js b/public/controllers/realTimeLogs/defineData/defineDataController.js
index 664dcbc..142bd28 100644
--- a/public/controllers/realTimeLogs/defineData/defineDataController.js
+++ b/public/controllers/realTimeLogs/defineData/defineDataController.js
@@ -1,7 +1,14 @@
-angular.module('logAggregator').controller('defineDataController', ['$scope','$http', 'defineDataService',
-  function($scope,$http, defineDataService) {
+angular.module('logAggregator').controller('defineDataController', ['$scope', '$http', 'defineDataService',
+  function($scope, $http, defineDataService) {
     $scope.dimensionList = [];
     $scope.measureList = [];
+    $scope.displayDimError = false;
+    $scope.displayMeasError = false;
+    $scope.namespaceName = "Create namespace";
+
+    $scope.showContent = function($fileContent) {
+      $scope.content = $fileContent;
+    };
 
     $scope.hoverIn = function() {
       this.hoverEdit = true;
@@ -13,94 +20,215 @@ angular.module('logAggregator').controller('defineDataController', ['$scope','$h
 
     $scope.selectedDim = function(val) {
       if (!val) {
-        return ;
+        return;
       }
       $scope.dimVal = val;
     }
-    $scope.submitDimension=function() {
-      dimobj={
-        displayName:$scope.displayname,
-        fieldname:$scope.dimVal
+    $scope.submitDimension = function() {
+      if($scope.addDimForm.$invalid)
+      {
+        console.log("ERROR");
+        return;
+      }
+      dimobj = {
+        displayName: $scope.displayname,
+        fieldname: $scope.dimVal,
+        namespaceName :$scope.namespaceName
+      }
+      if ($scope.displayname === $scope.dimVal) {
+        $scope.displayDimError = true;
+      } else {
+        $scope.displayDimError = false;
+        console.log("post", dimobj);
+        $http({
+          method: 'Post',
+          url: '/dimensions/addDimension',
+          data: {
+            data: dimobj
+          }
+        }).
+        success(function(data, status, headers, config) {
+          console.log("Successful");
+          console.log(data);
+        });
+        console.log(dimobj.displayName);
+        $scope.dimensionList.push(dimobj.displayName);
+      }
+    }
+
+    $scope.submitMeasure = function() {
+      if($scope.addMeasForm.$invalid)
+      {
+        console.log("ERROR");
+        return;
+      }
+      measobj = {
+        displaymeasurename: $scope.displaymeasurename,
+        measureFieldSelector: $scope.measureFieldSelector,
+        measure: $scope.measure,
+        measField: $scope.measField,
+        measValue: $scope.measValue,
+        namespaceName :$scope.namespaceName
       }
-      console.log("post",dimobj);
-      $http({method: 'Post', url: '/dimensions/addDimension',data:{data:dimobj}}).
+      if ($scope.displaymeasurename === $scope.measureFieldSelector || $scope.displaymeasurename === $scope.measField) {
+        $scope.displayMeasError = true;
+      } else {
+        $scope.displayMeasError = false;
+        console.log("post", measobj);
+        $http({
+          method: 'Post',
+          url: '/measures/addMeasure',
+          data: {
+            data: measobj
+          }
+        }).
+        success(function(data, status, headers, config) {
+          console.log("Successful");
+          console.log(data);
+        });
+        $scope.measureList.push(measobj.displaymeasurename);
+      }
+    }
+
+
+    $scope.deleteDimension = function(dim) {
+      //console.log("final array ", $scope.dimensionList);
+      for (var i = 0; i < $scope.dimensionList.length; i++) {
+        if ($scope.dimensionList[i] === dim) {
+          deleteDim={
+            namespaceName :$scope.namespaceName,
+            dimName:dim
+          }
+          $scope.dimensionList.pop($scope.dimensionList[i]);
+        }
+      }
+      $http({method: 'Post', url: '/dimensions/delete',data:{data:deleteDim}}).
                 success(function(data, status, headers, config) {
                 console.log("Successful");
                 console.log(data);
                   });
-      console.log(dimobj.displayName);
-      $scope.dimensionList.push(dimobj.displayName);
     }
 
-    $scope.submitMeasure=function() {
-      measobj={
-        displaymeasurename:$scope.displaymeasurename,
-        measureFieldSelector:$scope.measureFieldSelector,
-        measure:$scope.measure,
-        measField:$scope.measField,
-        measValue:$scope.measValue
-      }
-      console.log("post",measobj);
-      $http({method: 'Post', url: '/measures/addMeasure',data:{data:measobj}}).
+    $scope.deleteMeasure = function(measure) {
+      for (var i = 0; i < $scope.measureList.length; i++) {
+        if ($scope.measureList[i] === measure) {
+          deletemeasureList={
+            namespaceName :$scope.namespaceName,
+            measName:measure
+          }
+          $scope.measureList.pop($scope.measureList[i]);
+        }
+      }
+      $http({method: 'Post', url: '/measures/delete',data:{data:deletemeasureList}}).
                 success(function(data, status, headers, config) {
                 console.log("Successful");
                 console.log(data);
                   });
-      //console.log(dimobj.displayName);
-      $scope.measureList.push(measobj.displaymeasurename);
-    //  $scope.dimensionList.push(dimobj.displayName);
-    }
-
-
 
+    }
 
-    $scope.selectedMeas = function(key,val) {
+    $scope.selectedMeas = function(key, val) {
       if (!key) {
-        return ;
+        return;
       }
       $scope.measField = key;
       $scope.measValue = val;
     }
 
+    $scope.createMapFromJSON = function(obj) {
+      var newObject = {}
+      for(var key in obj) {
+        if(typeof obj[key] === 'object') {
+          Object.keys(obj[key]).map(function(s) {
+            newObject[key+'.'+s] = obj[key][s];
+          });
+        } else {
+          newObject[key] = obj[key];
+        }
+      }
+      return newObject;
+    };
+
     $scope.getKeys = function(obj) {
       if (!obj) {
         return [];
       }
-      //console.log(Object.keys(obj));
       return Object.keys(obj);
     }
     $scope.rowSelected = function(obj) {
       if (!obj) {
         return {};
       }
-      $scope.selectedRow = obj;
+      $scope.selectedRow = $scope.createMapFromJSON(obj);
     }
-    defineDataService.getDimensionData().then(function(response) {
-      var dimArr = response.data;
-      console.log("array",dimArr);
-      if (dimArr.length > 0) {
-        for (var i = 0; i < dimArr.length; i++) {
-          //console.log("inside loop", dimArr[i].dispName);
-          $scope.dimensionList.push(dimArr[i].displayName);
-        }
+    //get namespace streaming
+    $scope.getData = function() {
+      if($scope.namespaceForm.$invalid)
+      {
+        console.log("ERROR");
+        return;
       }
-      //console.log("scope",$scope.dimensionList);
-    });
-    defineDataService.getMeasureData().then(function(response) {
-      var mArr = response.data;
-      console.log(mArr);
-      if (mArr.length > 0) {
-        for (var i = 0; i < mArr.length; i++) {
-          $scope.measureList.push(mArr[i].displayName);
-        }
+      $('#myModal').modal('hide');
+      namespaceObj = {
+        name: $scope.namespace,
+        description: $scope.desc,
+        createdOn: Date.now(),
+        source: $scope.source
       }
-    });
-    defineDataService.getLogData().then(function(response) {
-      $scope.namespaceName=response.data.namespaceName;
-      $scope.logdataList = response.data.filedata;
-      //console.log($scope.logdataList);
-      $scope.cols = Object.keys($scope.logdataList[0]);
-
-    });
+      console.log("post", namespaceObj);
+      $scope.namespaceName = $scope.namespace;
+      $scope.cols = [];
+      $scope.logdataList = [];
+      $scope.dimensionList = [];
+      $scope.measureList = [];
+      $scope.displayname = "";
+      $scope.dimVal = "";
+      $scope.displaymeasurename = "";
+      $scope.measField = "";
+      $scope.measValue = "";
+      $scope.selectedRow = {};
+      if ($scope.namespace1 === "radioFile") {
+        $scope.logdataList = JSON.parse($scope.content);
+        $scope.cols = Object.keys($scope.logdataList[0]);
+        console.log("data fro uplaod", $scope.logdataList);
+      } else {
+        var ws = new WebSocket("ws://172.23.238.253:7070");
+        var count = 0;
+        ws.onmessage = function(evt) {
+          $scope.$apply(function() {
+            var received_msg = JSON.parse(evt.data);
+            var sourceData = received_msg[0];
+            if ($scope.source === sourceData && count < 10) {
+              var data = received_msg[2];
+              count++;
+              $scope.logdataList.push(data);
+              console.log("lenght",$scope.cols.length);
+              if ($scope.cols.length <= 0) {
+                for (var key in data) {
+                  $scope.cols.push(key);
+                }
+              }
+            }
+            if (count >= 10) {
+              ws.close();
+              ws.onclose = function() {
+                console.log("close");
+              }
+            }
+          });
+        };
+      }
+      $http({
+        method: 'Post',
+        url: '/logdata',
+        data: {
+          data: namespaceObj
+        }
+      }).
+      success(function(data, status, headers, config) {
+        console.log("Successful");
+        console.log(data);
+      });
+    };
   }
 ]);
diff --git a/public/controllers/realTimeLogs/queryBuilder/queryBuilderController.js b/public/controllers/realTimeLogs/queryBuilder/queryBuilderController.js
index 44c37af..f33d1d3 100644
--- a/public/controllers/realTimeLogs/queryBuilder/queryBuilderController.js
+++ b/public/controllers/realTimeLogs/queryBuilder/queryBuilderController.js
@@ -1,33 +1,93 @@
 var app = angular.module('logAggregator');
 var kk=0;
-app.controller('liveQueryController', ['$scope', function ($scope) {
+var str2="";
+var pid ;
+var addConditionCount=0;
+app.controller('liveQueryController', ['$scope','$http', '$compile','$sce',function ($scope,$http,$compile,$sce) {
+
+
+    var dimensionMap= new Map();
+    var measureMap = new Map();
+    var visitedMap= new Map();
+    $scope.iter=1;
+    $scope.iter2=1;
+
+
+
+
     var data = '{"group": {"operator": "OR","rules": []}}';
+    $scope.flag=false;
+
+    $scope.aggfn = ["average", "count", "max","min","sum"];
+    $scope.accumfn = ["time", "count"];
+    $scope.operators = [">", "<", "==",">=","=<"];
+    //$scope.operators = [">", "<", "==",">=","=<"];
+
+
+//    console.log($scope.selectedAccumFn2);
+
+
 
     function htmlEntities(str) {
         return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;');
+
     }
 
+
+
+
+    $scope.submitQuery = function () {
+
+
+
+  //      console.log("pid----------------------->>>>>>>>>>>"+pid);
+
+        $http({method: 'Post', url: '/exp/stream',data:{data:pid}}).
+        success(function(data, status, headers, config) {
+            console.log("Successful");
+            console.log(data);
+        });
+        query=JSON.parse(str2);
+        // query=str2;
+        // console.log("Answer String")
+        console.log(str2);
+        // $scope.answer=str2;
+        $http({method: 'Post', url: '/exp/save',data:{data:query}}).
+        success(function(data, status, headers, config) {
+            console.log("Successful");
+            console.log(data);
+        });
+
+        window.location="#rtWizard";
+
+
+    };
+
+
+
+
     function computed(group) {
         if (!group) return "";
         for (var str = "(", i = 0; i < group.rules.length; i++) {
-            console.log("aaaaa")
-            console.log($scope.select1);
-            console.log("len----"+ group.rules.length);
+//            console.log("aaaaa")
+            //          console.log($scope.select1);
+//            console.log("len----"+ group.rules.length);
 
-            console.log(group.rules[i]);
+    //        console.log(group.rules[i]);
             i > 0 && (str += " <strong>"+group.operator+"</strong> ");
             kk++;
 
             str += group.rules[i].group ?
                 computed(group.rules[i].group) :
-               group.rules[i].field + " " + htmlEntities(group.rules[i].condition) + " " + group.rules[i].data + "  Over  " + group.rules[i].accumulator +"   " +group.rules[i].value ;
+            group.rules[i].field + " " + htmlEntities(group.rules[i].condition) + " " + group.rules[i].data + "  Over  " + group.rules[i].accumulator +"   " +group.rules[i].value ;
 
             //if(kk>0)
             //{
             //    str += group.rules[i].group ?
             //        computed(group.rules[i].group) :
-                        //
+            //
             //}
+            return "asddddddddddddddddddd";
 
         }
 
@@ -36,131 +96,245 @@ app.controller('liveQueryController', ['$scope', function ($scope) {
     }
 
 
-    function computeJson(group){
-        if(!group) return "";
 
 
-       var str2="{from: {stream: "+$scope.stream+",where: {server-name: {$regex: '/$server.*/' }}},select: ['dimension1', 'dimension2','measure3','measure4'],eval: {"
 
-        for ( i = 0; i < group.rules.length; i++) {
-            console.log("aaaaa")
-            console.log($scope.select1);
-            console.log("len----"+ group.rules.length);
-            console.log("STR----"+i+"-----"+str2);
-            i > 0 && (str2 += ",");
-            kk++;
+     $scope.computeJson=function (){
 
-            str2 += group.rules[i].group ?
-                computeJson(group.rules[i].group) :
-                "val"+i+": {$rolling: { evaluate:"+group.rules[i].field+",over: {"+group.rules[i].accumulator+": "+group.rules[i].value+"},on:"+group.rules[i].data+"}}";
 
-            //if(kk>0)
-            //{
-            //    str += group.rules[i].group ?
-            //        computed(group.rules[i].group) :
-            //
-            //}
+         str2="{\"select\":[";
+         var str3="],\"eval\": {";
+
+         var strng=$scope.select1;
+
+         var dummy="";
+         var stringA="";
+         var count=0;
+         var cn=0;
+         for(var j=0;j<strng.length;j++)
+         {
+
+             if(strng[j]==",") {
+
+                 count++;
+             }
+
+         }
+
+         for(var j=0;j<strng.length;j++)
+         {
+
+             if(strng[j]!=",")
+             {
+                 dummy=dummy+strng[j];
+             }
+             else {
+                 if(cn<count) {
+                     stringA = stringA + "\"" + dummy + "\",";
+                     cn++;
+                     dummy="";
+                 }
 
-        }
 
+             }
 
+         }
+
+
+         stringA = stringA + "\"" + dummy + "\"";
+
+
+
+         str2=str2+stringA+str3;
+
+         str2=str2+"\"val1\": {\"rolling\": {\"evaluate\":\""+$scope.selectedAggFn1+"\",\"over\": {\""+$scope.selectedAccumFn1+"\":"+$scope.value1+"},\"on\":\""
+             +$scope.measure1+"\"}},\"val2\": {\"rolling\": {\"evaluate\":\""+$scope.selectedAggFn2+"\",\"over\": {\""+$scope.selectedAccumFn2+"\":"+$scope.value2
+             +"},\"on\":\"" +$scope.measure2+"\"}}},\"project\": {\"$highlight\": {\"$condition\": \"val1 "+$scope.selectedOperators +" val2\"}},\"to\": \"a\"}";
+      //   console.log(str2);
+
+
+        $scope.display=str2;
+         $scope.trustedHtml=$sce.trustAsHtml($scope.display);
+        // console.log("------"+str2);
         return str2;
 
     }
+    var dimArr;
+
+
+
+
+    $scope.getRows = function () {
+
 
+
+
+         dimensionMap.clear();
+         measureMap.clear();
+         visitedMap.clear();
+        console.log("sssssssssssssssssssssssssssssss");
+
+        $http({method: 'GET', url: '/logdata/namespaceList'}).
+        then(function(response) {
+            console.log("respose--------------------------");
+            //console.log(response.data);
+            //console.log("resposeData--------------------------");
+
+
+            dimArr = response.data;
+            var dimArrLength=dimArr.length;
+            //console.log("length-----------"+dimArrLength);
+            //console.log("array",dimArr);
+            $scope.nameSpaceList=[];
+
+            if (dimArr.length > 0) {
+                for (var i = 0; i < dimArr.length; i++) {
+                    console.log("inside loop"+ dimArr[i].dispName);
+                    var newObj=dimArr[i];
+              //      console.log("name-------------"+newObj);
+
+                    $scope.nameSpaceList.push(newObj);
+                    var objId=dimArr[i]._id;
+                    var dimensionArr=dimArr[i].dimensions;
+                    var measureArr=dimArr[i].measures;
+                    dimensionMap.set(objId,dimensionArr);
+                    measureMap.set(objId,measureArr);
+
+                }
+                console.log("jajajajaja")
+                //console.log($scope.nameSpaceList);
+            }
+
+        });
+
+    }
+
+
+    // ( function () {
+    //     $http({method: 'GET', url: '/logdata/namespaceList'}).
+    //     then(function(response) {
+    //         console.log("respose--------------------------");
+    //         console.log(response.data);
+    //         console.log("resposeData--------------------------");
+    //
+    //
+    //         dimArr = response.data;
+    //         var dimArrLength=dimArr.length;
+    //         console.log("length-----------"+dimArrLength);
+    //         console.log("array",dimArr);
+    //
+    //         if (dimArr.length > 0) {
+    //             for (var i = 0; i < dimArr.length; i++) {
+    //                 //console.log("inside loop", dimArr[i].dispName);
+    //                 var newObj=dimArr[i];
+    //                 console.log("name-------------"+newObj);
+    //
+    //                 $scope.nameSpaceList.push(newObj);
+    //                 var objId=dimArr[i]._id;
+    //                 var dimensionArr=dimArr[i].dimensions;
+    //                 var measureArr=dimArr[i].measures;
+    //                 dimensionMap.set(objId,dimensionArr);
+    //                 measureMap.set(objId,measureArr);
+    //
+    //             }
+    //             console.log("jajajajaja")
+    //             console.log($scope.nameSpaceList);
+    //         }
+    //
+    //     });
+    //
+    // }());
+
+
+
+
+
+    $scope.getDimensionAndMeasure=function (id) {
+
+
+
+        console.log("qqqqqqqqqqqqqqqqqq")
+
+
+            $scope.dimensionList=[];
+            $scope.measureList=[];
+
+
+            pid=id;
+            var visitedValue=visitedMap.get(id);
+        console.log("visited value -----"+visitedValue);
+
+            if(visitedValue!=1)
+            {
+
+                visitedMap.set(id,1);
+//                console.log("get dimension clicked. ID: " + id);
+
+                var arrayDim = dimensionMap.get(id);
+                console.log("Dimension Map");
+                console.log(dimensionMap)
+               console.log("array dim ---------------->>>>>>>>>>>>>>>>>>");
+                console.log(arrayDim);
+                var arrayMeas = measureMap.get(id);
+                //console.log(measureMap)
+                //console.log("hihihi");
+                //console.log("array dim ka length ---------------------------->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+arrayDim.length);
+
+
+                for (var j = 0; j < arrayDim.length; j++) {
+                    $scope.dimensionList[j] = arrayDim[j].fieldName;
+
+                }
+
+                for (var j = 0; j < arrayMeas.length; j++) {
+                    // $scope.dimensionList[j]=arrayDim[j].fieldName;
+                    $scope.measureList[j] = arrayMeas[j].displayName;
+
+                }
+
+
+                //console.log("measure list");
+                //console.log($scope.measureList);
+
+                var btnhtml = '<li   class="styleforli">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;a)&nbsp;Dimensions</li><ul  class="baskya">';
+                var i = 0;
+                for (i = 0; i < $scope.dimensionList.length; i++) {
+                    btnhtml = btnhtml + "<li class='innerlicolor'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +$scope.iter2+".&nbsp;"+ $scope.dimensionList[i] + "</li>"
+                    $scope.iter2++;
+                }
+                btnhtml = btnhtml + "</ul><li class ='styleforli' >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;b)&nbsp;Measures</li><ul class='baskya'>";
+                // btnhtml = btnhtml + "</ul><li class ='styleforli' >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Measures</li><ul class='baskya'>";
+
+                var i = 0;
+                for (i = 0; i < $scope.measureList.length; i++) {
+
+
+                    btnhtml = btnhtml + "<li class='innerlicolor'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +$scope.iter+".&nbsp;"+ $scope.measureList[i] + "</li>"
+                    $scope.iter++;
+                }
+                btnhtml = btnhtml + "</ul>";
+
+//                console.log(btnhtml);
+                var temp = $compile(btnhtml)($scope);
+                angular.element(document.getElementById(id)).append(temp);
+
+
+            }
+
+
+
+    }
+    $scope.output2 = "sadasdadaasdasdsa";
+
+    $scope.aggregatorList=["average", "mean", "max","standard deviation"];
     $scope.json = null;
 
     $scope.filter = JSON.parse(data);
 
     $scope.$watch('filter', function (newValue) {
         $scope.json = JSON.stringify(newValue, null, 2);
-        $scope.output = computed(newValue.group);
-        $scope.jsonOutput=computeJson(newValue.group);
+        $scope.output2 = "sadasdadaasdasdsa";
+  //      console.log("output value"+$scope.output2);
+        //$scope.jsonOutput=computeJson(newValue.group);
     }, true);
 }]);
-
-//var queryBuilder = angular.module('queryBuilder', []);
-app.directive('queryBuilder', ['$compile','$http', function ($compile,$http) {
-    return {
-        restrict: 'E',
-        scope: {
-            group: '='
-        },
-        templateUrl: '/queryBuilderDirective.html',
-        compile: function (element, attrs) {
-            var content, directive;
-            content = element.contents().remove();
-            return function (scope, element, attrs) {
-                scope.operators = [
-                    { name: 'AND' },
-                    { name: 'OR' }
-                ];
-
-                scope.fields = [
-                    { name: 'Average' },
-                    { name: 'Standard Deviation' },
-                    { name: 'Count' },
-                    { name: 'Mean' },
-                    { name: 'Max' }
-                ];
-
-                scope.accumulators = [
-                    { name: 'Count' },
-                    { name: 'Time' }
-
-                ];
-
-                scope.conditions = [
-                    { name: '=' },
-                    { name: '<>' },
-                    { name: '<' },
-                    { name: '<=' },
-                    { name: '>' },
-                    { name: '>=' }
-                ];
-
-                scope.addCondition = function () {
-                    scope.group.rules.push({
-                        condition: 'of',
-                        field: 'Firstname',
-                        data: '',
-                        accumulator:'',
-                        value:''
-                    });
-                };
-
-                scope.removeCondition = function (index) {
-                    scope.group.rules.splice(index, 1);
-                };
-
-                scope.addGroup = function () {
-                    scope.group.rules.push({
-                        group: {
-                            operator: 'AND',
-                            rules: []
-                        }
-                    });
-                };
-
-                scope.removeGroup = function () {
-                    "group" in scope.$parent && scope.$parent.group.rules.splice(scope.$parent.$index, 1);
-                };
-                scope.submitQuery = function () {
-                query="select * from somthing"
-                $http({method: 'Post', url: '/exp/save',data:{data:query}}).
-                success(function(data, status, headers, config) {
-                console.log("Successful");
-                console.log(data);
-                  });
-
-                };
-
-                directive || (directive = $compile(content));
-
-                element.append(directive(scope, function ($compile) {
-                    return $compile;
-                }));
-            }
-        }
-    }
-}]);
diff --git a/public/controllers/realTimeLogs/queryBuilder/queryBuilderController.js.orig b/public/controllers/realTimeLogs/queryBuilder/queryBuilderController.js.orig
new file mode 100644
index 0000000..44c37af
--- /dev/null
+++ b/public/controllers/realTimeLogs/queryBuilder/queryBuilderController.js.orig
@@ -0,0 +1,166 @@
+var app = angular.module('logAggregator');
+var kk=0;
+app.controller('liveQueryController', ['$scope', function ($scope) {
+    var data = '{"group": {"operator": "OR","rules": []}}';
+
+    function htmlEntities(str) {
+        return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    }
+
+    function computed(group) {
+        if (!group) return "";
+        for (var str = "(", i = 0; i < group.rules.length; i++) {
+            console.log("aaaaa")
+            console.log($scope.select1);
+            console.log("len----"+ group.rules.length);
+
+            console.log(group.rules[i]);
+            i > 0 && (str += " <strong>"+group.operator+"</strong> ");
+            kk++;
+
+            str += group.rules[i].group ?
+                computed(group.rules[i].group) :
+               group.rules[i].field + " " + htmlEntities(group.rules[i].condition) + " " + group.rules[i].data + "  Over  " + group.rules[i].accumulator +"   " +group.rules[i].value ;
+
+            //if(kk>0)
+            //{
+            //    str += group.rules[i].group ?
+            //        computed(group.rules[i].group) :
+                        //
+            //}
+
+        }
+
+        return " Select  "+$scope.select1 + " from " +$scope.stream + " where "+ str + ")";
+
+    }
+
+
+    function computeJson(group){
+        if(!group) return "";
+
+
+       var str2="{from: {stream: "+$scope.stream+",where: {server-name: {$regex: '/$server.*/' }}},select: ['dimension1', 'dimension2','measure3','measure4'],eval: {"
+
+        for ( i = 0; i < group.rules.length; i++) {
+            console.log("aaaaa")
+            console.log($scope.select1);
+            console.log("len----"+ group.rules.length);
+            console.log("STR----"+i+"-----"+str2);
+            i > 0 && (str2 += ",");
+            kk++;
+
+            str2 += group.rules[i].group ?
+                computeJson(group.rules[i].group) :
+                "val"+i+": {$rolling: { evaluate:"+group.rules[i].field+",over: {"+group.rules[i].accumulator+": "+group.rules[i].value+"},on:"+group.rules[i].data+"}}";
+
+            //if(kk>0)
+            //{
+            //    str += group.rules[i].group ?
+            //        computed(group.rules[i].group) :
+            //
+            //}
+
+        }
+
+
+        return str2;
+
+    }
+
+    $scope.json = null;
+
+    $scope.filter = JSON.parse(data);
+
+    $scope.$watch('filter', function (newValue) {
+        $scope.json = JSON.stringify(newValue, null, 2);
+        $scope.output = computed(newValue.group);
+        $scope.jsonOutput=computeJson(newValue.group);
+    }, true);
+}]);
+
+//var queryBuilder = angular.module('queryBuilder', []);
+app.directive('queryBuilder', ['$compile','$http', function ($compile,$http) {
+    return {
+        restrict: 'E',
+        scope: {
+            group: '='
+        },
+        templateUrl: '/queryBuilderDirective.html',
+        compile: function (element, attrs) {
+            var content, directive;
+            content = element.contents().remove();
+            return function (scope, element, attrs) {
+                scope.operators = [
+                    { name: 'AND' },
+                    { name: 'OR' }
+                ];
+
+                scope.fields = [
+                    { name: 'Average' },
+                    { name: 'Standard Deviation' },
+                    { name: 'Count' },
+                    { name: 'Mean' },
+                    { name: 'Max' }
+                ];
+
+                scope.accumulators = [
+                    { name: 'Count' },
+                    { name: 'Time' }
+
+                ];
+
+                scope.conditions = [
+                    { name: '=' },
+                    { name: '<>' },
+                    { name: '<' },
+                    { name: '<=' },
+                    { name: '>' },
+                    { name: '>=' }
+                ];
+
+                scope.addCondition = function () {
+                    scope.group.rules.push({
+                        condition: 'of',
+                        field: 'Firstname',
+                        data: '',
+                        accumulator:'',
+                        value:''
+                    });
+                };
+
+                scope.removeCondition = function (index) {
+                    scope.group.rules.splice(index, 1);
+                };
+
+                scope.addGroup = function () {
+                    scope.group.rules.push({
+                        group: {
+                            operator: 'AND',
+                            rules: []
+                        }
+                    });
+                };
+
+                scope.removeGroup = function () {
+                    "group" in scope.$parent && scope.$parent.group.rules.splice(scope.$parent.$index, 1);
+                };
+                scope.submitQuery = function () {
+                query="select * from somthing"
+                $http({method: 'Post', url: '/exp/save',data:{data:query}}).
+                success(function(data, status, headers, config) {
+                console.log("Successful");
+                console.log(data);
+                  });
+
+                };
+
+                directive || (directive = $compile(content));
+
+                element.append(directive(scope, function ($compile) {
+                    return $compile;
+                }));
+            }
+        }
+    }
+}]);
diff --git a/public/controllers/realTimeLogs/rtwizard/rtcontroller.js b/public/controllers/realTimeLogs/rtwizard/rtcontroller.js
index d51f034..d338048 100644
--- a/public/controllers/realTimeLogs/rtwizard/rtcontroller.js
+++ b/public/controllers/realTimeLogs/rtwizard/rtcontroller.js
@@ -1,7 +1,36 @@
+// var app = angular.module('logAggregator');
+//   app.controller('rtcontroller', function($scope, $http) {
+//     $http.get('todos.json')
+//          .then(function(res){
+//             $scope.todos = res.data;
+//           });
+//   });
+
 var app = angular.module('logAggregator');
-  app.controller('rtcontroller', function($scope, $http) {
-    $http.get('todos.json')
-         .then(function(res){
-            $scope.todos = res.data;
-          });
-  });
+
+	app.controller('rtcontroller',function($scope){
+  // app.controller('myController',function($scope){8
+
+		$scope.key = [];
+		$scope.val = [];
+
+	var ws = new WebSocket("ws://localhost:9000");
+
+	var isFirstMessage = true;
+
+	ws.onmessage = function(evt){
+
+		$scope.$apply(function(){
+			var received_msg =  JSON.parse(evt.data);
+			// var data = received_msg[2];
+      var data=received_msg;
+			if(isFirstMessage){
+				for(var key in data){
+					$scope.key.push(key);
+				}
+				isFirstMessage =  false ;
+			}  // if(isFirstMessage) end
+			$scope.val.splice(0,0,data);
+		}) ;   //$scope.apply end
+	} ; 	  //ws.onmessage end
+	}); 	  //app.controller end
diff --git a/public/directives/javascripts/fileUpload/onReadFile.js b/public/directives/javascripts/fileUpload/onReadFile.js
new file mode 100644
index 0000000..92a24f9
--- /dev/null
+++ b/public/directives/javascripts/fileUpload/onReadFile.js
@@ -0,0 +1,21 @@
+angular.module('logAggregator').directive('onReadFile', function ($parse) {
+	return {
+		restrict: 'A',
+		scope: false,
+		link: function(scope, element, attrs) {
+            var fn = $parse(attrs.onReadFile);
+
+			element.on('change', function(onChangeEvent) {
+				var reader = new FileReader();
+
+				reader.onload = function(onLoadEvent) {
+					scope.$apply(function() {
+						fn(scope, {$fileContent:onLoadEvent.target.result});
+					});
+				};
+
+				reader.readAsText((onChangeEvent.srcElement || onChangeEvent.target).files[0]);
+			});
+		}
+	};
+});
diff --git a/public/stylesheets/queryBuilder/queryBuilder.css b/public/stylesheets/queryBuilder/queryBuilder.css
index 7582e38..7518d9d 100644
--- a/public/stylesheets/queryBuilder/queryBuilder.css
+++ b/public/stylesheets/queryBuilder/queryBuilder.css
@@ -8,6 +8,13 @@
 .group-conditions{
     margin-left: 20px;
 }
+#operator{
+    text-align: center;
+}
+
+.namespaceliststyle{
+    padding-left: 0px;
+}
 .widcheck{
 }
 #livequeryform{
@@ -28,3 +35,17 @@
     margin-top: 15px;
     margin-bottom: 15px;
 }
+
+
+
+
+
+.baskya{
+    padding-left: 0px;
+}
+
+.sidebar-nav li {
+    display: block;
+    text-decoration: none;
+    color: darkblue;
+}
diff --git a/public/stylesheets/simple-sidebar.css b/public/stylesheets/simple-sidebar.css
index 4d4d9f0..56b6029 100644
--- a/public/stylesheets/simple-sidebar.css
+++ b/public/stylesheets/simple-sidebar.css
@@ -96,7 +96,7 @@
 }
 
 #sidebar-wrapper{
-  margin-top: 38px;
+  margin-top: 2px;
 }
 
 .sidebar-brand {
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 72c4d36..0a4b5c0 100755
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -125,14 +125,14 @@ This code is written by Prateek Reddy Yammanuru, Shiva Manognya Kandikuppa, Uday
  }
 
 .wrapper{
-  margin-top:60px;
+  margin-top:40px;
   margin-left:20px;
 }
 .dashboardWizardRow{
   margin-top:120px;
 }
 .liveQueryWizardRow{
-    margin-top:120px;
+    margin-top:100px;
 }
  .buttom_css{
    height:50px;
@@ -1237,47 +1237,64 @@ ul[dnd-list] > li > a{
 .formBottomPad{
 padding-bottom: 100px;
 }
+/*Wave 4 code-start*/
+#table-wrapper {
+    position:relative;
+}
+#table-scroll {
+    height:450px;
+    overflow:auto;
+    margin-top:20px;
+}
 
+#table-wrapper table {
+    width:100%;
+}
 
-///dummy
-
-
-
-
-
-
-
-
-
+#table-wrapper table * {
+    background:white;
+    color:black;
+}
 
+#table-wrapper table thead th .text {
+    position:absolute;
+    top:-20px;
+    z-index:2;
+    height:20px;
+    width:35%;
+    border:1px solid red;
+}
 
 #tabLog, #tabLog td, #tabLog th {
     border: 1px solid black;
     cursor: pointer;
+
 }
 
 #tabLog {
     border-collapse: collapse;
-    width: 100%;
-    margin-top: 10px;
-}
-
-th {
-    height: 50px;
-
+    /*width: 100%;*/
+    /*margin-top: 10px;*/
 }
 
+/*
 td ,th {
   padding-left: 10px;
   padding-right: 10px;
-}
+}*/
 
 #goBtn{
   margin-top: 10px;
 }
 
+.panelBody{
+  height: 550px;
+}
+
+
 .mainSection {
-  height: 750px;
+border: none;
+box-shadow: none;
 }
 
 .container{
@@ -1341,3 +1358,16 @@ td ,th {
     width: 100%;
     margin-top: 10px;
 }
+.modal-scroll{
+  overflow-x:scroll;
+  overflow-y: scroll;
+  padding-bottom:10px;
+}
+.align-left{
+  text-align:left;
+}
+.wordwrap{
+  text-align:center;
+  word-wrap:break-word;
+}
+/*Wave 4 code end------*/
diff --git a/public/views/gitLog/dashboardWizard/dashboardWizard.html b/public/views/gitLog/dashboardWizard/dashboardWizard.html
index 5af3ec9..563862c 100644
--- a/public/views/gitLog/dashboardWizard/dashboardWizard.html
+++ b/public/views/gitLog/dashboardWizard/dashboardWizard.html
@@ -36,7 +36,7 @@
                     <!-- end #measures.nav nav-pills nav-stacked collapse out -->
                 </li>
             </ul>
-            
+
             <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#aggregators">
                 <i class="fa fa-circle-o"></i>
                 Aggregators
diff --git a/public/views/gitLog/mainPage/mainPage.view.html b/public/views/gitLog/mainPage/mainPage.view.html
index 7c431bf..4aa85dd 100644
--- a/public/views/gitLog/mainPage/mainPage.view.html
+++ b/public/views/gitLog/mainPage/mainPage.view.html
@@ -2,23 +2,56 @@
 
 <div id="wrapper" class="toggled" ng-controller="myController">
 
-  <!-- Sidebar -->
-  <div id="sidebar-wrapper">
-      <ul class="sidebar-nav nav nav-pills nav-stacked" id="stacked-menu">
-        <span class="sidebar-secondLink"><li><a href="#dashboardWizard"><li class="sidebar-brand fa fa-th"> Widget wizard</li></a></li></span>
-        <li class="sidebar-brand fa fa-magic"> Plot Widgets </li>
-        <span class="sidebar-secondLink"><li><a href="#liveQueryWizard"><li class="sidebar-brand fa fa-th"> Live Query</li></a></li></span>
-        <li> <!-- home item in menu started-->
-           <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#p1">
-              <i class="fa fa-circle-o"></i> WIDGETS
-           </a>
-           <ul class="nav nav-pills nav-stacked collapse out leftPad" id="p1"><!-- submenu started-->
-             <li ng-repeat="dashboards in multigraphdashboard" data-toggle="collapse" data-parent="#p1" data-dashbutton="true" data-json={{dashboards}} data-ng-click="plot_graph($event)">
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{dashboards}}
-             </li>
-          </ul>
-         </li>
-         <!-- <li>
+    <!-- Sidebar -->
+    <div id="sidebar-wrapper">
+        <ul class="sidebar-nav nav nav-pills nav-stacked" id="stacked-menu">
+            <span class="sidebar-secondLink">
+                <li>
+                    <a href="#dashboardWizard">
+                    <li class="sidebar-brand fa fa-th">
+                        Widget wizard</li>
+                </a>
+            </li>
+        </span>
+        <li class="sidebar-brand fa fa-magic">
+            Plot Widgets
+        </li>
+        <span class="sidebar-secondLink">
+            <li>
+                <a href="#liveQueryWizard">
+                <li class="sidebar-brand fa fa-th">
+                    Live Query</li>
+            </a>
+        </li>
+    </span>
+
+    <!--  Wave 4 start RT by 3 -->
+    <span class="sidebar-secondLink">
+        <li>
+            <a href="#rtWizard">
+            <li class="sidebar-brand fa fa-th">
+                Real Time Widgets</li>
+              </a>
+    </li>
+
+</span>
+
+<!--  wave 4 end by 3-->
+
+<li>
+    <!-- home item in menu started-->
+    <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#p1">
+        <i class="fa fa-circle-o"></i>
+        WIDGETS
+    </a>
+    <ul class="nav nav-pills nav-stacked collapse out leftPad" id="p1">
+        <!-- submenu started-->
+        <li ng-repeat="dashboards in multigraphdashboard" data-toggle="collapse" data-parent="#p1" data-dashbutton="true" data-json={{dashboards}} data-ng-click="plot_graph($event)">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{dashboards}}
+        </li>
+    </ul>
+</li>
+<!-- <li>
             <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#p2">
               <i class="fa fa-circle-o"></i> Single Dimentional Graph
             </a>
@@ -28,65 +61,73 @@
            </li>
         </ul>
       </li> -->
-      </ul>
+</ul>
 
-  </div>
-  <!-- /#sidebar-wrapper -->
+</div>
+<!-- /#sidebar-wrapper -->
 
-  <!-- Page Content -->
-  <div id="page-content-wrapper">
-    <div class="col-12 simply">
-        <a id="menu-toggle"><i id = "iMenu" class="fa fa-chevron-right" style="font-size:34px;"></i></a>
-    </div>
-      <div class="container">
-          <div class="row">
-              <div class="col-sm-12 simply pull-right" id="graph-container">
-                <!-- <div class="container"> -->
-              <div class="panel panel-info" >
-                    <div class="panel-heading">
-                      <h2 class="panel-title" style="font-size:40px;"><strong>{{graph_type_details}}</strong></h2>
-                    </div> <!-- end panel-heading-->
-                    <div class="panel-body">
-                      <div class="alert alert-success">
-                        {{description_data}}<br>
-                        {{groupedby}}<br>
-                        {{filteredby}}
-                      </div>
-                      <div class="col-sm-12">
-                          <div class="row">
-                              <div class="col-sm-12">
-                                  <div class="tab-content">
-                                      <!-- <div class="tab-pane active" id="tab1"> -->
-                                      <div class="row">
-                                        <div class=col-sm-12>
-                                          <button class="btn btn-primary pull-right" ng-click="plot_graph()" style="margin: 20px 20px;"><i class="fa fa-filter" style="font-size:20px;">&nbsp;</i>Filter</button>
-                                          <button class="btn btn-primary pull-right" ng-click="toggle_graph()" style="margin: 20px 20px;"><i class="fa fa-binoculars" style="font-size:20px;">&nbsp;</i>Views</button>
-                                          <!-- <button class="btn btn-danger pull-right" ng-click="open_model()" style="margin: 20px 20px;"><span class="glyphicon glyphicon-filter"></span>Button3</button> -->
-                                        </div>
-                                        <div class=col-lg-12>
-                                            <div id="graph"> </div>
-                                            <div class="hidden" id="graph1"> </div>
-                                        </div>
-                                      </div>                                <!--end of tab pane-->
-                                  </div>
-                                  <!--end of tab content-->
-                              </div>
-                          </div>
-                      </div>
+<!-- Page Content -->
+<div id="page-content-wrapper">
+<div class="col-12 simply">
+<a id="menu-toggle">
+    <i id="iMenu" class="fa fa-chevron-right" style="font-size:34px;"></i>
+</a>
+</div>
+<div class="container">
+<div class="row">
+    <div class="col-sm-12 simply pull-right" id="graph-container">
+        <!-- <div class="container"> -->
+        <div class="panel panel-info">
+            <div class="panel-heading">
+                <h2 class="panel-title" style="font-size:40px;">
+                    <strong>{{graph_type_details}}</strong>
+                </h2>
+            </div>
+            <!-- end panel-heading-->
+            <div class="panel-body">
+                <div class="alert alert-success">
+                    {{description_data}}<br>
+                    {{groupedby}}<br>
+                    {{filteredby}}
+                </div>
+                <div class="col-sm-12">
+                    <div class="row">
+                        <div class="col-sm-12">
+                            <div class="tab-content">
+                                <!-- <div class="tab-pane active" id="tab1"> -->
+                                <div class="row">
+                                    <div class=col-sm-12>
+                                        <button class="btn btn-primary pull-right" ng-click="plot_graph()" style="margin: 20px 20px;">
+                                            <i class="fa fa-filter" style="font-size:20px;">&nbsp;</i>Filter</button>
+                                        <button class="btn btn-primary pull-right" ng-click="toggle_graph()" style="margin: 20px 20px;">
+                                            <i class="fa fa-binoculars" style="font-size:20px;">&nbsp;</i>Views</button>
+                                        <!-- <button class="btn btn-danger pull-right" ng-click="open_model()" style="margin: 20px 20px;"><span class="glyphicon glyphicon-filter"></span>Button3</button> -->
+                                    </div>
+                                    <div class=col-lg-12>
+                                        <div id="graph"></div>
+                                        <div class="hidden" id="graph1"></div>
+                                    </div>
+                                </div>
+                                <!--end of tab pane-->
+                            </div>
+                            <!--end of tab content-->
+                        </div>
+                    </div>
+                </div>
 
-                  <section>
-                      <div class="modal" id="my_modal1">
-                          <div class="modal-dialog">
-                              <div class="modal-content">
-                                  <div class="modal-header">
-                                      <button class="close" data-dismiss="modal" ng-click="close_model()">&times;</button>
-                                      <h2>Select the option</h2>
-                                  </div>
-                                  <!--end of modal content-->
-                                  <div class="modal-body">
-                                      <form class="form-horizontal">
+                <section>
+                    <div class="modal" id="my_modal1">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <button class="close" data-dismiss="modal" ng-click="close_model()">&times;</button>
+                                    <h2>Select the option</h2>
+                                </div>
+                                <!--end of modal content-->
+                                <div class="modal-body">
+                                    <form class="form-horizontal">
                                         <!-- <h1 style="margin:auto">Click on submit button</h1> -->
-                                        <div class="form-group" ng-repeat="data in filtered_data"  id={{idMaker(data.name)+"div"}}>
+                                        <div class="form-group" ng-repeat="data in filtered_data" id={{idMaker(data.name)+"div"}}>
                                             <label class="col-lg-2 control-label" for="inputMessage">{{data.displayName}}</label>
                                             <div class="col-lg-10">
                                                 <div class="col-sm-5">
@@ -95,11 +136,13 @@ <h2>Select the option</h2>
                                                     </select>
                                                 </div>
                                                 <div class="col-sm-1">
-                                                    <button ng-click="add_month()"><span class="glyphicon glyphicon-arrow-right"></span>
+                                                    <button ng-click="add_month()">
+                                                        <span class="glyphicon glyphicon-arrow-right"></span>
                                                     </button>
                                                     <br>
                                                     <br>
-                                                    <button ng-click="clear_month()"><span class="glyphicon glyphicon-arrow-left"></span>
+                                                    <button ng-click="clear_month()">
+                                                        <span class="glyphicon glyphicon-arrow-left"></span>
                                                     </button>
                                                 </div>
                                                 <div class="col-sm-5">
@@ -110,8 +153,7 @@ <h2>Select the option</h2>
                                             </div>
                                         </div>
 
-
-                                          <!-- <div class="form-group" id="box2">
+                                        <!-- <div class="form-group" id="box2">
                                               <label class="col-lg-2 control-label" for="inputMessage">Select Year</label>
                                               <div class="col-lg-10">
                                                   <div class="col-sm-5">
@@ -180,46 +222,45 @@ <h2>Select the option</h2>
                                                   </div>
                                               </div>
                                           </div> -->
-                                      </form>
-                                      <!--end of the form-->
-                                  </div>
-                                  <!--end of modal body-->
-                                  <div class="modal-footer">
-                                      <button class="buttom_css" data-json={{submit_json}} data-dashbutton="false" ng-click="plotthedata()">Submit</button>
-                                  </div>
-                                  <!--end of modal footer-->
-                              </div>
-                              <!--end of modal dialog-->
-                          </div>
-                          <!--end of modal content-->
-                      </div>
-                      <!--Modal window ends here-->
-                  </section>
-                  <!--modal window ends here-->
+                                    </form>
+                                    <!--end of the form-->
+                                </div>
+                                <!--end of modal body-->
+                                <div class="modal-footer">
+                                    <button class="buttom_css" data-json={{submit_json}} data-dashbutton="false" ng-click="plotthedata()">Submit</button>
+                                </div>
+                                <!--end of modal footer-->
+                            </div>
+                            <!--end of modal dialog-->
+                        </div>
+                        <!--end of modal content-->
+                    </div>
+                    <!--Modal window ends here-->
+                </section>
+                <!--modal window ends here-->
 
-                  <div class="panel-heading">
-                  </div> <!-- end panel-footer-->
-              </div>
-          </div>
+                <div class="panel-heading"></div>
+                <!-- end panel-footer-->
+            </div>
         </div>
-          </div>
-          <!-- <button class="buttom_css" ng-click="saveDash()">Submit</button> -->
-      </div>
-  </div>
-  <!-- /#page-content-wrapper -->
+    </div>
+</div>
+<!-- <button class="buttom_css" ng-click="saveDash()">Submit</button> -->
+</div>
+</div>
+<!-- /#page-content-wrapper -->
 
 </div>
-  <script>
-  $("#menu-toggle").click(function(e) {
-      e.preventDefault();
-      $("#wrapper").toggleClass("toggled");
-      if($("#iMenu").hasClass("fa-chevron-right")){
-      $("#iMenu").removeClass("fa-chevron-right");
-      $("#iMenu").addClass("fa-chevron-left");
-    }
-    else{
-      $("#iMenu").removeClass("fa-chevron-left");
-      $("#iMenu").addClass("fa-chevron-right");
+<script>
+$("#menu-toggle").click(function(e) {
+    e.preventDefault();
+    $("#wrapper").toggleClass("toggled");
+    if ($("#iMenu").hasClass("fa-chevron-right")) {
+        $("#iMenu").removeClass("fa-chevron-right");
+        $("#iMenu").addClass("fa-chevron-left");
+    } else {
+        $("#iMenu").removeClass("fa-chevron-left");
+        $("#iMenu").addClass("fa-chevron-right");
     }
-  });
-  </script>
+});
+</script>
diff --git a/public/views/realTimeLogs/defineData/defineData.html b/public/views/realTimeLogs/defineData/defineData.html
index fae5b38..d05abd9 100644
--- a/public/views/realTimeLogs/defineData/defineData.html
+++ b/public/views/realTimeLogs/defineData/defineData.html
@@ -1,7 +1,7 @@
 <div class="container" style="margin-top:100px">
   <div class="row">
     <div class="col-sm-3">
-      <div class="panel panel-info mainSection">
+      <div class="panel panel-info panelBody ">
         <div class="panel-heading">
           <div class="row">
             <div class="col-sm-10">
@@ -12,11 +12,35 @@ <h4 class="panel-title" ng-bind="namespaceName">
               <a data-toggle="modal" data-target="#myModal">
                 <i class="glyphicon glyphicon-plus"></i>
               </a>
+              <a data-toggle="modal" data-target="#fulltable">
+                <i class="glyphicon glyphicon-resize-full"></i>
+              </a>
+
             </div>
           </div>
           <!-- <button type="button" class="btn btn-blue" data-toggle="modal" data-target="#myModal"><span class="glyphicon glyphicon-align-plus" aria-hidden="true"></span></button> -->
         </div>
         <div class="panel-body">
+          <div class="modal fade" id="fulltable" role="dialog">
+            <div class="modal-dialog">
+              <div class="modal-content" >
+                <div class="modal-scroll">
+                <table>
+                  <thead>
+                    <tr>
+                      <th ng-repeat="header in cols">{{header}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr ng-repeat="row in logdataList">
+                      <td ng-if="!$last" ng-repeat="dat in getKeys(row)">{{row[dat]}}</td>
+                    </tr>
+                  </tbody>
+                </table>
+                </div>
+              </div>
+            </div>
+          </div>
           <!-- <button type="button" class="btn btn-blue" data-toggle="modal" data-target="#myModal">Create new namespace</button> -->
           <!-- Modal -->
           <div class="modal fade" id="myModal" role="dialog">
@@ -30,26 +54,23 @@ <h4 class="modal-title">Create new namespace</h4>
                 </div>
                 <div class="modal-body">
                   <!-- enctype="multipart/form-data" -->
-                  <form action="/logdata?form=namespace" method="post" enctype="multipart/form-data">
+                  <form  name="namespaceForm" novalidate ng-submit="getData()">
                     <div class="form-group">
                       <label for="namespace">Namespace</label>
-                      <input type="name" class="form-control" id="namespace" name="namespace" placeholder="Enter namespace">
+                      <input type="name" class="form-control" id="namespace" name="namespace" placeholder="Enter namespace" ng-model="namespace" required>
+                      <span style="color:#990000" ng-show="namespaceForm.namespace.$touched && namespaceForm.namespace.$invalid">Namespace is required.</span>
                     </div>
+                    <!-- namespaceForm.desc.$error.required -->
                     <div class="form-group">
                       <label for="desc">Description</label>
-                      <textarea class="form-control" rows="3" placeholder="Enter description" name="desc" id="desc"></textarea>
+                      <textarea class="form-control" rows="3" placeholder="Enter description" name="desc" id="desc" ng-model="desc" required></textarea>
+                      <span style="color:#990000" ng-show="namespaceForm.desc.$touched && namespaceForm.desc.$invalid">Description is required.</span>
                     </div>
                     <div class="form-group">
-                      <label for="fileSource">Source</label>
-                      <input type="fileSource" class="form-control" id="fileSource" name="fileSource" placeholder="Enter source">
+                      <label for="source">Source</label>
+                      <input type="source" class="form-control" id="source" name="source" placeholder="Enter source" ng-model="source" required>
+                      <span style="color:#990000" ng-show="namespaceForm.source.$touched && namespaceForm.source.$invalid">Source is required.</span>
                     </div>
-                    <!-- <div class="form-group">
-                      <label for="exampleInputFile">File input</label>
-                      <input type="file" id="exampleInputFile" required accept=".json" name="file">
-                      <p class="help-block">Upload your log file here.</p>
-                    </div> -->
-
-                    <!--    **************** -->
                     <div class="form-group">
                       <label for="radioFile">
                         <input type="radio" name="namespace1" id="radioFile" ng-model="namespace1" value="radioFile">File Upload</label>
@@ -59,7 +80,9 @@ <h4 class="modal-title">Create new namespace</h4>
                     <div class="form-group" id="radioFileDiv" ng-show="namespace1=='radioFile'">
                       <div class="form-group">
                         <label for="exampleInputFile">File input</label>
-                        <input type="file" id="exampleInputFile" required accept=".json" name="file">
+                        <!-- <input type="file" id="exampleInputFile" required accept=".json" name="file" ng-model onchange="angular.element(this).scope().setFiles(this)"> -->
+                        <!-- <input type="file" id="exampleInputFile" required accept=".json" file-model="file"> -->
+                        <input type="file" id="exampleInputFile" required accept=".json" on-read-file="showContent($fileContent)">
                         <p class="help-block">Upload your log file here.</p>
                       </div>
                     </div>
@@ -70,9 +93,12 @@ <h4> Streaming Data</h4>
                       <label for="streamPort">Port</label>
                       <input type="streamPort" class="form-control" id="streamPort" placeholder="Enter Port.."> -->
                     </div>
-                    <button type="submit" class="btn btn-success">Submit</button>
+                    <!-- <button type="submit" class="btn btn-success">Submit</button> -->
                     <!-- <button ng-click="" class="btn btn-success">Submit</button> -->
+                    <button type="submit" class="btn btn-success">Submit</button>
+
                   </form>
+
                 </div>
                 <div class="modal-footer">
                   <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -80,25 +106,27 @@ <h4> Streaming Data</h4>
               </div>
             </div>
           </div>
-          <div style="overflow:scroll;">
-            <table id="tabLog" class="hoverTable">
-              <thead>
-                <tr>
-                  <th ng-repeat="header in cols">{{header}}</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr ng-repeat="row in logdataList" ng-click="rowSelected(row)">
-                  <td ng-if="!$last" ng-repeat="dat in getKeys(row)">{{row[dat]}}</td>
-                </tr>
-              </tbody>
-            </table>
+          <div id="table-wrapper">
+            <div id="table-scroll">
+              <table id="tabLog" class="hoverTable">
+                <thead>
+                  <tr>
+                    <th ng-repeat="header in cols">{{header}}</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr ng-repeat="row in logdataList" ng-click="rowSelected(row)">
+                    <td ng-if="!$last" ng-repeat="dat in getKeys(row)">{{row[dat]}}</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
           </div>
         </div>
       </div>
     </div>
-    <div class="col-sm-4">
-      <div class="panel panel-info mainSection">
+    <div class="col-sm-5">
+      <div class="panel panel-info panelBody">
         <div class="panel-heading">
           <h4 class="panel-title">
                 Select Entity
@@ -108,8 +136,8 @@ <h4 class="panel-title">
           <table style="width:100%" id="tabDim">
             <tbody>
               <tr ng-repeat="dat in getKeys(selectedRow)" ng-mouseover="hoverIn()" ng-mouseleave="hoverOut()">
-                <th ng-if="!$last">{{dat}}</th>
-                <td ng-if="!$last">{{selectedRow[dat]}}</td>
+                <th ng-if="!$last" class="align-left">{{dat}}</th>
+                <td ng-if="!$last" class="wordwrap">{{selectedRow[dat]}}</td>
                 <td>
                   <button type="submit" name="dim" ng-show="hoverEdit" class="btn btn-warning btn-circle" ng-click="selectedDim(dat)">D</button>
                   <button type="submit" name="meas" ng-show="hoverEdit" class="btn btn-danger btn-circle" ng-click="selectedMeas(dat,selectedRow[dat])">M</button>
@@ -120,8 +148,8 @@ <h4 class="panel-title">
         </div>
       </div>
     </div>
-    <div class="col-sm-3 ">
-      <div class="panel panel-info mainSection">
+    <div class="col-sm-2 ">
+      <div class="panel panel-info panelBody">
         <div class="panel-heading">
           <h4 class="panel-title">
                 Dimensions  |   Measures
@@ -135,49 +163,59 @@ <h4 class="panel-title">
           <div class="tab-content">
             <div id="menu1" class="tab-pane fade in active">
               <h4>Dimensions</h4>
-              <form action="/dimensions/addDimension?form=dimension" method="post">
+              <form  name="addDimForm" ng-submit="submitDimension()" novalidate>
                 <div class="form-group">
                   <label for="displayname">Display Name</label>
-                  <input type="displayname" class="form-control" id="displayname" name="displayname" placeholder="Enter Display Name" ng-model="displayname">
+                  <input type="displayname" class="form-control" id="displayname" name="displayname" placeholder="Enter Display Name" ng-model="displayname" required>
+                  <span style="color:#990000" ng-show="addDimForm.displayname.$touched && addDimForm.displayname.$invalid">Display Name is required.</span>
                 </div>
                 <div class="form-group">
                   <label for="fieldname">Field name</label>
-                  <input type="fieldname" class="form-control" id="fieldname" name="fieldname" placeholder="Enter Field Name" ng-model="dimVal">
+                  <input type="fieldname" class="form-control" id="fieldname" name="fieldname" placeholder="Selected Field Name" ng-model="dimVal" readonly>
                 </div>
+                <button class="btn btn-success" type="submit">Save</button>
                 <!-- <button class="btn btn-success" ng-click="submitDimension()">Save</button> -->
               </form>
-              <button class="btn btn-success" ng-click="submitDimension()">Save</button>
+              <!-- <button class="btn btn-success" ng-click="submitDimension()">Save</button> -->
+              <div class="form-group has-error">
+                <label ng-show="displayDimError" class="control-label" for="inputError1">Display Name and Field Name should not match</label>
+              </div>
             </div>
             <div id="menu2" class="tab-pane fade">
               <h4>Measures</h4>
-              <form action="/measures/addMeasure?form=measure" method="post">
+              <form  name="addMeasForm" ng-submit="submitMeasure()" novalidate>
                 <div class="form-group">
                   <label for="displaymeasurename">Display Name</label>
-                  <input type="displaymeasurename" class="form-control" id="displaymeasurename" name="displaymeasurename" placeholder="Enter Display Name" ng-model="displaymeasurename">
+                  <input type="displaymeasurename" class="form-control" id="displaymeasurename" name="displaymeasurename" placeholder="Enter Display Name" ng-model="displaymeasurename" required>
+                  <span style="color:#990000" ng-show="addMeasForm.displaymeasurename.$touched && addMeasForm.displaymeasurename.$invalid">Display Name is required.</span>
                 </div>
                 <div class="form-group">
-                  <label for="radioField">
-                    <input type="radio" name="measure" id="radioField" ng-model="measure" value="radioField">Fieldname</label>
-                  <label for="radioEvent">
-                    <input type="radio" name="measure" id="radioEvent" ng-model="measure" value="radioEvent">Event</label>
+                  <label for="fieldMeasure">
+                    <input type="radio" name="measure" id="fieldMeasure" ng-model="measure" value="fieldMeasure">Fieldname</label>
+                  <label for="eventMeasure">
+                    <input type="radio" name="measure" id="eventMeasure" ng-model="measure" value="eventMeasure">Event</label>
                 </div>
-                <div class="form-group" id="radioFieldDiv" ng-show="measure=='radioField'">
+                <div class="form-group" id="radioFieldDiv" ng-show="measure=='fieldMeasure'">
                   <label for="fieldmeasurename">Fieldname</label>
-                  <select class="form-control" id="fieldmeasurename" name="measureFieldSelector" ng-model= "measureFieldSelector">
+                  <select class="form-control" id="fieldmeasurename" name="measureFieldSelector" ng-model="measureFieldSelector">
                     <option ng-repeat="dat in getKeys(selectedRow)" ng-if="!$last">{{dat}}</option>
                   </select>
                 </div>
-                <div class="form-group" id="radioEventDiv" ng-show="measure=='radioEvent'">
+                <div class="form-group" id="radioEventDiv" ng-show="measure=='eventMeasure'">
                   <h4>Selected Event</h4>
                   <label for="eventField">Selected Event Field</label>
-                  <input type="eventField" class="form-control" id="eventField" placeholder="Selected Event Field.." readonly name="measureEventSelector" ng-model="measField">
+                  <input type="eventField" class="form-control" id="eventField" placeholder="Selected Event Field" readonly name="measureEventSelector" ng-model="measField">
                   <label for="eventValue">Selected Event value</label>
-                  <input type="eventField" class="form-control" id="eventValue" placeholder="Selected Event Value.." readonly name="measureEventValueSelector" ng-model="measValue">
+                  <input type="eventField" class="form-control" id="eventValue" placeholder="Selected Event Value" readonly name="measureEventValueSelector" ng-model="measValue">
                 </div>
+
+                <button class="btn btn-success" type="submit">Save</button>
                 <!-- <button type="submit" class="btn btn-success">GO..</button> -->
               </form>
-              <button class="btn btn-success" ng-click="submitMeasure()">GO..</button>
-
+              <!-- <button class="btn btn-success" ng-click="submitMeasure()">GO..</button> -->
+              <div class="form-group has-error">
+                <label ng-show="displayMeasError" class="control-label" for="inputError1">Display Name and Field Name should not match</label>
+              </div>
             </div>
           </div>
         </div>
@@ -191,10 +229,12 @@ <h4 class="panel-title">
                 <a data-toggle="collapse"  href="#collapse1">Dimensions</a>
             </h4>
           </div>
-          <div id="collapse1" class="panel-collapse collapse in">
+          <div id="collapse1" class="panel-collapse collapse in" aria-expanded="true">
             <div class="panel-body">
               <ul id="dimList" class="list-group">
-                <li ng-repeat="dim in dimensionList" class="list-group-item list-group-item-info">{{dim}}</li>
+                <li ng-repeat="dim in dimensionList" class="list-group-item list-group-item-info">{{dim}}
+                  <button class="btn btn-danger btn-circle" ng-click="deleteDimension(dim)" ><span class="glyphicon glyphicon-trash"></span></button>
+                </li>
               </ul>
             </div>
           </div>
@@ -206,10 +246,12 @@ <h4 class="panel-title">
                 <a data-toggle="collapse"  href="#collapse2">Measures</a>
             </h4>
           </div>
-          <div id="collapse2" class="panel-collapse collapse">
+          <div id="collapse2" class="panel-collapse collapse in" aria-expanded="true">
             <div class="panel-body">
               <ul id="measList1" class="list-group">
-                <li ng-repeat="m in measureList" class="list-group-item list-group-item-info">{{m}}</li>
+                <li ng-repeat="m in measureList" class="list-group-item list-group-item-info">{{m}}
+                  <button class="btn btn-danger btn-circle" ng-click="deleteMeasure(m)"><span class="glyphicon glyphicon-trash"></span></button>
+                </li>
               </ul>
             </div>
           </div>
diff --git a/public/views/realTimeLogs/defineData/defineData1.html b/public/views/realTimeLogs/defineData/defineData1.html
deleted file mode 100644
index 9c78267..0000000
--- a/public/views/realTimeLogs/defineData/defineData1.html
+++ /dev/null
@@ -1,73 +0,0 @@
-  <div class="well">
-    inside define data
-  </div>
-  <div class="page-header">
-    <h2><small> Listing of all requests based on different paths </small></h2>
-  </div>
-
-  <!-- **Displaying all paths **********************************************************  -->
-
-  <div class="logcontainer" >
-    <img class="LogProgressIcon" ng-show="showLogProgress" src="svg/cube.svg" alt="progress">
-    <table ng-hide="showLogProgress">
-      <tr>
-        <td>
-          <button ng-class = "{btn: true,'withBorder': (view == 'All'), 'btn-default': true , 'OnMouseEnter':hover} "ng-click = 'pathClickEvent("All")' class = "logButtonStyle nginxButton" ng-mouseenter = "hover = true" ng-mouseleave = "hover = false">
-              Most Visited Paths
-          </button>
-        </td>
-      </tr>
-      <tr ng-repeat="obj in Path_Count">
-        <td>
-          <button ng-click= 'pathClickEvent(obj)' class = "logButtonStyle nginxButton" ng-class = "{btn: true, 'btn-default':true, 'withBorder': (obj.path == currentpath ), 'OnMouseEnter': hovered}" ng-mouseenter = "hovered = true" ng-mouseleave = "hovered = false" ng-cloak>
-              {{obj.path}}
-                <span ng-cloak>
-                   ({{obj.count}})
-                </span>
-          </button>
-        </td>
-      </tr>
-    </table>
-  </div>
-
-  <!-- **Displaying data for selected path *************************************************  -->
-
-  <div class="PathDataTable" >
-    <img class="LogProgressIcon" ng-show="showLogDataProgress" src="svg/cube.svg" alt="progress">
-    <table ng-hide="showLogDataProgress">
-      <tr ng-model = "clickedPath[0]" class="logListingDataHeadings">
-
-        <td >AGENT  </td>
-        <td >  CODE   </td>
-        <td >METHOD </td>
-        <td ng-if="(view =='All')" > PATH  </td>
-        <td > REFERER </td>
-        <td > REMOTE   </td>
-        <td >SIZE    </td>
-        <td> TIME    </td>
-     </tr>
-
-      <tr ng-repeat = "obj in clickedPath" ng-cloak>
-        <td title = {{obj.agent}}> <abbr> {{ obj.agent | agentFilter }} </abbr>   </td>
-        <td > {{ obj.code}}   </td>
-        <td > {{ obj.method}}   </td>
-        <td ng-if="(view =='All')" > {{ obj.path}}   </td>
-        <td > {{ obj.referer}}   </td>
-        <td > {{ obj.remote}}   </td>
-        <td > {{ obj.size | sizeFilter }}   </td>
-        <td> {{ obj.time | date : 'd-MMMM-yyyy HH:mm:ss'}}    </td>
-      </tr>
-
-    </table>
-
-    <!-- Pagenation ************************************************************************ -->
-
-    <div ng-hide="showLogDataProgress">
-      <span ng-if = "(no_of_pgs > 1)" ng-repeat = "pg in getPgs(no_of_pgs) track by $index">
-         <button  class = "pageno" ng-class = "{'currentpage': ( currentpage == ($index+1) )}" ng-click = 'pagenoClickEvent(($index+1))' ng-cloak>
-           {{ $index+1 }}
-         </button>
-      </span>
-    </div>
-
-  </div>
diff --git a/public/views/realTimeLogs/defineData/defineData2.html b/public/views/realTimeLogs/defineData/defineData2.html
deleted file mode 100644
index cd91692..0000000
--- a/public/views/realTimeLogs/defineData/defineData2.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<div class="container" style="margin-top:100px">
-  <div class="row">
-    <div class="col-sm-3">
-      <div class="panel panel-info mainSection">
-        <div class="panel-heading">
-          <div class="row">
-            <div class="col-sm-10">
-              <h4 class="panel-title">Namespace
-                  </h4>
-            </div>
-            <div class="col-sm-2">
-              <a data-toggle="modal" data-target="#myModal">
-                <i class="glyphicon glyphicon-plus"></i>
-              </a>
-            </div>
-          </div>
-          <!-- <button type="button" class="btn btn-blue" data-toggle="modal" data-target="#myModal"><span class="glyphicon glyphicon-align-plus" aria-hidden="true"></span></button> -->
-        </div>
-        <div class="panel-body">
-          <!-- <button type="button" class="btn btn-blue" data-toggle="modal" data-target="#myModal">Create new namespace</button> -->
-          <!-- Modal -->
-          <div class="modal fade" id="myModal" role="dialog">
-            <div class="modal-dialog">
-
-              <!-- Modal content-->
-              <div class="modal-content">
-                <div class="modal-header">
-                  <button type="button" class="close" data-dismiss="modal">&times;</button>
-                  <h4 class="modal-title">Create new namespace</h4>
-                </div>
-                <div class="modal-body">
-                  <!-- enctype="multipart/form-data" -->
-                  <form action="/logdata?form=namespace" method="post" enctype="multipart/form-data">
-                    <div class="form-group">
-                      <label for="namespace">Namespace</label>
-                      <input type="name" class="form-control" id="namespace" name="namespace" placeholder="Enter namespace">
-                    </div>
-                    <div class="form-group">
-                      <label for="desc">Description</label>
-                      <textarea class="form-control" rows="3" placeholder="Enter description" name="desc" id="desc"></textarea>
-                    </div>
-                    <div class="form-group">
-                      <label for="exampleInputFile">File input</label>
-                      <input type="file" id="exampleInputFile" required accept=".json" name="file">
-                      <p class="help-block">Upload your log file here.</p>
-                    </div>
-                    <button type="submit" class="btn btn-success">Submit</button>
-                    <!-- <button ng-click="" class="btn btn-success">Submit</button> -->
-                  </form>
-                </div>
-                <div class="modal-footer">
-                  <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div style="overflow:scroll;">
-            <table id="tabLog" class="hoverTable">
-              <thead>
-                <tr>
-                  <th ng-repeat="header in cols">{{header}}</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr ng-repeat="row in logdataList" ng-click="rowSelected(row)">
-                  <td ng-if="!$last" ng-repeat="dat in getKeys(row)">{{row[dat]}}</td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="col-sm-4">
-      <div class="panel panel-info mainSection">
-        <div class="panel-heading">
-          <h4 class="panel-title">
-                Select Entity
-              </h4>
-        </div>
-        <div class="panel-body">
-          <table style="width:100%" id="tabDim">
-            <tbody>
-              <tr ng-repeat="dat in getKeys(selectedRow)" ng-mouseover="hoverIn()" ng-mouseleave="hoverOut()">
-                <th ng-if="!$last">{{dat}}</th>
-                <td ng-if="!$last">{{selectedRow[dat]}}</td>
-                <td>
-                  <button type="submit" name="dim" ng-show="hoverEdit" class="btn btn-warning btn-circle" ng-click="selectedDim(dat)">D</button>
-                  <button type="submit" name="meas" ng-show="hoverEdit" class="btn btn-danger btn-circle" ng-click="selectedMeas(dat,selectedRow[dat])">M</button>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-    <div class="col-sm-3 ">
-      <div class="panel panel-info mainSection">
-        <div class="panel-heading">
-          <h4 class="panel-title">
-                Dimensions  |   Measures
-              </h4>
-        </div>
-        <div class="panel-body">
-          <ul class="nav nav-tabs">
-            <li class="active"><a data-toggle="tab" href="#menu1">Dimensions</a></li>
-            <li><a data-toggle="tab" href="#menu2">Measures</a></li>
-          </ul>
-          <div class="tab-content">
-            <div id="menu1" class="tab-pane fade in active">
-              <h4>Dimensions</h4>
-              <form action="/dimensions/addDimension?form=dimension" method="post">
-                <div class="form-group">
-                  <label for="displayname">Display Name</label>
-                  <input type="displayname" class="form-control" id="displayname" name="displayname" placeholder="Enter Display Name">
-                </div>
-                <div class="form-group">
-                  <label for="fieldname">Field name</label>
-                  <input type="fieldname" class="form-control" id="fieldname" name="fieldname" placeholder="Enter Field Name" ng-model="dimVal">
-                </div>
-                <button type="submit" class="btn btn-success">Save</button>
-              </form>
-            </div>
-            <div id="menu2" class="tab-pane fade">
-              <h4>Measures</h4>
-              <form action="/measures/addMeasure?form=measure" method="post">
-                <div class="form-group">
-                  <label for="displaymeasurename">Display Name</label>
-                  <input type="displaymeasurename" class="form-control" id="displaymeasurename" name="displaymeasurename" placeholder="Enter Display Name">
-                </div>
-                <div class="form-group">
-                  <label for="radioField">
-                    <input type="radio" name="measure" id="radioField" ng-model="measure" value="radioField">Fieldname</label>
-                  <label for="radioEvent">
-                    <input type="radio" name="measure" id="radioEvent" ng-model="measure" value="radioEvent">Event</label>
-                </div>
-                <div class="form-group" id="radioFieldDiv" ng-show="measure=='radioField'">
-                  <label for="fieldmeasurename">Fieldname</label>
-                  <select class="form-control" id="fieldmeasurename" name="measureFieldSelector">
-                    <option ng-repeat="dat in getKeys(selectedRow)" ng-if="!$last">{{dat}}</option>
-                  </select>
-                </div>
-                <div class="form-group" id="radioEventDiv" ng-show="measure=='radioEvent'">
-                  <h4>Selected Event</h4>
-                  <label for="eventField">Selected Event Field</label>
-                  <input type="eventField" class="form-control" id="eventField" placeholder="Selected Event Field.." readonly name="measureEventSelector" ng-model="measField">
-                  <label for="eventValue">Selected Event value</label>
-                  <input type="eventField" class="form-control" id="eventValue" placeholder="Selected Event Value.." readonly name="measureEventValueSelector" ng-model="measValue">
-                </div>
-                <button type="submit" class="btn btn-success">GO..</button>
-              </form>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="col-sm-2">
-      <div class="panel-group" id="accordion">
-        <div class="panel panel-info">
-          <div class="panel-heading">
-            <h4 class="panel-title">
-                <a data-toggle="collapse"  href="#collapse1">Dimensions</a>
-            </h4>
-          </div>
-          <div id="collapse1" class="panel-collapse collapse in">
-            <div class="panel-body">
-              <ul id="dimList" class="list-group">
-                <li ng-repeat="dim in dimensionList" class="list-group-item list-group-item-info">{{dim}}</li>
-              </ul>
-            </div>
-          </div>
-        </div>
-
-        <div class="panel panel-info">
-          <div class="panel-heading">
-            <h4 class="panel-title">
-                <a data-toggle="collapse"  href="#collapse2">Measures</a>
-            </h4>
-          </div>
-          <div id="collapse2" class="panel-collapse collapse">
-            <div class="panel-body">
-              <ul id="measList1" class="list-group">
-                <li ng-repeat="m in measureList" class="list-group-item list-group-item-info">{{m}}</li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/public/views/realTimeLogs/queryBuilder/liveQueryWizard.html b/public/views/realTimeLogs/queryBuilder/liveQueryWizard.html
index 7341d43..8e77ccc 100644
--- a/public/views/realTimeLogs/queryBuilder/liveQueryWizard.html
+++ b/public/views/realTimeLogs/queryBuilder/liveQueryWizard.html
@@ -1,7 +1,10 @@
 <link href="./../../../stylesheets/simple-sidebar.css" rel="stylesheet">
 <link href="./../../../stylesheets/queryBuilder/queryBuilder.css" rel="stylesheet">
 
-    <div id="wrapper" ng-controller="liveQueryController">
+
+
+
+<div id="wrapper" ng-controller="liveQueryController">
         <!-- Sidebar -->
         <div id="sidebar-wrapper">
             <ul class="sidebar-nav nav nav-pills nav-stacked" id="stacked-menu">
@@ -10,127 +13,96 @@
                 <li class="sidebar-brand fa fa-th"> Widget wizard</li>
                 <li>
                     <!-- home item in menu started-->
-                    <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#dimensions">
-                        <i class="fa fa-circle-o"></i> Dimensions
-                    </a>
-                    <ul class="nav nav-pills nav-stacked collapse out" id="dimensions">
-                        <!-- submenu started-->
-                        <li ng-repeat="dimension in gitDashboardConfigData.dimensions" data-toggle="collapse ">
-                            <a dnd-type="allowedTypes.primaryFieldType[0]" dnd-draggable="dimension" dnd-effect-allowed="copy" class="active" class="nav-container" data-toggle="collapse" data-parent="#dimensions" href={{makeIdWithHref(dimension.name)}}>
-                                <i class="fa fa-caret-right"></i> {{dimension.displayName}}
-                            </a>
-                            <!-- start #measures.nav nav-pills nav-stacked collapse out -->
-                            <ul class="nav nav-pills nav-stacked collapse out" id={{makeId(dimension.name)}} >
-                                <li dnd-type="allowedTypes.primaryFieldType[0]" ng-repeat="dimensionValue in dimension.values" dnd-draggable="dimensionValue" dnd-effect-allowed="copy"  class="active" data-parent={{makeId(dimension.name)}} >
-                          {{dimensionValue.value}}
-                        </li>
-                            </ul>
-                            <!-- end #measures.nav nav-pills nav-stacked collapse out -->
-                        </li>
-                    </ul>
-                    <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#aggregators">
-                        <i class="fa fa-circle-o"></i> Aggregators
-                    </a>
-                    <ul class="nav nav-pills nav-stacked collapse out" id="aggregators">
-                        <!-- submenu started-->
-                        <li ng-repeat="aggregator in gitDashboardConfigData.aggregators" data-toggle="collapse" >
-                            <a style="padding-left:40px;" data-parent="#aggregators" ng-attr-href="{{'#aggregator'+ $index}}" data-drop="true" dnd-draggable="aggregator" dnd-effect-allowed="copy"  class="active" dnd-type="allowedTypes.aggregatorType[0]" dnd-dragend='aggregatorHandler({"arrayName":"aggregatorArray", "index":$index, "fieldToMatch":"displayName"}, event,aggregator)'>
-                        {{aggregator.displayName}}
-                      </a>
-                        </li>
-                    </ul>
-                    <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#measures">
-                        <i class="fa fa-circle-o"></i> Measures
+
+                    <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#dimensions" ng-click="getRows()" >
+                        <i class="fa fa-circle-o"></i> NameSpace
                     </a>
-                    <ul class="nav nav-pills nav-stacked collapse out" id="measures">
+                    <ul class="nav nav-pills nav-stacked collapse out" id="dimensions" style="list-style-type:square">
                         <!-- submenu started-->
-                        <li ng-repeat="measure in gitDashboardConfigData.measures" data-toggle="collapse">
-                            <a style="padding-left:40px;" dnd-draggable="measure" dnd-effect-allowed="copy"  class="active"
-                     dnd-type="allowedTypes.measureType[0]" dnd-dragend='removeDuplicate({"arrayName":"measureArray", "index":$index, "fieldToMatch":"displayName"}, event)'>
-                      {{measure.displayName}}
-                    </a>
-                        </li>
+
+                        <li ng-repeat="dim in nameSpaceList" class="list-group-item list-group-item-info namespaceliststyle" data-toggle="collapse" ng-click="getDimensionAndMeasure(dim._id)" id="{{dim._id}}"    >{{dim.name}}</li>
                     </ul>
+
+
                 </li>
             </ul>
         </div>
         <!-- /#sidebar-wrapper -->
         <!-- start #liveQueryWizardForm -->
-        <div id="liveQueryWizard">
-            <div class="container">
-                <!-- start .row -->
-                <div class="row liveQueryWizardRow">
-                    <div class="col-lg-6 widcheck">
-                  <!-- query builder starts -->
-                  <div class="container">
-             <h1>Angular.js Query Builder</h1>
-
-        <div class="alert alert-info">
-            <strong>Example Output</strong><br>
-            <span ng-bind-html="output"> </span>
-            <br>
-            <br>
-            <span ng-bind-html="jsonOutput"> </span>
-        </div>
+    <br>
+        <h1> <center>Query on the Go!</center></h1>
 
-        <div class="alert alert-warning alert-group">
-        <div class="form-inline">
-            <label>&nbsp;&nbsp;Select&nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="select1" class="form-control input-sm" size="100"/>
 
-            <label>&nbsp;&nbsp;Stream&nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="stream" class="form-control input-sm" s/>
 
+          <div class="container salert alert-info">
+              <strong>Json Output</strong><br>
+              <span ng-bind-html="output2"> </span>
+              <br>
 
-        </div>
-            </div>
+              <p ng-bind-html="trustedHtml"> </p>
+          </div>
 
-        <query-builder group="filter.group"></query-builder>
 
-    </div>
 
-    <script type="text/ng-template" id="/queryBuilderDirective.html">
-    <div class="alert alert-warning alert-group">
-        <div class="form-inline ">
-            <select ng-options="o.name as o.name for o in operators" ng-model="group.operator" class="form-control input-sm"></select>
-            <button style="margin-left: 5px" ng-click="addCondition()" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-plus-sign"></span> Add Condition</button>
-            <button style="margin-left: 5px" ng-click="addGroup()" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-plus-sign"></span> Add Group</button>
-            <button style="margin-left: 5px" ng-click="removeGroup()" class="btn btn-sm btn-danger"><span class="glyphicon glyphicon-minus-sign"></span> Remove Group</button>
-            <button style="margin-left: 5px" ng-click="submitQuery()" class="btn btn-sm btn-primary"><span class="glyphicon glyphicon-tick-sign"></span>SubmitQuery</button>
+          <div class="alert alert-warning alert-group">
+          <div class="form-inline">
 
-        <form action='/exp/save' method='POST' id='livequeryform'>
-        <input type='hidden' name='query' value="hello">
-        <input type='submit' class="btn btn-sm btn-success" value='submit'><span class="glyphicon glyphicon-tick-sign"></span>
-         </form>
+              <label>&nbsp;&nbsp;Select&nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="select1" class="form-control input-sm" size="60"/>
 
-        </div>
-        <div class="group-conditions">
-            <div ng-repeat="rule in group.rules | orderBy:'index'" class="condition">
-                <div ng-switch="rule.hasOwnProperty('group')">
-                    <div ng-switch-when="true">
-                        <query-builder group="rule.group"></query-builder>
-                    </div>
-                    <div ng-switch-default="ng-switch-default">
-                        <div class="form-inline">
-                          <label> Aggregate fn &nbsp;&nbsp;&nbsp; </label>  <select ng-options="t.name as t.name for t in fields" ng-model="rule.field" class="form-control input-sm"></select>
-                            <label>&nbsp;&nbsp;Measures&nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="rule.data" class="form-control input-sm"/>
-                            <label> &nbsp;&nbsp;Accumulator fn&nbsp;&nbsp;&nbsp;</label>
-                            <select ng-options="a.name as a.name for a in accumulators" style="margin-left: 5px"  ng-model="rule.accumulator" class="form-control input-sm"></select>
-
-                          <label>&nbsp;&nbsp;Value&nbsp;&nbsp;&nbsp;</label>  <input style="margin-left: 5px" type="text" ng-model="rule.value" class="form-control input-sm"/>
-                            <button style="margin-left: 5px" ng-click="removeCondition($index)" class="btn btn-sm btn-danger"><span class="glyphicon glyphicon-minus-sign"></span></button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    </script>
+              <label>&nbsp;&nbsp;Stream From &nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="stream" class="form-control input-sm" s/>
+
+
+              <label>&nbsp;&nbsp;Stream To &nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="streamB" class="form-control input-sm" s/>
+
+              <br>
+              <br>
+
+              <p> &nbsp;&nbsp; WHERE </p>
+              <label> Aggregate fn &nbsp;&nbsp;&nbsp; </label>  <select ng-model="selectedAggFn1" ng-options="item for item in aggfn"  class="form-control input-sm"></select>
+
+
+          <label>&nbsp;&nbsp;Measures&nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="measure1" class="form-control input-sm"/>
+
+              <label> &nbsp;&nbsp;Accumulator fn&nbsp;&nbsp;&nbsp;</label>
+
+              <select ng-model="selectedAccumFn1" ng-options="item for item in accumfn"  class="form-control input-sm"></select>
+
+
+              <label>&nbsp;&nbsp;Value&nbsp;&nbsp;&nbsp;</label>  <input style="margin-left: 5px" type="text" ng-model="value1" class="form-control input-sm"/>
+
+              <br>
+              <br>
+              <div id="operator">
+              <label> Operator&nbsp;&nbsp;&nbsp;</label>
+              <select ng-model="selectedOperators" ng-options="item for item in operators"  class="form-control input-sm"></select>
+                  </div>
+              <br>
+              <br>
+
+              <label> Aggregate fn &nbsp;&nbsp;&nbsp; </label>  <select ng-model="selectedAggFn2" ng-options="item for item in aggfn"  class="form-control input-sm"></select>
+
+              <label>&nbsp;&nbsp;Measures&nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="measure2" class="form-control input-sm"/>
+
+              <label> &nbsp;&nbsp;Accumulator fn&nbsp;&nbsp;&nbsp;</label>
+
+              <select ng-model="selectedAccumFn2" ng-options="item for item in accumfn"  class="form-control input-sm"></select>
+
+              <label>&nbsp;&nbsp;Value&nbsp;&nbsp;&nbsp;</label>  <input style="margin-left: 5px" type="text" ng-model="value2" class="form-control input-sm"/>
+
+                <br>
+              <br>
+              <br>
+              <button style="margin-left: 5px" ng-click="submitQuery()" class="btn btn-sm btn-primary"><span class="glyphicon glyphicon-tick-sign"></span>Submit Query</button>
+
+              <button style="margin-left: 5px" ng-click="computeJson()" class="btn btn-sm btn-primary"><span class="glyphicon glyphicon-tick-sign"></span>Compute Json</button>
+
+
+          </div>
+              </div>
+
+          <query-builder group="filter.group"></query-builder>
+
+      </div>
 
-                </div>
-            </div>
-            <!-- end .row -->
-        </div>
-        <!-- end .container-fluid -->
-    </div>
-    <!-- end #liveQueryWizardForm -->
 </div>
 <!-- /#page-content-wrapper -->
diff --git a/public/views/realTimeLogs/queryBuilder/liveQueryWizard.html.orig b/public/views/realTimeLogs/queryBuilder/liveQueryWizard.html.orig
new file mode 100644
index 0000000..7341d43
--- /dev/null
+++ b/public/views/realTimeLogs/queryBuilder/liveQueryWizard.html.orig
@@ -0,0 +1,136 @@
+<link href="./../../../stylesheets/simple-sidebar.css" rel="stylesheet">
+<link href="./../../../stylesheets/queryBuilder/queryBuilder.css" rel="stylesheet">
+
+    <div id="wrapper" ng-controller="liveQueryController">
+        <!-- Sidebar -->
+        <div id="sidebar-wrapper">
+            <ul class="sidebar-nav nav nav-pills nav-stacked" id="stacked-menu">
+              <span class="sidebar-secondLink"><li><a href="#GitLogStatistics">
+                <li class="sidebar-brand fa fa-th">  Plot wizard</li></a></li></span>
+                <li class="sidebar-brand fa fa-th"> Widget wizard</li>
+                <li>
+                    <!-- home item in menu started-->
+                    <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#dimensions">
+                        <i class="fa fa-circle-o"></i> Dimensions
+                    </a>
+                    <ul class="nav nav-pills nav-stacked collapse out" id="dimensions">
+                        <!-- submenu started-->
+                        <li ng-repeat="dimension in gitDashboardConfigData.dimensions" data-toggle="collapse ">
+                            <a dnd-type="allowedTypes.primaryFieldType[0]" dnd-draggable="dimension" dnd-effect-allowed="copy" class="active" class="nav-container" data-toggle="collapse" data-parent="#dimensions" href={{makeIdWithHref(dimension.name)}}>
+                                <i class="fa fa-caret-right"></i> {{dimension.displayName}}
+                            </a>
+                            <!-- start #measures.nav nav-pills nav-stacked collapse out -->
+                            <ul class="nav nav-pills nav-stacked collapse out" id={{makeId(dimension.name)}} >
+                                <li dnd-type="allowedTypes.primaryFieldType[0]" ng-repeat="dimensionValue in dimension.values" dnd-draggable="dimensionValue" dnd-effect-allowed="copy"  class="active" data-parent={{makeId(dimension.name)}} >
+                          {{dimensionValue.value}}
+                        </li>
+                            </ul>
+                            <!-- end #measures.nav nav-pills nav-stacked collapse out -->
+                        </li>
+                    </ul>
+                    <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#aggregators">
+                        <i class="fa fa-circle-o"></i> Aggregators
+                    </a>
+                    <ul class="nav nav-pills nav-stacked collapse out" id="aggregators">
+                        <!-- submenu started-->
+                        <li ng-repeat="aggregator in gitDashboardConfigData.aggregators" data-toggle="collapse" >
+                            <a style="padding-left:40px;" data-parent="#aggregators" ng-attr-href="{{'#aggregator'+ $index}}" data-drop="true" dnd-draggable="aggregator" dnd-effect-allowed="copy"  class="active" dnd-type="allowedTypes.aggregatorType[0]" dnd-dragend='aggregatorHandler({"arrayName":"aggregatorArray", "index":$index, "fieldToMatch":"displayName"}, event,aggregator)'>
+                        {{aggregator.displayName}}
+                      </a>
+                        </li>
+                    </ul>
+                    <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#measures">
+                        <i class="fa fa-circle-o"></i> Measures
+                    </a>
+                    <ul class="nav nav-pills nav-stacked collapse out" id="measures">
+                        <!-- submenu started-->
+                        <li ng-repeat="measure in gitDashboardConfigData.measures" data-toggle="collapse">
+                            <a style="padding-left:40px;" dnd-draggable="measure" dnd-effect-allowed="copy"  class="active"
+                     dnd-type="allowedTypes.measureType[0]" dnd-dragend='removeDuplicate({"arrayName":"measureArray", "index":$index, "fieldToMatch":"displayName"}, event)'>
+                      {{measure.displayName}}
+                    </a>
+                        </li>
+                    </ul>
+                </li>
+            </ul>
+        </div>
+        <!-- /#sidebar-wrapper -->
+        <!-- start #liveQueryWizardForm -->
+        <div id="liveQueryWizard">
+            <div class="container">
+                <!-- start .row -->
+                <div class="row liveQueryWizardRow">
+                    <div class="col-lg-6 widcheck">
+                  <!-- query builder starts -->
+                  <div class="container">
+             <h1>Angular.js Query Builder</h1>
+
+        <div class="alert alert-info">
+            <strong>Example Output</strong><br>
+            <span ng-bind-html="output"> </span>
+            <br>
+            <br>
+            <span ng-bind-html="jsonOutput"> </span>
+        </div>
+
+        <div class="alert alert-warning alert-group">
+        <div class="form-inline">
+            <label>&nbsp;&nbsp;Select&nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="select1" class="form-control input-sm" size="100"/>
+
+            <label>&nbsp;&nbsp;Stream&nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="stream" class="form-control input-sm" s/>
+
+
+        </div>
+            </div>
+
+        <query-builder group="filter.group"></query-builder>
+
+    </div>
+
+    <script type="text/ng-template" id="/queryBuilderDirective.html">
+    <div class="alert alert-warning alert-group">
+        <div class="form-inline ">
+            <select ng-options="o.name as o.name for o in operators" ng-model="group.operator" class="form-control input-sm"></select>
+            <button style="margin-left: 5px" ng-click="addCondition()" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-plus-sign"></span> Add Condition</button>
+            <button style="margin-left: 5px" ng-click="addGroup()" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-plus-sign"></span> Add Group</button>
+            <button style="margin-left: 5px" ng-click="removeGroup()" class="btn btn-sm btn-danger"><span class="glyphicon glyphicon-minus-sign"></span> Remove Group</button>
+            <button style="margin-left: 5px" ng-click="submitQuery()" class="btn btn-sm btn-primary"><span class="glyphicon glyphicon-tick-sign"></span>SubmitQuery</button>
+
+        <form action='/exp/save' method='POST' id='livequeryform'>
+        <input type='hidden' name='query' value="hello">
+        <input type='submit' class="btn btn-sm btn-success" value='submit'><span class="glyphicon glyphicon-tick-sign"></span>
+         </form>
+
+        </div>
+        <div class="group-conditions">
+            <div ng-repeat="rule in group.rules | orderBy:'index'" class="condition">
+                <div ng-switch="rule.hasOwnProperty('group')">
+                    <div ng-switch-when="true">
+                        <query-builder group="rule.group"></query-builder>
+                    </div>
+                    <div ng-switch-default="ng-switch-default">
+                        <div class="form-inline">
+                          <label> Aggregate fn &nbsp;&nbsp;&nbsp; </label>  <select ng-options="t.name as t.name for t in fields" ng-model="rule.field" class="form-control input-sm"></select>
+                            <label>&nbsp;&nbsp;Measures&nbsp;&nbsp;&nbsp;</label><input style="margin-left: 5px" type="text" ng-model="rule.data" class="form-control input-sm"/>
+                            <label> &nbsp;&nbsp;Accumulator fn&nbsp;&nbsp;&nbsp;</label>
+                            <select ng-options="a.name as a.name for a in accumulators" style="margin-left: 5px"  ng-model="rule.accumulator" class="form-control input-sm"></select>
+
+                          <label>&nbsp;&nbsp;Value&nbsp;&nbsp;&nbsp;</label>  <input style="margin-left: 5px" type="text" ng-model="rule.value" class="form-control input-sm"/>
+                            <button style="margin-left: 5px" ng-click="removeCondition($index)" class="btn btn-sm btn-danger"><span class="glyphicon glyphicon-minus-sign"></span></button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    </script>
+
+                </div>
+            </div>
+            <!-- end .row -->
+        </div>
+        <!-- end .container-fluid -->
+    </div>
+    <!-- end #liveQueryWizardForm -->
+</div>
+<!-- /#page-content-wrapper -->
diff --git a/public/views/realTimeLogs/rtwizard/rtwizard.html b/public/views/realTimeLogs/rtwizard/rtwizard.html
index c386332..031b068 100644
--- a/public/views/realTimeLogs/rtwizard/rtwizard.html
+++ b/public/views/realTimeLogs/rtwizard/rtwizard.html
@@ -1,13 +1,11 @@
 <link href="./../../../stylesheets/simple-sidebar.css" rel="stylesheet">
 
-<!-- wave 4 code  -->
-<link href="./../../../stylesheets/rt-table.css" rel="stylesheet">
-<!--  wave 4 end -->
-
 <!-- wave4 style sheet for table  -->
-<div id="wrapper" ng-controller="myController">
 
-    <!-- Sidebar -->
+<!-- <div id="wrapper" ng-controller="myController"> -->
+  <div id="wrapper" ng-controller="rtcontroller">
+
+    <!-- Sidebar
     <div id="sidebar-wrapper">
         <ul class="sidebar-nav nav nav-pills nav-stacked" id="stacked-menu">
             <span class="sidebar-secondLink">
@@ -21,26 +19,26 @@
         <li class="sidebar-brand fa fa-th">
             Widget wizard</li>
         <li>
-            <!-- home item in menu started-->
+
             <a class="nav-container" data-toggle="collapse" data-parent="#stacked-menu" href="#dimensions">
                 <i class="fa fa-circle-o"></i>
                 Dimensions
             </a>
 
             <ul class="nav nav-pills nav-stacked collapse out" id="dimensions">
-                <!-- submenu started-->
+
                 <li ng-repeat="dimension in gitDashboardConfigData.dimensions" data-toggle="collapse ">
                     <a dnd-type="allowedTypes.primaryFieldType[0]" dnd-draggable="dimension" dnd-effect-allowed="copy" class="active" class="nav-container" data-toggle="collapse" data-parent="#dimensions" href={{makeIdWithHref(dimension.name)}}>
                         <i class="fa fa-caret-right"></i>
                         {{dimension.displayName}}
                     </a>
-                    <!-- start #measures.nav nav-pills nav-stacked collapse out -->
+
                     <ul class="nav nav-pills nav-stacked collapse out" id={{makeId(dimension.name)}}>
                         <li dnd-type="allowedTypes.primaryFieldType[0]" ng-repeat="dimensionValue in dimension.values" dnd-draggable="dimensionValue" dnd-effect-allowed="copy" class="active" data-parent={{makeId(dimension.name)}}>
                             {{dimensionValue.value}}
                         </li>
                     </ul>
-                    <!-- end #measures.nav nav-pills nav-stacked collapse out -->
+
                 </li>
             </ul>
 
@@ -49,7 +47,7 @@
                 Aggregators
             </a>
             <ul class="nav nav-pills nav-stacked collapse out" id="aggregators">
-                <!-- submenu started-->
+
                 <li ng-repeat="aggregator in gitDashboardConfigData.aggregators" data-toggle="collapse">
                     <a
                         style="padding-left:40px;"
@@ -70,7 +68,7 @@
                 Measures
             </a>
             <ul class="nav nav-pills nav-stacked collapse out" id="measures">
-                <!-- submenu started-->
+
                 <li ng-repeat="measure in gitDashboardConfigData.measures" data-toggle="collapse">
                     <a style="padding-left:40px;" dnd-draggable="measure" dnd-effect-allowed="copy" class="active" dnd-type="allowedTypes.measureType[0]" dnd-dragend='removeDuplicate({"arrayName":"measureArray", "index":$index, "fieldToMatch":"displayName"}, event)'>
                         {{measure.displayName}}
@@ -80,54 +78,23 @@
         </li>
     </ul>
 </div>
-
-
-<!-- /#sidebar-wrapper -->
-
+-->
                     <!--  wave4 code start here -->
-                    <div>
-                      <p>
-                        rt wizard code goes here
-                      </p>
-                      <table class="table table-hover" style="margin-top:50px">
-
-                        <thead> <!-- Bootstrap table -->
-
-                          <tr>
-                            <th>Remote</th>
-                            <th>Host</th>
-                            <th>User</th>
-                            <th>Method</th>
-                            <th>Path</th>
-                            <th>Code</th>
-                            <th>Size</th>
-                            <th>Agent</th>
-                            <th>Time</th>
-                          </tr>
-
-                        </thead> <!-- Bootstrap -->
-
-                        <tbody>  <!-- Bootstrap -->
-
-                          <tr ng-repeat="data in todos">
-                            <td>{{data.remote}}</td>
-                            <td>{{data.host}}</td>
-                            <td>{{data.user}}</td>
-                            <td>{{data.method}}</td>
-                            <td>{{data.path}}</td>
-                            <td>{{data.code}}</td>
-                            <td>{{data.size}}</td>
-                            <td>{{data.agent}}</td>
-                            <td>{{data.time}}</td>
-                          </tr>
-
-                        </tbody> <!-- Bootstrap table-->
-
-                      </table>
-
-                    </div>
+<div>
+          <table class="table table-hover" style="margin-top:50px">
+              <thead>
+                  <tr>
+                      <th ng-repeat="header in key">{{header}}</th>
+                  </tr>
+              </thead>
+
+              <tbody>
+                  <tr ng-class="{'success':row.highlight}" ng-repeat="row in val | limitTo:25">
+                      <td ng-repeat="header in key">{{row[header]}}</td>
+                  </tr>
+              </tbody>
+          </table>
+      </div>
                     <!-- wave4 code end here -->
-
-
 </div>
 <!-- /#page-content-wrapper -->
diff --git a/routes/defineData/dimensions.js b/routes/defineData/dimensions.js
index 7c9bb11..5ed95dc 100644
--- a/routes/defineData/dimensions.js
+++ b/routes/defineData/dimensions.js
@@ -3,97 +3,70 @@ var dimensionRouter = express.Router();
 var mongoose = require('mongoose');
 var Namespace = require('../../models/dbConfig').namespaceModel;
 
-// var dimList = [{
-//   "dispName": "Path",
-//   "fieldName": "request"
-// }, {
-//   "dispName": "User",
-//   "fieldName": "username"
-// }, {
-//   "dispName": "Browser",
-//   "fieldName": "user_agent"
-// }, {
-//   "dispName": "Timestamp",
-//   "fieldName": "datetime"
-// }];
-//
-// dimensionRouter.get('/', function(req, res) {
-//   res.send(dimList);
-// });
 
-/* GET Dimensions */
-dimensionRouter.get('/', function(req, res) {
-  if (req.session.oid !== null) {
-    Namespace.findNamespace(req.session.oid, function(err, namespace) {
-      if (namespace != null) {
-        console.log("routes",namespace.dimensions);
-        res.send(namespace.dimensions);
-      }
-    });
-  }
-});
 
 /* POST Dimension */
 
 dimensionRouter.post('/addDimension', function(req, res) {
-  console.log("received  ********************* " +req.body)  ;
-  if (req.session.oid !== null) {
-    Namespace.findNamespace(req.session.oid, function(err, namespace) {
-      if (namespace != null) {
-        namespace.dimensions.push({
-          displayName: req.body.data.displayName,
-          fieldName: req.body.data.fieldname
-        });
-
-        namespace.save(function(err, namespace) {
-          console.log('namespace saved:', namespace);
-        });
-      }
-    });
-  }
+  Namespace.findNamespaceName(req.body.data.namespaceName, function(err, namespace) {
+    if (namespace != null) {
+      namespace.dimensions.push({
+        displayName: req.body.data.displayName,
+        fieldName: req.body.data.fieldname
+      });
+      namespace.save(function(err, namespace) {
+        console.log('namespace saved:', namespace);
+        // res.send(200).send();
+      });
+    }
+  });
+  //}
   res.send(req.body)
-  // res.redirect('/#/defineData');
 });
 
 /*delete*/
-dimensionRouter.post('/delete/:id', function(req, res) {
-  console.log("deleted value is", req.params.id);
-  if (req.session.oid !== null) {
-    Namespace.findByIdAndUpdate(req.session.oid, {
+dimensionRouter.post('/delete', function(req, res) {
+  console.log("deleted value is", req.body.data.dimName);
+  console.log(req.body.data.namespaceName);
+  var namespaceID;
+  Namespace.findNamespaceName(req.body.data.namespaceName, function(err, namespace) {
+    console.log(namespace);
+    namespaceID=namespace._id;
+    console.log(namespaceID);
+    Namespace.findByIdAndUpdate(namespaceID, {
       $pull: {
         dimensions: {
-          _id: req.params.id
+          displayName: req.body.data.dimName
         }
       }
     }, function(err) {
-      console.log(err);
+       if (err) {
+  return res.send(500).json(err);
+}
+console.log(err + "error");
+return res.send(200).send();
     });
-  }
-  res.redirect('/#/defineData');
-});
-/*update*/
-dimensionRouter.post('/update/:id', function(req, res) {
-  //console.log("updated value is", req.params.id);
-  if (req.session.oid !== null) {
+  });
+  // console.log(namespaceID);
+  // Namespace.findByIdAndUpdate(namespaceID, {
+  //   $pull: {
+  //     dimensions: {
+  //       displayName: req.body.data.dimName
+  //     }
+  //   }
+  // }, function(err) {
+  //   console.log(err);
+  // });
 
-    Namespace.update({
-      'dimensions._id': req.params.id
-    }, {
-      '$set': {
-        'dimensions.$.displayName': 'updated item2'
-      }
-    }, function(err, dimension) {
-      if (!err) {
-        console.log('updated dimension' + dimension);
-      } else {
-        console.log('error in update');
-      }
-    });
-  }
 
-
-  res.redirect('/');
+    // Namespace.findAndModify(req.body.data.namespaceName, {
+    //   $pull: {
+    //     dimensions: {
+    //       displayName: req.body.data.dimName
+    //     }
+    //   }
+    // }, function(err) {
+    //   console.log(err);
+    // });
 });
-
-
 module.exports = dimensionRouter;
diff --git a/routes/defineData/logdata.js b/routes/defineData/logdata.js
index a11619a..741ebbb 100644
--- a/routes/defineData/logdata.js
+++ b/routes/defineData/logdata.js
@@ -1,90 +1,5 @@
 var express = require('express');
 var router = express.Router();
-// var json = [{
-//     "host": "216.67.1.92",
-//     "rfc931": "-",
-//     "username": "-",
-//     "datetime": "[13/Aug/2006:07:01:53 -0700]",
-//     "request": "GET /index1.html HTTP/1.0",
-//     "statuscode": "200",
-//     "bytes": "431",
-//     "referrer": "http://www.google.com",
-//     "user_agent": "Mozilla/5.0",
-//     "cookies": "-"
-//   }, {
-//     "host": "216.67.1.93",
-//     "rfc931": "-",
-//     "username": "-",
-//     "datetime": "[14/Sep/2006:07:01:53 -0700]",
-//     "request": "GET /index.html HTTP/1.0",
-//     "statuscode": "404",
-//     "bytes": "431",
-//     "referrer": "http://www.google.com",
-//     "user_agent": "Mozilla/5.0",
-//     "cookies": "-"
-//   }, {
-//     "host": "216.67.1.95",
-//     "rfc931": "-",
-//     "username": "-",
-//     "datetime": "[13/Sep/2006:07:01:53 -0700]",
-//     "request": "GET /index2.html HTTP/1.0",
-//     "statuscode": "200",
-//     "bytes": "432",
-//     "referrer": "http://www.google.com",
-//     "user_agent": "Mozilla/5.0",
-//     "cookies": "-"
-//   }, {
-//     "host": "218.67.1.97",
-//     "rfc931": "-",
-//     "username": "-",
-//     "datetime": "[13/May/2006:07:01:53 -0700]",
-//     "request": "GET /index3.html HTTP/1.0",
-//     "statuscode": "200",
-//     "bytes": "431",
-//     "referrer": "http://www.google.com",
-//     "user_agent": "Mozilla/5.0",
-//     "cookies": "-"
-//   }, {
-//     "host": "217.67.1.91",
-//     "rfc931": "-",
-//     "username": "-",
-//     "datetime": "[13/Sep/2006:07:01:53 -0700]",
-//     "request": "GET /index.html HTTP/1.0",
-//     "statuscode": "200",
-//     "bytes": "431",
-//     "referrer": "http://www.google.com",
-//     "user_agent": "Mozilla/5.0",
-//     "cookies": "-"
-//   }, {
-//     "host": "216.67.2.91",
-//     "rfc931": "-",
-//     "username": "-",
-//     "datetime": "[13/Sep/2006:07:01:53 -0700]",
-//     "request": "GET /index.html HTTP/1.0",
-//     "statuscode": "200",
-//     "bytes": "431",
-//     "referrer": "http://www.google.com",
-//     "user_agent": "Google Chrome",
-//     "cookies": "-"
-//   },{
-//     "host": "216.67.2.95",
-//     "rfc931": "-",
-//     "username": "-",
-//     "datetime": "[13/Sep/2006:07:01:53 -0700]",
-//     "request": "GET /index.html HTTP/1.0",
-//     "statuscode": "200",
-//     "bytes": "431",
-//     "referrer": "http://www.google.com",
-//     "user_agent": "Google Chrome",
-//     "cookies": "-"
-//   }
-//
-// ];
-//
-// router.get('/', function(req, res){
-//
-//  res.send(json);
-//  });
 
 var formidable = require('formidable');
 var mongoose = require('mongoose');
@@ -92,59 +7,34 @@ var Namespace = require('../../models/dbConfig').namespaceModel;
 var fs = require('fs');
 
 
-
-/* GET log data */
-router.get('/', function(req, res) {
-  if (req.session.oid !== null) {
-    Namespace.findNamespace(req.session.oid, function(err, namespace) {
-      if (namespace != null) {
-        fs.readFile(namespace.filePath, 'utf8', function(err, data) {
-          if (err) {
-            return console.log(err);
-          }
-          var nameObj ={
-            namespaceName:namespace.name,
-            filedata:JSON.parse(data)
-          };
-          res.send(nameObj);
-        });
-      }
-    });
-  }
-});
-
 /* POST Namespace*/
 router.post('/', function(req, res) {
-  //creates a new incoming form.
-  var form = new formidable.IncomingForm();
-
-  // parse a file upload
-  form.parse(req, function(err, fields, files) {
-    var newPath;
-    fs.readFile(files.file.path, function(err, data) {
-      var filedata = data.toString();
-      fs.writeFile("public/upload/" + files.file.name, filedata, function(err) {
-        if (err) return console.log(err);
-        console.log("file written");
-      });
-    });
-
+  console.log(req.body.data);
     Namespace.create({
-      name: fields.namespace,
-      description: fields.desc,
+      name: req.body.data.name,
+      description: req.body.data.description,
       createdOn: Date.now(),
-      filePath: "public/upload/" + files.file.name,
-      source: fields.fileSource
-
+      source: req.body.data.source
     }, function(err, namespace) {
       if (err) {
         console.log(err);
       } else {
         console.log("namespace created and saved", namespace);
-        req.session.oid = namespace._id;
-        res.redirect('/#/defineData');
+        // req.session.oid = namespace._id;
+        // console.log('session',req.session.oid);
+        res.status(201).send(namespace);
       }
     });
   });
+
+router.get('/namespaceList', function(req, res) {
+  // 
+  // Namespace.remove({},function(){
+  //   console.log("deleted");
+  // });
+  Namespace.find(function(err,namespace){
+    res.send(namespace);
+  });
 });
+
 module.exports = router;
diff --git a/routes/defineData/measures.js b/routes/defineData/measures.js
index c51fe2b..388359a 100644
--- a/routes/defineData/measures.js
+++ b/routes/defineData/measures.js
@@ -2,38 +2,14 @@ var express = require('express');
 var router = express.Router();
 var mongoose = require('mongoose');
 var Namespace = require('../../models/dbConfig').namespaceModel;
-// var measureList = [{
-//   "dispName": "No of Hits"
-// }, {
-//   "dispName": "Failed Requests"
-// }, {
-//   "dispName": "Average Visitor Stay Length"
-// }, {
-//   "dispName": "Average Bandwidth per Day"
-// }]
-// /* GET Measures */
-// measureRouter.get('/', function(req, res){
-//  res.send(measureList);
-//  });
-/* GET Measures */
-router.get('/', function(req, res) {
-  if (req.session.oid !== null) {
-    Namespace.findNamespace(req.session.oid, function(err, namespace) {
-      if (namespace != null) {
-        res.send(namespace.measures);
-      }
-    });
-  }
-});
+
 
 /* POST Measures */
 router.post('/addMeasure', function(req, res) {
-  if (req.session.oid !== null) {
-    Namespace.findNamespace(req.session.oid, function(err, namespace) {
+    Namespace.findNamespaceName(req.body.data.namespaceName, function(err, namespace) {
       if (namespace != null) {
         var fieldEvent;
-      //  console.log("radiovalue",req.body.measure);
-        if (req.body.data.measure == "radioField") {
+        if (req.body.data.measure == "fieldMeasure") {
           fieldEvent = req.body.data.measureFieldSelector;
           fieldValue="";
         } else {
@@ -48,19 +24,38 @@ router.post('/addMeasure', function(req, res) {
         });
         namespace.save(function(err, namespace) {
           console.log('namespace saved:', namespace);
+          // res.send(200).send();
         });
       }
     });
-  }
+  //}
   res.send(req.body)
-  //res.redirect('/#/defineData');
 });
 
 /* Delete Measure */
 
-router.post('/:id', function(req, res) {
-  console.log("deleted value is", req.params.id);
-  res.redirect('/');
+router.post('/delete', function(req, res) {
+  console.log("deleted value is", req.body.data.measName);
+  console.log(req.body.data.namespaceName);
+  var namespaceID;
+  Namespace.findNamespaceName(req.body.data.namespaceName, function(err, namespace) {
+    console.log(namespace);
+    namespaceID=namespace._id;
+    console.log(namespaceID);
+    Namespace.findByIdAndUpdate(namespaceID, {
+      $pull: {
+        measures: {
+          displayName: req.body.data.measName
+        }
+      }
+    }, function(err) {
+      if (err) {
+return res.send(500).json(err);
+}
+console.log(err + "error");
+return res.send(200).send();
+    });
+  });
 });
 
 module.exports = router;
diff --git a/routes/realTimeLogs/queryBuilder/expressions.js b/routes/realTimeLogs/queryBuilder/expressions.js
index bf5ac2e..e8f8f4b 100644
--- a/routes/realTimeLogs/queryBuilder/expressions.js
+++ b/routes/realTimeLogs/queryBuilder/expressions.js
@@ -1,10 +1,12 @@
 var express = require('express');
 var router = express.Router();
 var Expression = require('../../../models/dbConfig').expressionModel;
-
+var mainquery=require('../../../components/queryexecutor/mainquery.js');
+var datamapper=require('../../../components/RTdatamapper/RTdatamapper.js');
+var Namespace = require('../../../models/dbConfig').namespaceModel;
 
   router.post('/save', function(req, res, next) {
-  // console.log('****************************in express routes********************* '+ req.body.data);
+  // console.log('****************************in express routes********************* '+ JSON.stringify(req.body.data));
   var temp=new Expression(req.body)
   Expression.addExp(temp,function(err,doc) {
   if (err) {
@@ -12,6 +14,7 @@ var Expression = require('../../../models/dbConfig').expressionModel;
   res.send(err);
   }
   else{
+  mainquery(req.body.data);
   res.send(doc);
   }
   })
@@ -33,6 +36,12 @@ Expression.searchQuery(search,function(err,doc) {
 
 
 
+});
+router.post('/stream', function(req, res, next) {
+   console.log("rcvd namespace " +JSON.stringify(req.body.data));
+  //  console.log(Namespace);
+   datamapper(req.body.data,Namespace);
+  res.send("cha");
 });
 
 module.exports = router;
diff --git a/vagrantfile b/vagrantfile
index 896bc8e..453b930 100644
--- a/vagrantfile
+++ b/vagrantfile
@@ -36,6 +36,8 @@ Vagrant.configure(2) do |config|
 
   # Map the guest os port 8080 to host os port 8080
   config.vm.network "forwarded_port", guest: 8585, host: 9595
+  config.vm.network "forwarded_port", guest: 9000, host: 9000
+  config.vm.network "forwarded_port", guest: 5050, host: 5050
 
   if OS.windows?
 
diff --git a/vagrantfile.orig b/vagrantfile.orig
new file mode 100644
index 0000000..926bd22
--- /dev/null
+++ b/vagrantfile.orig
@@ -0,0 +1,63 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+# Copyright 2016 Wipro Limited, NIIT Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This code is written by Prateek Reddy Yammanuru, Shiva Manognya Kandikuppa, Uday Kumar Mydam, Nirup TNL, Sandeep Reddy G, Deepak Kumar
+
+
+
+vagrant_cache_server = "172.23.238.253"
+
+
+# Detect the current OS. node on windows needs some symlink magic to work.
+module OS
+  def OS.windows?
+    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+  end
+end
+
+Vagrant.configure(2) do |config|
+
+  config.vm.box = "stackroute/barebones-node"
+  config.vm.box_url = "http://#{vagrant_cache_server}/vagrant/boxes/stackroute-barebones-node.box"
+  config.vm.hostname = 'stackroute-node'
+
+  # Map the guest os port 8080 to host os port 8080
+<<<<<<< HEAD
+<<<<<<< HEAD
+  config.vm.network "forwarded_port", guest: 8585, host: 9595
+=======
+  config.vm.network "forwarded_port", guest: 8686, host: 8686
+  config.vm.network "forwarded_port", guest: 5050, host: 5050
+>>>>>>> f40437ffcece50606bcf5f4d679a3909ad076708
+=======
+  config.vm.network "forwarded_port", guest: 8686, host: 8686
+  config.vm.network "forwarded_port", guest: 5050, host: 5050
+>>>>>>> f40437ffcece50606bcf5f4d679a3909ad076708
+
+  if OS.windows?
+
+    # enable symlinks between the host/gust filesystems
+    config.vm.provider "virtualbox" do |vb|
+      vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root", "1"]
+    end
+
+    # Setup the softlinks
+    config.vm.provision :puppet do |puppet|
+      puppet.manifest_file = "windows.pp"
+    end
+
+  end
+end
diff --git a/views/footer_includes.ejs b/views/footer_includes.ejs
index 5698d45..53e02e7 100755
--- a/views/footer_includes.ejs
+++ b/views/footer_includes.ejs
@@ -85,6 +85,9 @@ This code is written by Ashish Gupta, Tarun Mohandas, Suriya Prakash, Srinivasa
 <script src="/directives/javascripts/nginx/trafficRate/trafficRate.directive.js" ></script>
 <script type="text/javascript" src="/directives/javascripts/aptCache/dropDownElement.js"></script>
 
+<script type="text/javascript" src="/directives/javascripts/fileUpload/onReadFile.js"></script>
+
+
 <!-- Graphs -->
 
 <script type="text/javascript" src="/graphs/rateGraphCode.js"></script>