getGranules only returns non-null columns.

Nathanael Jourdane
1 parent 8d5016bc
Showing 1 changed file with 30 additions and 5 deletions Show diff stats
php/classes/EpnTapMgr.php
@@ -49,12 +49,37 @@ class EpnTapMgr {
  
 		$query = "SELECT TOP {$limit} * FROM {$table_name} " . $this->createFilter($filter[0], $filter[1], $filter[2], $filter[3]) . " OFFSET {$offset}";
 		$result = $this->request($access_url, $query);
-		if(! array_key_exists("error", $result)) {
  
-			for ($i = 0 ; $i < count($result) ; $i++) {
-				$result[$i]['num'] = $i + $offset + 1;
-				$result[$i]['time_min'] = $this->JDTodate($result[$i]['time_min']);
-				$result[$i]['time_max'] = $this->JDTodate($result[$i]['time_max']);
+		$result_path = EpnTapDataPath . "test_result.json";
+		$servicesJsonFile = fopen($result_path, "w");
+
+		if(array_key_exists("error", $result)) {
+			return $result;
+		}
+
+		$columns_with_empty_results = Array();
+		for ($i = 0 ; $i < count($result) ; $i++) {
+			$result[$i]['num'] = $i + $offset + 1;
+			$result[$i]['time_min'] = $this->JDTodate($result[$i]['time_min']);
+			$result[$i]['time_max'] = $this->JDTodate($result[$i]['time_max']);
+
+			foreach($result[$i] as $key => $value) {
+				if($value === '' || $value === 'NAN') {
+				 	if(!array_key_exists($key, $columns_with_empty_results)) {
+						array_push($columns_with_empty_results, $key);
+					}
+				} elseif(array_key_exists($key, $columns_with_empty_results)) {
+					unset($columns_with_empty_results[$key]);
+				}
+			}
+		}
+
+		// TODO: maybe is it better to have a array of booleans, like {"target_name": true, "c1min", false}, to apply an array_map() ?
+		for($i = 0 ; $i < count($result) ; $i++) {
+			foreach($result[$i] as $key => $value) {
+				if(in_array($key, $columns_with_empty_results)) {
+					unset($result[$i][$key]);
+				}
 			}
 		}