From fe61b11c54d165f06d9a34ff4cc2fb04d47cdac4 Mon Sep 17 00:00:00 2001
From: Loredana Liccardo <loredana.liccardo@isti.cnr.it>
Date: Thu, 5 Jun 2014 09:03:12 +0000
Subject: [PATCH] some bug fixed in DatabasesResourcesManager class to recover
 a correct result from the submit query (in order to comply with
 AliasToEntityOrderedMapResultTransformer)

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManager@96724 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 log.txt                                       |  3 +
 pom.xml                                       | 12 +--
 .../databases/utils/DatabaseManagement.java   | 83 ++++++++++++++++---
 3 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/log.txt b/log.txt
index 04a9dc3..c2f6b05 100644
--- a/log.txt
+++ b/log.txt
@@ -42,3 +42,6 @@
 928  [main] INFO  org.gcube.common.clients.stubs.jaxws.handlers.HandlerRegistry  - loaded call handler org.gcube.common.clients.stubs.jaxws.handlers.ClientInfoHandler@45f2a7e9
 929  [main] INFO  org.gcube.common.clients.stubs.jaxws.handlers.HandlerRegistry  - loaded call handler org.gcube.common.clients.stubs.jaxws.handlers.LegacyWSAddressingHandler@5eb85400
 1022 [main] INFO  org.gcube.resources.discovery.icclient.ICClient  - executed query declare namespace ic = 'http://gcube-system.org/namespaces/informationsystem/registry'; for $resource in collection('/db/Profiles/RuntimeResource')//Document/Data/ic:Profile/Resource where ($resource/Profile/Category/text() eq 'Database') return $resource in 130 ms
+0    [main] INFO  org.gcube.common.scope.impl.ScopeProviderScanner  - using scope provider org.gcube.common.scope.impl.DefaultScopeProvider@28341db1
+0    [main] INFO  org.gcube.common.scope.impl.ScopeProviderScanner  - using scope provider org.gcube.common.scope.impl.DefaultScopeProvider@75896415
+0    [main] INFO  org.gcube.common.scope.impl.ScopeProviderScanner  - using scope provider org.gcube.common.scope.impl.DefaultScopeProvider@75896415
diff --git a/pom.xml b/pom.xml
index 9f437ed..0d453de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,13 @@
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
 			<version>[1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
+<!-- 			<scope>provided</scope> -->
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>
 			<artifactId>ic-client</artifactId>
 			<version>[1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
+<!-- 			<scope>provided</scope> -->
 
 		</dependency>
 
@@ -35,7 +35,7 @@
 			<groupId>org.gcube.contentmanagement</groupId>
 			<artifactId>storage-manager-wrapper</artifactId>
 			<version>[1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
+<!-- 			<scope>provided</scope> -->
 
 		</dependency>
 		<dependency>
@@ -47,14 +47,14 @@
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope</artifactId>
 			<version>[1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
+<!-- 			<scope>provided</scope> -->
 
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resources</groupId>
 			<artifactId>common-gcore-resources</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
+<!-- 			<scope>provided</scope> -->
 
 		</dependency>
 
@@ -62,7 +62,7 @@
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-encryption</artifactId>
 			<version>[1.0.1-SNAPSHOT,3.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
+<!-- 			<scope>provided</scope> -->
 		</dependency>
 
 		<dependency>
diff --git a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
index f788a45..31fe96e 100644
--- a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
+++ b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
@@ -414,14 +414,36 @@ public class DatabaseManagement {
 					"DatabaseManagement->table's list retrieved");
 
 			tablesname = new ArrayList<String>();
+			
+			for (int i = 0; i < resultSet.size(); i++) {
+				
+				 Object element = resultSet.get(i);
+				 
+				 ArrayList<Object> listvalues = new ArrayList<Object>(
+							((LinkedHashMap<String, Object>) element).values());
+				 
+				 for (int j=0; j<listvalues.size();j++){
 
-			for (Object result : resultSet) {
-				tablesname.add((String) result);
 
-				// AnalysisLogger.getLogger().debug(
-				// "DatabaseManagement->" + (String) result);
+					 tablesname.add(listvalues.get(j).toString());
+					 
+//					 AnalysisLogger.getLogger().debug(
+//					 "DatabaseManagement->" + listvalues.get(j).toString());
 
+					 }
+				
+				
+				
 			}
+			
+
+//			for (Object result : resultSet) {
+//				tablesname.add((String) result);
+//
+//				// AnalysisLogger.getLogger().debug(
+//				// "DatabaseManagement->" + (String) result);
+//
+//			}
 
 		}
 
@@ -446,9 +468,31 @@ public class DatabaseManagement {
 
 			if (resultSet != null) {
 
-				for (Object result : resultSet) {
-					list.add((String) result);
+//				for (Object result : resultSet) {
+//					list.add((String) result);
+//				}
+				
+				for (int i = 0; i < resultSet.size(); i++) {
+					
+					 Object element = resultSet.get(i);
+					 
+					 ArrayList<Object> listvalues = new ArrayList<Object>(
+								((LinkedHashMap<String, Object>) element).values());
+					 
+					 for (int j=0; j<listvalues.size();j++){
+
+
+						 list.add(listvalues.get(j).toString());
+						 
+//						 AnalysisLogger.getLogger().debug(
+//						 "DatabaseManagement->" + listvalues.get(j).toString());
+
+						 }
+					
+					
+					
 				}
+				
 			}
 
 		}
@@ -1235,14 +1279,33 @@ public class DatabaseManagement {
 		if (columnsSet != null) {
 
 			listColumnNamesTable = new ArrayList<String>();
+			
+			for (int i = 0; i < columnsSet.size(); i++) {
+				
+				Object element = columnsSet.get(i);
+				 
+				 ArrayList<Object> listvalues = new ArrayList<Object>(
+							((LinkedHashMap<String, Object>) element).values());
+				 
+				 for (int j=0; j<listvalues.size();j++){
 
-			for (Object column : columnsSet) {
 
-				AnalysisLogger.getLogger().debug(
-						"DatabaseManagement->column name: " + column);
+					 listColumnNamesTable.add(listvalues.get(j).toString());
+					 
+//					 AnalysisLogger.getLogger().debug(
+//					 "DatabaseManagement->" + listvalues.get(j).toString());
 
-				listColumnNamesTable.add((String) column);
+					 }	
+						
 			}
+
+//			for (Object column : columnsSet) {
+//
+//				AnalysisLogger.getLogger().debug(
+//						"DatabaseManagement->column name: " + column);
+//
+//				listColumnNamesTable.add((String) column);
+//			}
 		}
 
 		return listColumnNamesTable;