1.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBSqlTable.java	Tue Sep 16 23:11:40 2014 +0300
     1.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBSqlTable.java	Tue Sep 16 23:14:57 2014 +0300
     1.3 @@ -12,11 +12,11 @@
     1.4  /**
     1.5   * Converts table names to lower-case and include the analyse optimisation.
     1.6   * 
     1.7 - * @author James Leigh
     1.8 - * 
     1.9 + * @author George Garbis <ggarbis@di.uoa.gr>
    1.10 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    1.11   */
    1.12  public abstract class GeneralDBSqlTable extends RdbmsTable {
    1.13 -
    1.14 +	
    1.15  	public GeneralDBSqlTable(String name) {
    1.16  		super(name.toLowerCase());
    1.17  	}

     2.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java	Tue Sep 16 23:11:40 2014 +0300
     2.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java	Tue Sep 16 23:14:57 2014 +0300
     2.3 @@ -372,13 +372,13 @@
     2.4  	 * FIXME my addition
     2.5  	 * @throws ParseException 
     2.6  	 */
     2.7 -
     2.8  	public GeneralDBPolyhedron getRdbmsPolyhedron(Number num, String datatype, byte[] wkb, int srid)  {
     2.9  
    2.10  		Number id = ids.idOf(num);
    2.11  		try {
    2.12 -			if(wkb != null)
    2.13 +			if(wkb != null) {
    2.14  				return new GeneralDBPolyhedron(id, literals.getIdVersion(), vf.createURI(datatype), wkb, srid);
    2.15 +			}
    2.16  		} catch (IOException e) {
    2.17  			e.printStackTrace();
    2.18  		} catch (ClassNotFoundException e) {
    2.19 @@ -386,20 +386,4 @@
    2.20  		}
    2.21  		return null;
    2.22  	}
    2.23 -	
    2.24 -//	public GeneralDBPolyhedron getRdbmsPolyhedron(Number num, String datatype, String pointSet) {
    2.25 -//
    2.26 -//		Number id = ids.idOf(num);
    2.27 -//		try {
    2.28 -//			return new GeneralDBPolyhedron(id, literals.getIdVersion(), vf.createURI(datatype), pointSet);
    2.29 -//		} catch (IOException e) {
    2.30 -//			e.printStackTrace();
    2.31 -//		} catch (ClassNotFoundException e) {
    2.32 -//			e.printStackTrace();
    2.33 -//		}
    2.34 -//		return null;
    2.35 -//	}
    2.36 -	/**
    2.37 -	 * 
    2.38 -	 */
    2.39  }

     3.1 --- a/monetdb/src/main/java/org/openrdf/sail/monetdb/evaluation/MonetDBQueryBuilder.java	Tue Sep 16 23:11:40 2014 +0300
     3.2 +++ b/monetdb/src/main/java/org/openrdf/sail/monetdb/evaluation/MonetDBQueryBuilder.java	Tue Sep 16 23:14:57 2014 +0300
     3.3 @@ -397,7 +397,7 @@
     3.4  
     3.5  		//SRID support must be explicitly added!
     3.6  		return this;
     3.7 -			}
     3.8 +	}
     3.9  
    3.10  	
    3.11  	@Override

     4.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java	Tue Sep 16 23:11:40 2014 +0300
     4.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java	Tue Sep 16 23:14:57 2014 +0300
     4.3 @@ -130,6 +130,7 @@
     4.4  	public static final String ST_ASBINARY		= "ST_AsBinary";
     4.5  	public static final String GEOGRAPHY		= "Geography";
     4.6  	public static final String GEOMETRY			= "Geometry";
     4.7 +	
     4.8  	/**
     4.9  	 * If (spatial) label column met is null, I must not try to retrieve its srid. 
    4.10  	 * Opting to ask for 'null' instead
    4.11 @@ -827,21 +828,20 @@
    4.12  		appendGeneralDBSpatialFunctionUnary(expr, filter, SpatialFunctionsPostGIS.ST_AsGML);
    4.13  	}
    4.14  
    4.15 -	//	@Override
    4.16 -	//	protected void append(GeneralDBSqlGeoSrid expr, GeneralDBSqlExprBuilder filter)
    4.17 -	//	throws UnsupportedRdbmsOperatorException
    4.18 -	//	{
    4.19 -	//		appendGeneralDBSpatialFunctionUnary(expr, filter, SpatialFunctionsPostGIS.ST_SRID);
    4.20 -	//	}
    4.21 -
    4.22 +/*	
    4.23 +   @Override
    4.24 +	protected void append(GeneralDBSqlGeoSrid expr, GeneralDBSqlExprBuilder filter)
    4.25 +	throws UnsupportedRdbmsOperatorException
    4.26 +	{
    4.27 +		appendGeneralDBSpatialFunctionUnary(expr, filter, SpatialFunctionsPostGIS.ST_SRID);
    4.28 +	}
    4.29 +*/
    4.30  	/**
    4.31 -	 * Special Case because I need to retrieve a single different column from geo_values when this function occurs
    4.32 -	 * in the select clause
    4.33 +	 * Special case because I need to retrieve a single different column from geo_values when this function occurs
    4.34 +	 * in the select clause and not call the st_srid() function, which will always give me 4326.
    4.35  	 */
    4.36  	@Override
    4.37 -	protected void append(GeneralDBSqlGeoSrid expr, GeneralDBSqlExprBuilder filter)
    4.38 -			throws UnsupportedRdbmsOperatorException
    4.39 -			{
    4.40 +	protected void append(GeneralDBSqlGeoSrid expr, GeneralDBSqlExprBuilder filter) throws UnsupportedRdbmsOperatorException {
    4.41  		boolean sridNeeded = true;
    4.42  		filter.openBracket();
    4.43  
    4.44 @@ -905,6 +905,7 @@
    4.45  							alias=alias+".srid";
    4.46  						}
    4.47  						sridExpr = alias;
    4.48 +						
    4.49  						filter.append(sridExpr);
    4.50  						filter.closeBracket();
    4.51  						return;
    4.52 @@ -960,7 +961,7 @@
    4.53  		}
    4.54  
    4.55  		filter.closeBracket();
    4.56 -			}
    4.57 +	}
    4.58  
    4.59  	@Override
    4.60  	protected void append(GeneralDBSqlGeoIsSimple expr, GeneralDBSqlExprBuilder filter)
    4.61 @@ -2197,7 +2198,7 @@
    4.62  			filter.openBracket();
    4.63  			if(expr.getArg() instanceof GeneralDBStringValue)
    4.64  			{
    4.65 -				appendWKT(expr.getArg(),filter);
    4.66 +				appendWKT(expr.getArg(), filter);
    4.67  			}
    4.68  			else if(expr.getArg() instanceof GeneralDBSqlSpatialConstructBinary)
    4.69  			{
    4.70 @@ -2214,7 +2215,7 @@
    4.71  			else if(expr.getArg() instanceof GeneralDBSqlCase)
    4.72  			{
    4.73  				GeneralDBLabelColumn onlyLabel = (GeneralDBLabelColumn)((GeneralDBSqlCase)expr.getArg()).getEntries().get(0).getResult();
    4.74 -				appendMBB(onlyLabel,filter); 
    4.75 +				appendMBB(onlyLabel, filter); 
    4.76  			}
    4.77  			else
    4.78  			{