Display error if resolver or services are not available.

Nathanael Jourdane
1 parent b5d477c6
Showing 2 changed files with 18 additions and 17 deletions Show diff stats
js/app/views/EpnTapUI.js
php/epntap.php
@@ -67,11 +67,15 @@ Ext.create(&#39;Ext.data.Store&#39;, {
 		type: 'ajax',
 		url: 'php/epntap.php',
 		extraParams: { action: 'resolver' }
-		// listeners: {
-		// 	exception: function(proxy, response, operation) {
-		// 		console.log('Error ', response); //TODO: Use ExtJs alert instead
-		// 	}
-		// }
+	},
+	errorDisplayed: false,
+	listeners: {
+		load: function(store, records, successful) {
+			if(!successful && !store.errorDisplayed) {
+				Ext.Msg.alert('Error', 'Can not load results from the resolver. Please enter target names manually.');
+				store.errorDisplayed = true;
+			}
+		}
 	}
 });
  
@@ -121,7 +125,11 @@ Ext.create(&#39;Ext.data.Store&#39;, {
 		{property: 'short_name', direction: 'ASC'}
 	],
 	listeners: {
-		// load: function(record) { console.log(record); }
+		load: function(store, records, successful) {
+			if(!successful) {
+				Ext.Msg.alert('Error', 'Can not get epntap services from registries.');
+			}
+		}
 	}
 });
  
@@ -41,14 +41,8 @@ function resolver() {
 	$resolver_url = "http://voparis-registry.obspm.fr/ssodnet/1/autocomplete?q=%22$lastWord%22";
  
 	$response = ['success' => true, 'metaData' => ['root' => 'data', 'messageProperty' => 'msg']];
-	try {
-		$content = file_get_contents($resolver_url);
-	} catch (Exception $e) {
-		error_log('Resolver access error: ' . $e);
-		$response['success'] = false;
-		$response['msg'] = "Resolver unreachable on $resolver_url.";
-	}
-	try {
+	$content = file_get_contents($resolver_url);
+	if($content) {
 		$result = json_decode($content, true);
 		$targets = array();
 		foreach($result['hits'] as $e) {
@@ -58,10 +52,9 @@ function resolver() {
 			array_push($targets, $target);
 		}
 		$response['data'] = $targets;
-	} catch (Exception $e) {
-		error_log('Resolver type error: ' . $e);
+	} else {
 		$response['success'] = false;
-		$response['msg'] = 'The resolver returned a bad result.';
+		$response['msg'] = "Resolver unreachable on $resolver_url.";
 	}
 	return $response;
 }