bugFix: do not use as 'select' array and convert query results as string

Nathanael Jourdane
1 parent 3a42858d
Showing 5 changed files with 30 additions and 39 deletions Show diff stats
js/app/controllers/EpnTapModule.js
php/classes/AmdaAction.php
php/classes/EpnTapMgr.php
php/classes/VOTableMgr.php
php/config.php
@@ -26,7 +26,6 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 	Module initialisation.
 	*/
 	init: function() {
-		this.select = Array();
 		this.filter = Array();
 		this.selectedServiceId = null;
  
@@ -261,12 +260,12 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		var newPageNumber = 1;
 		var limit = Number(this.rowsPerPageNf.value);
 		var offset = 0;
-		var selectedServiceURL = Ext.data.StoreManager.lookup('servicesStore').getById(this.selectedServiceId)['accessurl'];
+		var selectedService = Ext.data.StoreManager.lookup('servicesStore').findRecord('id', selectedServiceId).data;
  
 		this.wait();
 		this.disableNavBtns(true, true, false, false);
 		this.currentPageLb.setText('' + newPageNumber);
-		AmdaAction.epnTapGetGranules(this.selectedServiceId, selectedServiceURL, this.filter, this.select, limit, offset, this.fillGranules);
+		AmdaAction.epnTapGetGranules(selectedService['table_name'], selectedService['access_url'], this.filter, limit, offset, this.fillGranules);
 	},
  
 	/**
@@ -277,13 +276,13 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		var newPageNumber = Number(this.currentPageLb.text) - 1;
 		var limit = Number(this.rowsPerPageNf.value);
 		var offset = (newPageNumber-1) * limit;
-		var selectedServiceURL = Ext.data.StoreManager.lookup('servicesStore').getById(this.selectedServiceId)['accessurl'];
+		var selectedService = Ext.data.StoreManager.lookup('servicesStore').findRecord('id', selectedServiceId).data;
  
 		this.wait();
 		this.currentPageLb.setText('' + newPageNumber);
 		var isFirstPage = this.currentPageLb.text === '1';
 		this.disableNavBtns(isFirstPage, isFirstPage, false, false);
-		AmdaAction.epnTapGetGranules(this.selectedServiceId, selectedServiceURL, this.filter, this.select, limit, offset, this.fillGranules);
+		AmdaAction.epnTapGetGranules(selectedService['table_name'], selectedService['access_url'], this.filter, limit, offset, this.fillGranules);
 	},
  
 	/**
@@ -294,13 +293,13 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		var newPageNumber = Number(this.currentPageLb.text) + 1;
 		var limit = Number(this.rowsPerPageNf.value);
 		var offset = (newPageNumber-1) * limit;
-		var selectedServiceURL = Ext.data.StoreManager.lookup('servicesStore').getById(this.selectedServiceId)['accessurl'];
+		var selectedService = Ext.data.StoreManager.lookup('servicesStore').findRecord('id', selectedServiceId).data;
  
 		this.wait();
 		this.currentPageLb.setText('' + newPageNumber);
 		var isLastPage = this.currentPageLb.text == this.totalPagesLb.text;
 		this.disableNavBtns(false, false, isLastPage, isLastPage);
-		AmdaAction.epnTapGetGranules(this.selectedServiceId, selectedServiceURL, this.filter, this.select, limit, offset, this.fillGranules);
+		AmdaAction.epnTapGetGranules(selectedService['table_name'], selectedService['access_url'], this.filter, limit, offset, this.fillGranules);
 	},
  
 	/**
@@ -311,12 +310,12 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		var newPageNumber = Number(this.totalPagesLb.text);
 		var limit = Number(this.rowsPerPageNf.value);
 		var offset = (newPageNumber-1) * limit;
-		var selectedServiceURL = Ext.data.StoreManager.lookup('servicesStore').getById(this.selectedServiceId)['accessurl'];
+		var selectedService = Ext.data.StoreManager.lookup('servicesStore').findRecord('id', selectedServiceId).data;
  
 		this.wait();
 		this.currentPageLb.setText('' + newPageNumber);
 		this.disableNavBtns(false, false, true, true);
-		AmdaAction.epnTapGetGranules(this.selectedServiceId, selectedServiceURL, this.filter, this.select, limit, offset, this.fillGranules);
+		AmdaAction.epnTapGetGranules(selectedService['table_name'], selectedService['access_url'], this.filter, limit, offset, this.fillGranules);
 	},
  
 	/*******************
@@ -331,21 +330,13 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		// console.log("Selected service " + selectedServiceId);
 		this.wait();
 		this.selectedServiceId = selectedServiceId;
-		this.select = Array();
-
 		var selectedService = Ext.data.StoreManager.lookup('servicesStore').findRecord('id', selectedServiceId).data;
-		console.log(selectedService);
+
 		if (selectedService == null) {
 			throw this.selectedServiceId + ' not found in the list of services.';
 			return;
 		}
  
-		var columns = selectedService['columns'].split(',');
-		for (var ic=0 ; ic<this.granulesGrid.columns.length ; ic++) {
-			if (columns.indexOf(this.granulesGrid.columns[ic].dataIndex) != -1) {
-				this.select.push(this.granulesGrid.columns[ic].dataIndex);
-			}
-		}
 		this.filter = Array(
 			this.productTypeCB.value === 'all' ? null : this.productTypeCB.value, // product type
 			this.targetNameCB.value === 'all' ? null : this.targetNameCB.value, // target name
@@ -353,9 +344,8 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 			Ext.Date.format(this.timeSelector.getStopTime(), 'd/m/Y H:i:s') // stop time
 		);
  
-		// console.log(selectedServiceId, selectedService['access_url'], this.filter);
-		AmdaAction.epnTapGetNbRows(selectedServiceId, selectedService['access_url'], this.filter, this.updateNbRows);
-		AmdaAction.epnTapGetGranules(selectedServiceId, selectedService['access_url'], this.filter, this.select, this.rowsPerPageNf.value, 0, this.fillGranules);
+		AmdaAction.epnTapGetNbRows(selectedService['table_name'], selectedService['access_url'], this.filter, this.updateNbRows);
+		AmdaAction.epnTapGetGranules(selectedService['table_name'], selectedService['access_url'], this.filter, this.rowsPerPageNf.value, 0, this.fillGranules);
 	},
  
 	/**
@@ -1341,8 +1341,8 @@ class AmdaAction {
         	return array('success' => true, 'alreadyUsed' => $alreadyUsed);
         }
  
-		public function epnTapGetGranules($table_name, $access_url, $filter, $select, $limit, $offset) {
-			return (new EpnTapMgr)->getGranules($table_name, $access_url, $filter, $select, $limit, $offset);
+		public function epnTapGetGranules($table_name, $access_url, $filter, $limit, $offset) {
+			return (new EpnTapMgr)->getGranules($table_name, $access_url, $filter, $limit, $offset);
 		}
  
 		public function epnTapGetNbRows($table_name, $access_url, $filter) {
@@ -38,18 +38,20 @@ class EpnTapMgr {
 		$params = 'FORMAT=votable&LANG=ADQL&REQUEST=doQuery';
 		$url = $access_url . '/sync?' . $params . '&QUERY=' . urlencode(preg_replace('/\s+/', ' ', $query)); // remove also multiple whitespaces
  
-		$res = $votMgr->load($url);
-		error_log("Query URL: " . $url);
+		$votMgr->load($url);
+
 		$result = $votMgr->parseStream();
 		return $votMgr->getVotableError() ? array('error' => $votMgr->getVotableError()) : $result;
 	}
  
 	/* filter order: product type, target name, time min, time max */
-	public function getGranules($table_name, $access_url, $filter, $select, $limit, $offset) {
-		$query = "SELECT TOP {$limit} " . join(', ', $select) . " FROM {$table_name}.epn_core " . $this->createFilter($filter[0], $filter[1], $filter[2], $filter[3]) . " OFFSET {$offset}";
+	public function getGranules($table_name, $access_url, $filter, $limit, $offset) {
+
+		$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 < sizeof($result) ; $i++) {
+
+			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']);
@@ -89,8 +91,9 @@ class EpnTapMgr {
  
 	/* filter order: product type, target name, time min, time max */
 	public function getNbRows($table_name, $access_url, $filter) {
-		$query = "SELECT COUNT(*) AS nb_rows FROM {$table_name}.epn_core " . $this->createFilter($filter[0], $filter[1], $filter[2], $filter[3]);
-		return $this->request($access_url, $query)[0]['nb_rows'];
+		$query = "SELECT COUNT(*) AS nb_rows FROM {$table_name} " . $this->createFilter($filter[0], $filter[1], $filter[2], $filter[3]);
+		$result = $this->request($access_url, $query)[0]['nb_rows'];
+		return $result;
 	}
  
 }
@@ -34,7 +34,7 @@ class VOTableMgr {
 		$this->xml = new DomDocument();
  
 		try {
-			$res = $this->xml->load($fileName);
+			$load_res = $this->xml->load($fileName);
 		} catch (Exception $e) {
 			$this->votable_error = $e->message;
 			return false;
@@ -55,13 +55,11 @@ class VOTableMgr {
  
 	function isValidSchema() {
 		if ($this->votable_error != false) {
-			error_log("There is an error on the VOTable: " . $this->votable_error);
 			return false;
 		}
  
 		if (!$this->xml) {
 			$this->votable_error = "The returned file is not XML.";
-			error_log("There is an error on the VOTable: " . $this->votable_error);
 			return false;
 		}
  
@@ -69,7 +67,6 @@ class VOTableMgr {
 		foreach($infos as $info) {
 			if($info->getAttribute('value') == 'ERROR') {
 				$this->votable_error = $info->textContent;
-				error_log("There is an error on the VOTable: " . $this->votable_error);
 				return false;
 			}
 		}
@@ -254,11 +251,12 @@ class VOTableMgr {
 	/** Get the VOTable stream content.*/
 	public function parseStream() {
 		if (! $this->isValidSchema()) {
+			error_log('There is an error on the VOTable: ' . $this->votable_error);
 			return null;
-			// TODO: check this
 		}
 		$data = Array();
 		$fields = $this->xp->query($this->queryFields());
+		$resource = $this->xp->query($this->queryResource());
 		$nb_columns = $fields->length;
 		$row = Array();
 		$n_value = 0; // index of current value
@@ -266,13 +264,13 @@ class VOTableMgr {
 		$query_stream = $this->xp->query($this->queryStream())->item(0);
 		if($query_stream == NULL) {
 			$this->votable_error = "There is no STREAM node in the VOTable file.";
-			return NULL;
+			return null;
 		}
 		$this->stream = base64_decode($query_stream->textContent);
 		$stream_len = strlen($this->stream);
 		if($stream_len == 0) {
 			$this->votable_error = "There is no result for this query.";
-			return NULL;
+			return null;
 		}
 		while($this->c < strlen($this->stream)) {
 			$col_id = $n_value % $nb_columns;
@@ -342,7 +340,7 @@ class VOTableMgr {
 				break;
 		}
 		$this->c+=$row_size;
-		return $res;
+		return (string)$res;
 	}
  
  
@@ -384,7 +384,7 @@ $API = array(
         'isSharedObjectNameAlreadyUsed' => array(
         	'len'=>1
         ),
-		'epnTapGetGranules' => array('len'=>6),
+		'epnTapGetGranules' => array('len'=>5),
 		'epnTapGetNbRows' => array('len'=>3),
         'epnTapGetServices' => array('len'=>0)
       )