Allow multiple values for target names

Nathanael Jourdane
1 parent 3f51339d
Showing 3 changed files with 19 additions and 18 deletions Show diff stats
js/app/controllers/EpnTapModule.js
js/app/views/EpnTapUI.js
php/epntap.php
@@ -128,7 +128,7 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 					'serviceId': record.data['id'],
 					'url': record.data['access_url'],
 					'tableName': record.data['table_name'],
-					'targetName': targetName,
+					'targetNames': targetName,
 					'productTypes': productTypes,
 					'timeMin': timeMin,
 					'timeMax': timeMax
@@ -62,7 +62,7 @@ This list is used to fill the `targetNameCB` combo box, which is updated by `Epn
 */
 Ext.create('Ext.data.Store', {
 	storeId: 'targetNamesStore',
-	fields: ['id', 'name', 'type', 'parent', 'aliases'],
+	fields: ['id', 'text', 'name', 'type', 'parent', 'aliases'],
 	proxy: {
 		type: 'ajax',
 		url: 'php/epntap.php',
@@ -171,7 +171,7 @@ Ext.create(&#39;Ext.data.Store&#39;, {
 				'action': 'getGranules',
 				'url': service['access_url'],
 				'tableName': service['table_name'],
-				'targetName': Ext.getCmp('epnTapTargetNameCB').rawValue,
+				'targetNames': Ext.getCmp('epnTapTargetNameCB').rawValue,
 				'productTypes': Ext.getCmp('epnTapProductTypeCB').value.join(';'),
 				'timeMin': Ext.Date.format(Ext.getCmp('epnTapTimeSelector').getStartTime(), 'd/m/Y H:i:s'),
 				'timeMax': Ext.Date.format(Ext.getCmp('epnTapTimeSelector').getStopTime(), 'd/m/Y H:i:s'),
@@ -463,10 +463,11 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 				id: 'epnTapTargetNameCB',
 				fieldLabel: 'Target name',
 				emptyText: 'Earth, Saturn, 67P, ...',
+				tooltip: 'Start to type a text, then select a target name (required). Several values are allowed, separated by a semicolon.',
 				store: Ext.data.StoreManager.lookup('targetNamesStore'),
 				queryMode: 'remote',
 				queryParam: 'input',
-				displayField: 'name',
+				displayField: 'text',
 				valueField: 'id',
 				margin: '15 0 5 0',
 				labelWidth: 71,
@@ -480,10 +481,7 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 				},
 				listeners: {
 					render: function(cb) {
-						new Ext.ToolTip({
-							target: cb.getEl(),
-							html: 'Start to type a text then select a target name (required).'
-						});
+						new Ext.ToolTip({ target: cb.getEl(), html: '<div style="width:200px">' + cb.tooltip + '</div>'});
 					}
 				}
 			};
@@ -502,6 +500,7 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 			id: 'epnTapProductTypeCB',
 			fieldLabel: 'Product type',
 			emptyText: 'Image, Time series, ...',
+			tooltip: 'Select one or several data product types (required).',
 			store: Ext.data.StoreManager.lookup('productTypesStore'),
 			queryMode: 'local',
 			valueField: 'id',
@@ -524,10 +523,7 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 					}
 				},
 				render: function(cb) {
-					new Ext.ToolTip({
-						target: cb.getEl(),
-						html: 'Select one or several data product types (required).'
-					});
+					new Ext.ToolTip({ target: cb.getEl(), html: '<div style="width:200px">' + cb.tooltip + '</div>'});
 				}
 			}
 		};
@@ -34,7 +34,11 @@ function getParam($paramName, $default=null) {
  
 function resolver() {
 	$input = filter_var($_GET['input'], FILTER_SANITIZE_URL);
-	$resolver_url = "http://voparis-registry.obspm.fr/ssodnet/1/autocomplete?q=%22$input%22";
+	$words = preg_split("/ ?[;,] ?+/", $input);
+	$lastWord = trim(array_pop($words));
+	$firstsWords = implode(', ', $words);
+
+	$resolver_url = "http://voparis-registry.obspm.fr/ssodnet/1/autocomplete?q=%22$lastWord%22";
  
 	$response = ['success' => true, 'metaData' => ['root' => 'data', 'messageProperty' => 'msg']];
 	try {
@@ -49,7 +53,8 @@ function resolver() {
 		$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);
+			$text = (!empty($firstsWords) ? "$firstsWords, " : "") . $e['name'];
+			$target = ['text' => $text, 'name' => $e['name'], 'type' => $e['type'], 'parent' => $e['parent'], 'aliases' => $aliases];
 			array_push($targets, $target);
 		}
 		$response['data'] = $targets;
@@ -119,7 +124,7 @@ function getServices() {
 }
  
 function getNbResults() {
-	$query = "SELECT COUNT(*) AS nb_rows FROM " . getParam('tableName') . createFilter(getParam('targetName'), getParam('productTypes'), getParam('timeMin'), getParam('timeMax'));
+	$query = "SELECT COUNT(*) AS nb_rows FROM " . getParam('tableName') . createFilter(getParam('targetNames'), getParam('productTypes'), getParam('timeMin'), getParam('timeMax'));
 	$response = request(getParam('url'), $query);
 	if($response['success']) {
 		$response['success'] = false;
@@ -147,7 +152,7 @@ function getNbResults() {
  
 function getGranules() {
 	$sort = is_null(getParam('sort')) ? 'granule_uid ASC' : (getParam('sort') . ' ' . getParam('dir'));
-	$filter = createFilter(getParam('targetName'), getParam('productTypes'), getParam('timeMin'), getParam('timeMax'));
+	$filter = createFilter(getParam('targetNames'), getParam('productTypes'), getParam('timeMin'), getParam('timeMax'));
 	$query = "SELECT TOP " . getParam('limit') . " * FROM " . getParam('tableName') . " $filter ORDER BY $sort OFFSET " . getParam('start');
 	// error_log('getGranules query: ' . $query);
 	$response = request(getParam('url'), $query);
@@ -183,10 +188,10 @@ function getGranules() {
  
 // ----- utils -----
  
-function createFilter($targetName, $productTypes, $timeMin, $timeMax) {
+function createFilter($targetNames, $productTypes, $timeMin, $timeMax) {
 	$filter = array();
 	if($targetName) {
-		array_push($filter, "target_name = '$targetName'");
+		array_push($filter, "target_name IN ('" . join("', '", preg_split("/ ?[;,] ?+/", $targetNames)) . "')");
 	}
 	if($productTypes) {
 		array_push($filter, "dataproduct_type IN ('" . join("', '", explode(';', $productTypes)) . "')");