Merge pull request #11 from openworm/development

Release 0.3.3

Author: tarelli

pom.xml

@@ -5,7 +5,7 @@
 	<groupId>org.geppetto</groupId>
 	<artifactId>datasources</artifactId>
 	<name>Geppetto Data Sources bundle</name>
-	<version>0.3.2</version>
+	<version>0.3.3</version>
 	<packaging>bundle</packaging>
 	<properties>
 		<spring.version>3.1.3.RELEASE</spring.version>

src/main/java/org/geppetto/datasources/ExecuteMultipleQueriesVisitor.java

@@ -148,6 +148,7 @@ public QueryResults getResults() throws GeppettoDataSourceException
 
 		if(results.keySet().size() > 1)
 		{
+			boolean first = true;
 			for(QueryResults result : results.keySet())
 			{
 				if(finalResults.getHeader().isEmpty())
@@ -165,13 +166,38 @@ public QueryResults getResults() throws GeppettoDataSourceException
 				switch(o)
 				{
 					case AND:
-						System.out.println("IDs " + ids.get(result).size());
-						System.out.println("Results " + result.getResults().size());
+						if(first)
+						{
+							for(String id : ids.get(result))
+							{
+
+								finalResults.getResults().add(result.getResults().get(0)); // Note this will move the element from one list to another (EMF implementation) so although we always access
+																							// the 0th element it's always a different one
+								finalIds.add(id);
+
+							}
+						}
+						List<String> toRemove = new ArrayList<String>();
+						for(String id : finalIds)
+						{
+							if(!ids.get(result).contains(id)) 
+							{
+								toRemove.add(id);
+							}
+						}
+						for(String id : toRemove)
+						{
+							finalResults.getResults().remove(finalIds.indexOf(id));
+							finalIds.remove(id);
+						}
+						break;
+					case OR:
 						for(String id : ids.get(result))
 						{
 							if(!finalIds.contains(id))
 							{
-								finalResults.getResults().add(result.getResults().get(0)); //Note this will move the element from one list to another (EMF implementation) so although we always access the 0th element it's always a different one
+								finalResults.getResults().add(result.getResults().get(0)); // Note this will move the element from one list to another (EMF implementation) so although we always access
+																							// the 0th element it's always a different one
 								finalIds.add(id);
 							}
 						}
@@ -187,6 +213,7 @@ public QueryResults getResults() throws GeppettoDataSourceException
 						}
 						break;
 				}
+				first = false;
 			}
 		}
 		else