1.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Wed Nov 07 16:54:47 2012 +0200
     1.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Wed Nov 07 18:48:22 2012 +0200
     1.3 @@ -276,18 +276,25 @@
     1.4  		return status;
     1.5  	}
     1.6  
     1.7 -	private String queryRewriting(String oldQueryString) 
     1.8 +	private String queryRewriting(String queryString) 
     1.9  	{	
    1.10  		//TODO
    1.11  		String newQueryString="";
    1.12  		int numOfQuadruples=0;
    1.13  		int startIndex=0;
    1.14  		
    1.15 +		//remove comments from query
    1.16 +		String REGEX = "((^(\\s)*#)|((\\s)+#)).*$";
    1.17 +		Pattern pattern = Pattern.compile(REGEX, Pattern.MULTILINE);							
    1.18 +		Matcher matcher = pattern.matcher(queryString);
    1.19 +		String oldQueryString=matcher.replaceAll("");
    1.20 +
    1.21 +		
    1.22  		// check whether the query contains quadruples
    1.23  		String URI = "[\\w?/<>^#]+";
    1.24 -		String REGEX = "("+URI+"(\\s)+){3}"+URI+"(\\s)*[.}]{1}";
    1.25 -		Pattern pattern = Pattern.compile(REGEX, Pattern.DOTALL);							
    1.26 -		Matcher matcher = pattern.matcher(oldQueryString);
    1.27 +		REGEX = "("+URI+"(\\s)+){3}"+URI+"(\\s)*[.}]{1}";
    1.28 +		pattern = Pattern.compile(REGEX, Pattern.MULTILINE);							
    1.29 +		matcher = pattern.matcher(oldQueryString);
    1.30  		
    1.31  		while(matcher.find())		
    1.32  		{
    1.33 @@ -312,7 +319,7 @@
    1.34  		if(numOfQuadruples==0)
    1.35  		{
    1.36  			logger.info("\n\nQuadruple not found\n\n");
    1.37 -			return oldQueryString;
    1.38 +			return queryString;
    1.39  		}
    1.40  		else
    1.41  		{