--no commit message

--no commit message

plugins/dt/dt-agritronics/parser/image_parser.js

@@ -15,10 +15,8 @@ exports.getValues = function(dataSet, cb){
 	let values = [];
 
 	//console.log(dataSet.length);
-	var i = 0;
-	async.whilst(function() { return i < dataSet.length;}, function(callbackFn) {
-		let json = parser.toJson(dataSet[i], {object: true});
-		i++;
+	let json = parser.toJson(dataSet, {object: true});
+
 	dataTemplate.type = json.xhr.IO.Type;
 	dataTemplate.unit = json.xhr.IO.Unit;
 	dataTemplate.value_type = json.xhr.IO.ValueType;
@@ -31,7 +29,6 @@ exports.getValues = function(dataSet, cb){
 			}).catch((err) => {
 				cb(err);
 			})
-				callbackFn();
 		}
 		else{
 			var idx = 0;
@@ -53,25 +50,19 @@ exports.getValues = function(dataSet, cb){
 				if( err ) {
 					console.log(err);
 				} 
-					callbackFn();
-				});
-				
-			}
-		}
-		else callbackFn();
-
-	}, function(err) {
-		if( err ) {
-			console.log(err);
-		} else {
 				if(values.length > 0){
 					dataTemplate.values = values;
 					cb(dataTemplate);
 				}
 				else cb(null);
-		}
 			});
 			
+		}
+	}
+	else cb(null);
+
+		
+
 
 
 }

plugins/dt/dt-agritronics/parser/simple_parser.js

@@ -11,9 +11,8 @@ exports.getValues = function(dataSet, callback){
 
 	let values = [];
 
-	for (var i = 0; i < dataSet.length; i++) {
 		
-		let json = parser.toJson(dataSet[i], {object: true});
+	let json = parser.toJson(dataSet, {object: true});
 	dataTemplate.type = json.xhr.IO.Type;
 	dataTemplate.unit = json.xhr.IO.Unit;
 	dataTemplate.value_type = json.xhr.IO.ValueType;
@@ -30,7 +29,7 @@ exports.getValues = function(dataSet, callback){
 		}
 	}
 		
-	}
+	
 
 	if(values.length > 0){
 		dataTemplate.values = values;

plugins/dt/dt-agritronics/parser/wind_direction_parser.js

@@ -12,9 +12,7 @@ exports.getValues = function(dataSet, callback){
 	let values = [];
 
 
-
-	for (var i = 0; i < dataSet.length; i++) {
-		let json = parser.toJson(dataSet[i], {object: true});
+	let json = parser.toJson(dataSet, {object: true});
 	dataTemplate.type = json.xhr.IO.Type;
 	dataTemplate.unit = json.xhr.IO.Unit;
 	dataTemplate.value_type = json.xhr.IO.ValueType;
@@ -29,7 +27,7 @@ exports.getValues = function(dataSet, callback){
 			}
 		}
 	}
-	}
+	
 	if(values.length > 0){
 		dataTemplate.values = values;
 		callback(dataTemplate);

plugins/dt/dt-agritronics/perform.js

@@ -13,7 +13,17 @@ function perform_function(context,request,response){
   var output_type = "object/sds";
   var di_data = request.data;
 
-  let idx = 0;
+  
+  let out = [];
+  
+
+  var dataKeySeries = Object.keys(di_data.data);
+
+  // for (var i = 0; i < dataKeySeries.length; i++) {
+  //   console.log(di_data.data[dataKeySeries[i]]);
+  // }
+  let i = 0;
+  async.whilst(function() { return i < dataKeySeries.length;}, function(cb) {
     let result = {
       "object_type": 'iBitz',
       "station_id": di_data.station_id,
@@ -22,14 +32,16 @@ function perform_function(context,request,response){
       "altitude": "",
       "data":[]
     };
-
-  async.whilst(function() { return idx < di_data.data.length;}, function(callback) {
-    let dtype = di_data.data[idx].data_types;
-    //console.log('[DT] di_data length = ' + di_data.data[idx].value.length);
-    if(typeof di_data.data[idx].value.length !== "undefined"){
-      //console.log('data = ' + di_data.data[idx].value[0]);
-      let json = parser.toJson(di_data.data[idx].value[0], {object: true});
-      agriParser.getParser(json.xhr.IO.Type).getValues(di_data.data[idx].value, function(values) {
+    let vals = di_data.data[dataKeySeries[i]];
+    i++;
+    let idx = 0;
+    async.whilst(function() { return idx < vals.length;}, function(callback) {
+      let dtype = vals[idx].data_types;
+      //console.log('[DT] di_data length = ' + vals[idx].value.length);
+      let json = parser.toJson(vals[idx].value, {object: true});
+      //console.log('Type = ' + json.xhr.IO.Type);
+      agriParser.getParser(json.xhr.IO.Type).getValues(vals[idx].value, function(values) {
+        //console.log('data = ' + vals[idx].value);
         idx++;
         if(values !== null){
             result.latitude = json.xhr.IO.Latitude;
@@ -37,29 +49,38 @@ function perform_function(context,request,response){
             result.data.push(values);
             //console.log(`STAMP : ${di_data.station_id}-${dtype} = `+ values.values[values.values.length-1].observeddatetime);
             memstore.setItem(`${di_data.station_id}-${dtype}`, values.values[values.values.length-1].observeddatetime, (err) =>{
-              if(err) throw err;
+              if(err){
+                throw err;
                 callback(err);
-            });
               } 
               else callback();
             });
         }
-    else{
-      idx++;
-      callback();
-    } 
-
+        else callback();
+      });
 
 
+    }, function(err) {
+        if( err ) {
+          console.log(err);
+          cb(err);
+          //response.error(err);
+        } else {
+          if(result.data.length > 0){
+            out.push(result);
+          }
+          cb();
+        }
+    });
   }, function(err) {
         if( err ) {
           console.log(err);
           //response.error(err);
         } else {
-        //fs.writeFileSync("./result.json", JSON.stringify(result));
-        //console.log(JSON.stringify(result));
-        if(result.data.length > 0)
-          response.success(result, output_type);
+          //fs.writeFileSync("./result.json", JSON.stringify(out));
+          //console.log(JSON.stringify(out));
+          if(out.length > 0)
+            response.success(out, output_type);
           else response.reject();
         }
     });