Changeset 1084:c8f7bc3e7c1c


Ignore:
Timestamp:
04/26/13 19:49:12 (6 years ago)
Author:
Babis Nikolaou <charnik@…>
Branch:
default
Parents:
1083:0944a501d988 (diff), 1082:fb73954c4f91 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge with default

Files:
7 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java

    r1039 r1084  
    9494import org.openrdf.sail.generaldb.algebra.GeneralDBURIColumn; 
    9595import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 
     96import org.openrdf.sail.generaldb.exceptions.UnsupportedExtensionFunctionException; 
    9697import org.openrdf.sail.generaldb.model.GeneralDBPolyhedron; 
    9798import org.openrdf.sail.generaldb.schema.IdSequence; 
     
    248249                 
    249250                if (function == null) { 
    250                         logger.warn("[Strabon.evaluation(FunctionCall)] Extension function <{}> is not supported.", fc.getURI()); 
    251                         return null; 
     251                        throw new UnsupportedExtensionFunctionException("Extension function " + fc.getURI()+ " is not supported."); 
    252252                } 
    253253                 
  • generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java

    r1083 r1084  
    8686import org.openrdf.sail.generaldb.algebra.GeneralDBSqlNot; 
    8787import org.openrdf.sail.generaldb.algebra.GeneralDBSqlSpatialConstructBinary; 
     88import org.openrdf.sail.generaldb.algebra.GeneralDBSqlSpatialConstructTriple; 
    8889import org.openrdf.sail.generaldb.algebra.GeneralDBSqlSpatialConstructUnary; 
    8990import org.openrdf.sail.generaldb.algebra.GeneralDBSqlSpatialMetricBinary; 
     
    817818                        locateColumnVars(((GeneralDBSqlSpatialConstructUnary)expr).getArg(),allKnown); 
    818819                } 
     820                else if(expr instanceof GeneralDBSqlSpatialConstructTriple) 
     821                { 
     822                        locateColumnVars(((GeneralDBSqlSpatialConstructTriple)expr).getLeftArg(),allKnown); 
     823                        locateColumnVars(((GeneralDBSqlSpatialConstructTriple)expr).getRightArg(),allKnown); 
     824                        locateColumnVars(((GeneralDBSqlSpatialConstructTriple)expr).getThirdArg(),allKnown); 
     825                } 
    819826                /** Addition for datetime metric functions 
    820827                 *  
     
    986993 
    987994                } 
    988                 else if(expr instanceof GeneralDBSqlSpatialConstructBinary || 
    989                                 expr instanceof GeneralDBSqlSpatialConstructUnary) 
     995                else if(expr instanceof GeneralDBSqlSpatialConstructBinary || expr instanceof GeneralDBSqlSpatialConstructUnary || expr instanceof GeneralDBSqlSpatialConstructTriple) 
    990996                { 
    991997                        return ResultType.WKB; 
Note: See TracChangeset for help on using the changeset viewer.