From 385eaa96145f8237712040df3d68ca3591c186b5 Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Tue, 16 Feb 2016 13:59:48 +0000
Subject: [PATCH] Minor fixes

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/social-networking/social-data-indexer-se-plugin@124219 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../SocialDataIndexerPlugin.java              | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/gcube/socialnetworking/socialdataindexer/SocialDataIndexerPlugin.java b/src/main/java/org/gcube/socialnetworking/socialdataindexer/SocialDataIndexerPlugin.java
index d77a73f..c9f9bc2 100644
--- a/src/main/java/org/gcube/socialnetworking/socialdataindexer/SocialDataIndexerPlugin.java
+++ b/src/main/java/org/gcube/socialnetworking/socialdataindexer/SocialDataIndexerPlugin.java
@@ -98,10 +98,14 @@ public class SocialDataIndexerPlugin extends Plugin<SocialDataIndexerPluginDecla
 		ElasticSearchRunningCluster elasticCluster;
 
 		try {
+			
 			elasticCluster = new ElasticSearchRunningCluster(scope);
+			
 		} catch (Exception e1) {
+			
 			logger.error(e1.toString());
 			return;
+			
 		}
 
 		// save info
@@ -118,7 +122,7 @@ public class SocialDataIndexerPlugin extends Plugin<SocialDataIndexerPluginDecla
 		// Look at https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/transport-client.html
 		Settings settings = Settings.settingsBuilder()
 				.put("cluster.name", this.clusterName) // force unique cluster's name check
-				//.put("client.transport.sniff", true) -> unneeded since we pass all the cluster's nodes
+				.put("client.transport.sniff", true)
 				.build();
 
 		// build the client
@@ -136,7 +140,6 @@ public class SocialDataIndexerPlugin extends Plugin<SocialDataIndexerPluginDecla
 			} catch (UnknownHostException e) {
 
 				logger.error("Error while adding " + hostsToContact.get(i) + ":" + portNumbers.get(i) + " as host to be contacted.");
-				return;
 
 			}
 		}
@@ -152,8 +155,10 @@ public class SocialDataIndexerPlugin extends Plugin<SocialDataIndexerPluginDecla
 			vreIds = store.getAllVREIds();
 
 		} catch (ConnectionException e) {
+			
 			logger.error("Unable to retrieve vres' ids", e);
 			return;
+			
 		}
 
 		// save feeds & comments
@@ -173,8 +178,8 @@ public class SocialDataIndexerPlugin extends Plugin<SocialDataIndexerPluginDecla
 
 			}catch(Exception e){
 
-				logger.debug("Exception while saving feeds/comments into the index", e);
-				return;
+				logger.debug("Exception while saving feeds/comments into the index for vre " + vreID, e);
+				continue;
 			}
 
 		}
@@ -300,7 +305,7 @@ public class SocialDataIndexerPlugin extends Plugin<SocialDataIndexerPluginDecla
 
 		for (Feed feed : toEnhance) {
 
-			// skip disabled feeds but delete from the index
+			// skip disabled feeds but delete from the index (they could be present)
 			if(feed.getType().equals(FeedType.DISABLED)){
 
 				deleteDocument(feed.getKey());
@@ -313,12 +318,18 @@ public class SocialDataIndexerPlugin extends Plugin<SocialDataIndexerPluginDecla
 			// retrieve attachments
 			ArrayList<Attachment> attachments = new ArrayList<Attachment>();
 			if (isMultiFileUpload) {
+				
 				logger.debug("Retrieving attachments for feed with id="+feed.getKey());
+				
 				try {
+					
 					attachments = (ArrayList<Attachment>) store.getAttachmentsByFeedId(feed.getKey());
+					
 				} catch (FeedIDNotFoundException e) {
+					
 					logger.error("It looks like sth wrong with this feedid having attachments, could not find feedId = " + feed.getKey() + "\n" + e.getMessage());
 					continue;
+					
 				}
 			}