epntap: Do not use metadata but query services directly on module startup

Nathanael Jourdane
1 parent 68664dca
Showing 4 changed files with 95 additions and 97 deletions Show diff stats
js/app/controllers/EpnTapModule.js
js/app/views/EpnTapUI.js
php/classes/EpnTapMgr.php
php/epntap.php
@@ -41,7 +41,7 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		this.addStoreListeners();
  
 		this.servicesStore.load();
-		this.metadataStore.load();
+		// this.metadataStore.load();
 		this.productTypesStore.load();
 	},
  
@@ -63,25 +63,25 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		// stores elements
 		this.servicesStore = Ext.data.StoreManager.lookup('servicesStore');
 		this.granulesStore = Ext.data.StoreManager.lookup('granulesStore');
-		this.metadataStore = Ext.data.StoreManager.lookup('metadataStore')
+		// this.metadataStore = Ext.data.StoreManager.lookup('metadataStore')
 		this.productTypesStore = Ext.data.StoreManager.lookup('productTypesStore');
 		this.targetNamesStore = Ext.data.StoreManager.lookup('targetNamesStore');
 	},
  
 	addStoreListeners: function() {
-		this.servicesStore.on({
-			beforeload: function(store) {
-				loadMask.show();
-				AmdaAction.epnTapGetServices( function(services) {
-					store.add(services);
-				});
-			},
-			add: function(store) {
-				this.updateNbResults();
-				loadMask.hide();
-			},
-			scope: this
-		});
+		// this.servicesStore.on({
+		// 	beforeload: function(store) {
+		// 		loadMask.show();
+		// 		AmdaAction.epnTapGetServices( function(services) {
+		// 			store.add(services);
+		// 		});
+		// 	},
+		// 	add: function(store) {
+		// 		this.updateNbResults();
+		// 		loadMask.hide();
+		// 	},
+		// 	scope: this
+		// });
  
 		this.productTypesStore.on({
 			load: function(store) {
@@ -174,8 +174,8 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		this.aquireElements();
 		this.addUIListeners();
  
-		this.servicesStore.clearFilter();
-		this.metadataStore.clearFilter();
+		// this.servicesStore.clearFilter();
+		// this.metadataStore.clearFilter();
 		this.granulesStore.removeAll();
  
 		this.productTypeCB.getStore().add({'id': 'all', 'name': 'All dataproduct types'});
@@ -189,9 +189,9 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 			this.targetNameCB.select('all');
 			this.productTypeCB.select('all');
  
-			this.servicesStore.each(function(record, idx) {
-				record.set('nb_results', this.metadataStore.sum('nb_results'));
-			}, this);
+			// this.servicesStore.each(function(record, idx) {
+			// 	record.set('nb_results', this.metadataStore.sum('nb_results'));
+			// }, this);
 		}
 	},
  
@@ -360,15 +360,15 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 			];
 		}
  
-		this.servicesStore.each(function(record, idx) {
-			this.metadataStore.filter(filter.concat({property: 'service_id', value: record.get('id')}));
-			record.set('nb_results', this.metadataStore.sum('nb_results'));
-			this.metadataStore.clearFilter();
-		}, this);
-		this.servicesStore.sort('nb_results', 'DESC');
-
-		var timeMin = this.metadataStore.min('time_min');
-		var timeMax = this.metadataStore.max('time_max');
+		// this.servicesStore.each(function(record, idx) {
+		// 	this.metadataStore.filter(filter.concat({property: 'service_id', value: record.get('id')}));
+		// 	record.set('nb_results', this.metadataStore.sum('nb_results'));
+		// 	this.metadataStore.clearFilter();
+		// }, this);
+		// this.servicesStore.sort('nb_results', 'DESC');
+		// 
+		// var timeMin = this.metadataStore.min('time_min');
+		// var timeMax = this.metadataStore.max('time_max');
 		this.timeSelector.setLimits(timeMin, timeMax);
 		this.timeSelector.setInterval(timeMin, timeMax);
 	},
@@ -100,27 +100,11 @@ Ext.create(&#39;Ext.data.Store&#39;, {
 		{name: 'created', type: 'date', dateFormat: 'c'},
 		{name: 'updated', type: 'date', dateFormat: 'c'},
 		{name: 'nb_results', type: 'integer'}
-	]
-});
-
-/**
-`metadataStore`: [...]
-*/
-Ext.create('Ext.data.ArrayStore', {
-	storeId: 'metadataStore',
-	fields: [
-		{name: 'dataproduct_type', type: 'string', mapping: 0},
-		{name: 'target_class', type: 'string', mapping: 1},
-		{name: 'target_name', type: 'string', mapping: 2},
-		{name: 'service_id', type: 'string', mapping: 3},
-		{name: 'nb_results', type: 'integer', mapping: 4},
-		{name: 'time_min', type: 'date', dateFormat: 'd/m/Y', mapping: 5},
-		{name: 'time_max', type: 'date', dateFormat: 'd/m/Y', mapping: 6}
 	],
 	proxy: {
 		type: 'ajax',
-		// url : '../../../generic_data/EpnTapData/metadata.json'
-		url : 'generic_data/EpnTapData/metadata.json'
+		url: 'php/epntap.php',
+		extraParams : { action: 'get_services' }
 	}
 });
  
@@ -448,15 +432,13 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 			store: Ext.data.StoreManager.lookup('servicesStore'),
 			flex: 1,
 			columns: [
-				{text: 'Name', dataIndex: 'short_name', flex: 1},
-				{text: '~Nb results', dataIndex: 'nb_results', flex: 1}
+				{text: 'Name', dataIndex: 'short_name', flex: 3},
+				{text: 'nb results', dataIndex: 'nb_results', flex: 2}
 			],
-			renderer: function(value, metadata, record) {
-				return getExpandableImage(value, metadata,record);
-			},
 			viewConfig: {
 				getRowClass: function(record, index) {
-					if (record.get('nb_results') === 0) {
+					var nb_res = record.get('nb_results');
+					if (nb_res <= 0 || isNaN(nb_res)) {
 						return 'disabled_row';
 					}
 				}
@@ -469,16 +451,17 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 			trackMouse: true,
 			listeners: {
 				beforeshow: function updateTipBody(tooltip) {
-					var column_titles = {'res_title': 'Title',
-								 'ivoid': 'ivoid',
-								 'access_url': 'Access URL',
-								 'table_name': 'Table name',
-								 'content_type': 'content type',
-								 'creator_seq': 'Creator',
-								 'content_level': 'Content level',
-								 'reference_url': 'reference URL',
-								 'created': 'Created on',
-								 'updated': 'Updated on'};
+					var column_titles = {
+							'res_title': 'Title',
+							'ivoid': 'ivoid',
+							'access_url': 'Access URL',
+							'table_name': 'Table name',
+							'content_type': 'content type',
+							'creator_seq': 'Creator',
+							'content_level': 'Content level',
+							'reference_url': 'reference URL',
+							'created': 'Created on',
+							'updated': 'Updated on'};
 					var service = epnTapServicesGrid.getView().getRecord(tooltip.triggerElement);
 					var ttContent = '<h3>' + service.get('short_name') + '</h3><ul>';
 					for (var column in column_titles) {
@@ -76,34 +76,6 @@ class EpnTapMgr {
 		return $result;
 	}
  
-	/* Return the list of available services by querying some usual registries. */
-	public function getServices() {
-		$registriesURL = ["http://registry.euro-vo.org/regtap/tap", "http://dc.zah.uni-heidelberg.de/tap", "http://gavo.aip.de/tap", "http://reg.g-vo.org/tap"];
-		$columns = ['short_name', 'res_title', 'ivoid', 'access_url', 'table_name', 'content_type', 'creator_seq', 'content_level', 'reference_url', 'created', 'updated'];
-		$getServicesQuery = "SELECT DISTINCT " . implode(', ', $columns) . " FROM rr.resource
-		                     NATURAL JOIN rr.res_schema NATURAL JOIN rr.res_table NATURAL JOIN rr.interface NATURAL JOIN rr.res_detail NATURAL JOIN rr.capability
-		                     WHERE standard_id='ivo://ivoa.net/std/tap' AND intf_type='vs:paramhttp' AND detail_xpath='/capability/dataModel/@ivo-id'
-		                     AND 1=ivo_nocasematch(detail_value, 'ivo://vopdc.obspm/std/EpnCore%') AND table_name LIKE '%.epn_core' ORDER BY short_name, table_name";
-
-		for($i=0; $i<count($registriesURL); $i++) {
-			$services = $this->request($registriesURL[$i], $getServicesQuery);
-			if(! array_key_exists("error", $services)) {
-				for($j=0; $j<count($services); $j++) {
-					$services[$j]['id'] = $this->generateServiceId($services[$j]);
-				}
-				return $services;
-			} else if($i === count($registriesURL)-1) {
-				error_log("Can not access any of these services : " . implode(', ', $registriesURL) . ".");
-				return;
-			}
-		}
-	}
-
-	/* Generate a unique service identifier from the service ivoid and the table name. */
-	public function generateServiceId($service) {
-		return str_replace(['ivo://', '.epn_core'], '', $service['ivoid'] . '/' . $service['table_name']);
-	}
-
 	/* 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} " . $this->createFilter($filter[0], $filter[1], $filter[2], $filter[3]);
 <?php
  
-$action = preg_replace("/[^a-z]+/", "", filter_var($_GET['action'], FILTER_SANITIZE_STRING));
+include(realpath(dirname(__FILE__) . "/config.php"));
+// include(CLASSPATH . "EpnTapMgr.php");
+include(CLASSPATH . "VOTableMgr.php");
+
+$action = preg_replace("/[^a-z_]+/", "", filter_var($_GET['action'], FILTER_SANITIZE_STRING));
  
 switch ($action) {
 	case 'resolver':
-		echo resolver(filter_var($_GET['input'], FILTER_SANITIZE_URL));
+		echo json_encode(resolver(filter_var($_GET['input'], FILTER_SANITIZE_URL)));
 		break;
 	case 'get_services':
-		echo get_services();
+		echo json_encode(getServices());
 		break;
  
 	default:
@@ -18,13 +22,52 @@ function resolver($input) {
 	$resolver_url = "http://voparis-registry.obspm.fr/ssodnet/1/autocomplete?q=%22$input%22";
 	$result = json_decode(file_get_contents($resolver_url), true);
  
-	$response = array();
+	$targets = array();
 	foreach($result['hits'] as $e) {
 		$aliases = '<li>' . join('</li><li>', $e['aliases']) . '</li>';
 		$target = array('name' => $e['name'], 'type' => $e['type'], 'parent' => $e['parent'], 'aliases' => $aliases);
-		array_push($response, $target);
+		array_push($targets, $target);
+	}
+	return $targets;
+}
+
+/* Return the list of available services by querying some usual registries. */
+function getServices() {
+	$registriesURL = ["http://registry.euro-vo.org/regtap/tap", "http://dc.zah.uni-heidelberg.de/tap", "http://gavo.aip.de/tap", "http://reg.g-vo.org/tap"];
+	$columns = ['short_name', 'res_title', 'ivoid', 'access_url', 'table_name', 'content_type', 'creator_seq', 'content_level', 'reference_url', 'created', 'updated'];
+	$getServicesQuery = "SELECT DISTINCT " . implode(', ', $columns) . " FROM rr.resource
+			NATURAL JOIN rr.res_schema NATURAL JOIN rr.res_table NATURAL JOIN rr.interface NATURAL JOIN rr.res_detail NATURAL JOIN rr.capability
+			WHERE standard_id='ivo://ivoa.net/std/tap' AND intf_type='vs:paramhttp' AND detail_xpath='/capability/dataModel/@ivo-id'
+			AND 1=ivo_nocasematch(detail_value, 'ivo://vopdc.obspm/std/EpnCore%') AND table_name LIKE '%.epn_core' ORDER BY short_name, table_name";
+
+	for($i=0; $i<count($registriesURL); $i++) {
+		$services = request($registriesURL[$i], $getServicesQuery);
+		if(! array_key_exists("error", $services)) {
+			for($j=0; $j<count($services); $j++) {
+				$services[$j]['id'] = generateServiceId($services[$j]);
+				$services[$j]['nb_results'] = -1;
+			}
+			return $services;
+		} else if($i === count($registriesURL)-1) {
+			error_log("Can not access any of these services : " . implode(', ', $registriesURL) . ".");
+			return;
+		}
 	}
-	return json_encode($response);
 }
  
+/* Generate a unique service identifier from the service ivoid and the table name. */
+function generateServiceId($service) {
+	return str_replace(['ivo://', '.epn_core'], '', $service['ivoid'] . '/' . $service['table_name']);
+}
+
+function request($access_url, $query) {
+	$votMgr = new VOTableMgr;
+	$params = 'FORMAT=votable&LANG=ADQL&REQUEST=doQuery';
+	$url = $access_url . '/sync?' . $params . '&QUERY=' . urlencode(preg_replace('/\s+/', ' ', $query));
+
+	$votMgr->load($url);
+
+	$result = $votMgr->parseStream();
+	return $votMgr->getVotableError() ? array('error' => $votMgr->getVotableError()) : $result;
+}
 ?>