1.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Mon Nov 19 17:32:11 2012 +0200
     1.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Tue Nov 20 13:41:20 2012 +0200
     1.3 @@ -24,6 +24,7 @@
     1.4  import java.util.ArrayList;
     1.5  import java.util.Collection;
     1.6  import java.util.Iterator;
     1.7 +import java.util.Random;
     1.8  import java.util.regex.Matcher;
     1.9  import java.util.regex.Pattern;
    1.10  
    1.11 @@ -285,6 +286,14 @@
    1.12  		
    1.13  		try
    1.14  		{
    1.15 +
    1.16 +			String graphVariable="?g"+(int)(Math.random()*10000);
    1.17 +			while (queryString.contains(graphVariable))
    1.18 +			{
    1.19 +				graphVariable+="1";
    1.20 +			}
    1.21 +			graphVariable+="_";
    1.22 +			
    1.23  			//remove comments from query
    1.24  			String REGEX = "((^(\\s)*#)|((\\s)+#)).*$";
    1.25  			Pattern pattern = Pattern.compile(REGEX, Pattern.MULTILINE);							
    1.26 @@ -317,8 +326,8 @@
    1.27  				//s p o c  --becomes--> GRAPH ?g(numOfQuadruples) {s p o}
    1.28  				//                      ?g(numOfQuadruples) strdf:hasValidTime c
    1.29  				String[] token = quadruple.split("(\\s)+");
    1.30 -				newQueryString+="\n GRAPH ?g"+numOfQuadruples+" { " +token[0]+" "+token[1]+" "+token[2]+" .}\n";
    1.31 -				newQueryString+="?g"+numOfQuadruples+" strdf:hasValidTime";
    1.32 +				newQueryString+="\n GRAPH "+graphVariable+numOfQuadruples+" { " +token[0]+" "+token[1]+" "+token[2]+" .}\n";
    1.33 +				newQueryString+=graphVariable+numOfQuadruples+" strdf:hasValidTime";
    1.34  				
    1.35  	
    1.36  				//add the rest tokens