1.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java	Thu Nov 22 12:53:19 2012 +0200
     1.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java	Thu Nov 22 13:15:19 2012 +0200
     1.3 @@ -125,6 +125,7 @@
     1.4  	protected IdSequence ids;
     1.5  
     1.6  	protected HashMap<Integer,String> geoNames = new HashMap<Integer,String>();
     1.7 +	
     1.8  
     1.9  	protected List<GeneralDBSqlExpr> thematicExpressions = new ArrayList<GeneralDBSqlExpr>(5);
    1.10  	
    1.11 @@ -134,6 +135,7 @@
    1.12  	 */ 
    1.13  	public enum ResultType { INTEGER, STRING, BOOLEAN, WKB, DOUBLE, NULL};
    1.14  
    1.15 +	
    1.16  	//used to retrieve the appropriate column in the Binding Iteration
    1.17  	protected HashMap<GeneralDBSpatialFuncInfo, Integer> constructIndexesAndNames = new HashMap<GeneralDBSpatialFuncInfo, Integer>();
    1.18  	//private HashMap<String, Integer> constructIndexesAndNames = new HashMap<String, Integer>();
    1.19 @@ -142,6 +144,9 @@
    1.20  	//	private HashMap<String, Integer> boolPropertiesIndexesAndNames = new HashMap<String, Integer>();
    1.21  	//	private HashMap<String, Integer> stringPropertiesIndexesAndNames = new HashMap<String, Integer>();
    1.22  
    1.23 +	protected HashMap<Integer,String> temporalVars = new HashMap<Integer,String>();
    1.24 +
    1.25 +	
    1.26  	public GeneralDBEvaluation(GeneralDBQueryBuilderFactory factory, GeneralDBTripleRepository triples, Dataset dataset,
    1.27  			IdSequence ids)
    1.28  	{
    1.29 @@ -718,6 +723,12 @@
    1.30  							//I am carrying SRID too! Therefore, shifting index one more position
    1.31  							index++;
    1.32  						}
    1.33 +						else if(var.isTemporal()) //i metavliti mpore na einai eite spatial eite temporal
    1.34 +						{
    1.35 +							this.temporalVars.put(var.getIndex()+1,var.getName());
    1.36 +							//no SRID here, a single shift is needed
    1.37 +							index++;
    1.38 +						}
    1.39  						query.select(proj.getId());
    1.40  						query.select(proj.getStringValue());
    1.41  						index += 2;

     2.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISEvaluation.java	Thu Nov 22 12:53:19 2012 +0200
     2.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISEvaluation.java	Thu Nov 22 13:15:19 2012 +0200
     2.3 @@ -73,7 +73,7 @@
     2.4  				//XXX addition
     2.5  				result.setGeoNames(this.geoNames);
     2.6  				result.setConstructIndexesAndNames(this.constructIndexesAndNames);
     2.7 -				
     2.8 +				//XXX addition- constant
     2.9  				if (logger.isDebugEnabled()) {
    2.10  					logger.debug("In PostGIS Evaluation, query is: \n{}", stmt);
    2.11  				}