From 25b6e891ec569e54f4d4e90870d5f9d9c01cb68c Mon Sep 17 00:00:00 2001
From: Loredana Liccardo <loredana.liccardo@isti.cnr.it>
Date: Mon, 21 Jul 2014 10:53:00 +0000
Subject: [PATCH] update in the SubmitQuery Algorithm changing the field from
 "Query converted" in "Converted Query"

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManagerAlgorithms@98834 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 cfg/transducerers.properties                  | 18 +++++-----
 .../algorithms/drmalgorithms/SubmitQuery.java | 36 +++++++++++++++----
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/cfg/transducerers.properties b/cfg/transducerers.properties
index 9b60003..0ac5ff4 100644
--- a/cfg/transducerers.properties
+++ b/cfg/transducerers.properties
@@ -14,12 +14,12 @@ PRESENCE_CELLS_GENERATION=org.gcube.dataanalysis.ecoengine.transducers.simpleque
 FIN_TAXA_MATCH=org.gcube.dataanalysis.fin.taxamatch.TaxaMatchTransducer
 LISTNAMES_TABLES=org.gcube.dataacces.algorithms.DatabasesResourcesManagerAlgorithms.AbsoluteSpeciesBarChartsAlgorithm
 TEST_ALG=org.gcube.dataacces.algorithms.DatabasesResourcesManagerAlgorithms.SimpleAlg
-LISTDBINFO=org.gcube.dataacces.algorithms.drmalgorithms.ListDBInfo
-LISTDBNAMES=org.gcube.dataacces.algorithms.drmalgorithms.ListNames
-LISTDBSCHEMA=org.gcube.dataacces.algorithms.drmalgorithms.ListSchemas
-LISTTABLES=org.gcube.dataacces.algorithms.drmalgorithms.ListTables
-GETTABLEDETAILS=org.gcube.dataacces.algorithms.drmalgorithms.GetTableDetails
-LISTSUBMITQUERY=org.gcube.dataacces.algorithms.drmalgorithms.SubmitQuery
-SAMPLEONTABLE=org.gcube.dataacces.algorithms.drmalgorithms.SampleOnTable
-SMARTSAMPLEONTABLE=org.gcube.dataacces.algorithms.drmalgorithms.SmartSampleOnTable
-RANDOMSAMPLEONTABLE=org.gcube.dataacces.algorithms.drmalgorithms.RandomSampleOnTable
\ No newline at end of file
+LISTDBINFO=org.gcube.dataaccess.algorithms.drmalgorithms.ListDBInfo
+LISTDBNAMES=org.gcube.dataaccess.algorithms.drmalgorithms.ListNames
+LISTDBSCHEMA=org.gcube.dataaccess.algorithms.drmalgorithms.ListSchemas
+LISTTABLES=org.gcube.dataaccess.algorithms.drmalgorithms.ListTables
+GETTABLEDETAILS=org.gcube.dataaccess.algorithms.drmalgorithms.GetTableDetails
+LISTSUBMITQUERY=org.gcube.dataaccess.algorithms.drmalgorithms.SubmitQuery
+SAMPLEONTABLE=org.gcube.dataaccess.algorithms.drmalgorithms.SampleOnTable
+SMARTSAMPLEONTABLE=org.gcube.dataaccess.algorithms.drmalgorithms.SmartSampleOnTable
+RANDOMSAMPLEONTABLE=org.gcube.dataaccess.algorithms.drmalgorithms.RandomSampleOnTable
\ No newline at end of file
diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java
index 2c27171..f7bac7a 100644
--- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java
+++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java
@@ -164,37 +164,56 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm {
 
 		} catch (HibernateException h) {
 
+//			AnalysisLogger.getLogger().debug(
+//					"In SubmitQuery-> ERROR " + h.getMessage());
+			
 			AnalysisLogger.getLogger().debug(
-					"In SubmitQuery-> ERROR " + h.getMessage());
+					"In SubmitQuery-> " + h.getMessage());
+			
 			throw h;
 		}
 
 		catch (IllegalStateException e) {
 			// e.printStackTrace();
 
+//			AnalysisLogger.getLogger().debug(
+//					"In SubmitQuery-> ERROR " + e.getMessage());
+			
 			AnalysisLogger.getLogger().debug(
-					"In SubmitQuery-> ERROR " + e.getMessage());
+					"In SubmitQuery-> " + e.getMessage());
+			
 			throw e;
 
 		} catch (DiscoveryException e1) {
 			// e1.printStackTrace();
 
+//			AnalysisLogger.getLogger().debug(
+//					"In SubmitQuery-> ERROR " + e1.getMessage());
+			
 			AnalysisLogger.getLogger().debug(
-					"In SubmitQuery-> ERROR " + e1.getMessage());
+					"In SubmitQuery-> " + e1.getMessage());
+			
 			throw e1;
 
 		} catch (InvalidResultException e2) {
 			// e2.printStackTrace();
 
+//			AnalysisLogger.getLogger().debug(
+//					"In SubmitQuery-> ERROR " + e2.getMessage());
+			
 			AnalysisLogger.getLogger().debug(
-					"In SubmitQuery-> ERROR " + e2.getMessage());
+					"In SubmitQuery-> " + e2.getMessage());
+			
 			throw e2;
 
 		} catch (IOException e3) {
 			// e3.printStackTrace();
 
+//			AnalysisLogger.getLogger().debug(
+//					"In SubmitQuery-> ERROR " + e3.getMessage());
+			
 			AnalysisLogger.getLogger().debug(
-					"In SubmitQuery-> ERROR " + e3.getMessage());
+					"In SubmitQuery-> " + e3.getMessage());
 
 			throw e3;
 		}
@@ -202,8 +221,11 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm {
 		catch (Exception e4) {
 			// e4.printStackTrace();
 
+//			AnalysisLogger.getLogger().debug(
+//					"In SubmitQuery-> Exception " + e4.getMessage());
+			
 			AnalysisLogger.getLogger().debug(
-					"In SubmitQuery-> Exception " + e4.getMessage());
+			"In SubmitQuery-> " + e4.getMessage());
 
 			throw e4;
 
@@ -607,7 +629,7 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm {
 
 					PrimitiveType valQuery = new PrimitiveType(
 							String.class.getName(), smartCorrectedQuery,
-							PrimitiveTypes.STRING, "Query Converted",
+							PrimitiveTypes.STRING, "Converted Query",
 							"Query Converted");
 
 					mapResults.put("Query Converted", valQuery);