Strabon

changeset 1058:1382b01c2060

now stdf:buffer can be nested in any function
author Stella Giannakopoulou <sgian@di.uoa.gr>
date Mon Apr 22 03:07:11 2013 +0300 (2013-04-22)
parents ef787b84dbe2
children b903c47cc189
files postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java
line diff
     1.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java	Sun Apr 21 16:31:22 2013 +0300
     1.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java	Mon Apr 22 03:07:11 2013 +0300
     1.3 @@ -2159,6 +2159,10 @@
     1.4  			{
     1.5  				appendConstructFunction(expr.getArg(), filter);
     1.6  			}
     1.7 +			else if(expr.getArg() instanceof GeneralDBSqlSpatialConstructTriple)
     1.8 +			{
     1.9 +				appendConstructFunction(expr.getArg(), filter);
    1.10 +			}
    1.11  			else if(expr.getArg() instanceof GeneralDBSqlCase)
    1.12  			{
    1.13  				GeneralDBLabelColumn onlyLabel = (GeneralDBLabelColumn)((GeneralDBSqlCase)expr.getArg()).getEntries().get(0).getResult();
    1.14 @@ -2235,6 +2239,10 @@
    1.15  			{
    1.16  				appendConstructFunction(expr.getLeftArg(), filter);
    1.17  			}
    1.18 +			else if(expr.getLeftArg() instanceof GeneralDBSqlSpatialConstructTriple)
    1.19 +			{
    1.20 +				appendConstructFunction(expr.getLeftArg(), filter);
    1.21 +			}
    1.22  			else if(expr.getLeftArg() instanceof GeneralDBSqlCase)
    1.23  			{
    1.24  				GeneralDBLabelColumn onlyLabel = (GeneralDBLabelColumn)((GeneralDBSqlCase)expr.getLeftArg()).getEntries().get(0).getResult();
    1.25 @@ -2264,6 +2272,10 @@
    1.26  			{
    1.27  				appendConstructFunction(expr.getRightArg(), filter);
    1.28  			}
    1.29 +			else if(expr.getLeftArg() instanceof GeneralDBSqlSpatialConstructTriple)
    1.30 +			{
    1.31 +				appendConstructFunction(expr.getLeftArg(), filter);
    1.32 +			}
    1.33  			else if(expr.getRightArg() instanceof GeneralDBSqlCase)
    1.34  			{
    1.35  				GeneralDBLabelColumn onlyLabel = (GeneralDBLabelColumn)((GeneralDBSqlCase)expr.getRightArg()).getEntries().get(0).getResult();
    1.36 @@ -2394,6 +2406,10 @@
    1.37  			{
    1.38  				appendConstructFunction(expr.getRightArg(), filter);
    1.39  			}
    1.40 +			else if(expr.getRightArg() instanceof GeneralDBSqlSpatialConstructTriple)
    1.41 +			{
    1.42 +				appendConstructFunction(expr.getRightArg(), filter);				
    1.43 +			}
    1.44  			else if(expr.getRightArg() instanceof GeneralDBSqlCase)
    1.45  			{
    1.46  				GeneralDBLabelColumn onlyLabel = (GeneralDBLabelColumn)((GeneralDBSqlCase)expr.getRightArg()).getEntries().get(0).getResult();
    1.47 @@ -2827,8 +2843,6 @@
    1.48  		else
    1.49  		{	
    1.50  			filter.appendFunction("ST_Relate");
    1.51 -
    1.52 -
    1.53  			filter.openBracket();
    1.54  			if(expr.getLeftArg() instanceof GeneralDBStringValue)
    1.55  			{
    1.56 @@ -2842,6 +2856,10 @@
    1.57  			{
    1.58  				appendConstructFunction(expr.getLeftArg(), filter);
    1.59  			}
    1.60 +			else if(expr.getLeftArg() instanceof GeneralDBSqlSpatialConstructTriple)
    1.61 +			{
    1.62 +				appendConstructFunction(expr.getLeftArg(), filter);
    1.63 +			}
    1.64  			else if(expr.getLeftArg() instanceof GeneralDBSqlCase)
    1.65  			{
    1.66  				GeneralDBLabelColumn onlyLabel = (GeneralDBLabelColumn)((GeneralDBSqlCase)expr.getLeftArg()).getEntries().get(0).getResult();
    1.67 @@ -2871,6 +2889,11 @@
    1.68  				{
    1.69  					appendConstructFunction(expr.getRightArg(), filter);
    1.70  				}
    1.71 +				
    1.72 +				else if(expr.getRightArg() instanceof GeneralDBSqlSpatialConstructTriple)
    1.73 +				{
    1.74 +					appendConstructFunction(expr.getRightArg(), filter);
    1.75 +				}
    1.76  				else if(expr.getRightArg() instanceof GeneralDBSqlCase)
    1.77  				{
    1.78  					GeneralDBLabelColumn onlyLabel = (GeneralDBLabelColumn)((GeneralDBSqlCase)expr.getRightArg()).getEntries().get(0).getResult();