Strabon

changeset 1188:94f44f1044be

Minor changes: fix code about logging
author George Garbis <ggarbis@di.uoa.gr>
date Thu Jul 04 17:56:41 2013 +0300 (2013-07-04)
parents 27ac0e47c761
children c99b065768d9
files generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISEvaluation.java
line diff
     1.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java	Thu Jul 04 17:53:07 2013 +0300
     1.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java	Thu Jul 04 17:56:41 2013 +0300
     1.3 @@ -121,7 +121,7 @@
     1.4   */
     1.5  public abstract class GeneralDBEvaluation extends EvaluationStrategyImpl {
     1.6  
     1.7 -	private static final Logger logger = LoggerFactory.getLogger(org.openrdf.sail.generaldb.evaluation.GeneralDBEvaluation.class);;
     1.8 +	private static final Logger logger = LoggerFactory.getLogger(org.openrdf.sail.generaldb.evaluation.GeneralDBEvaluation.class);
     1.9  
    1.10  	protected GeneralDBQueryBuilderFactory factory;
    1.11  
     2.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISEvaluation.java	Thu Jul 04 17:53:07 2013 +0300
     2.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISEvaluation.java	Thu Jul 04 17:56:41 2013 +0300
     2.3 @@ -33,8 +33,9 @@
     2.4  import org.openrdf.sail.rdbms.exceptions.RdbmsQueryEvaluationException;
     2.5  import org.openrdf.sail.rdbms.exceptions.UnsupportedRdbmsOperatorException;
     2.6  import org.openrdf.sail.generaldb.schema.IdSequence;
     2.7 +import org.slf4j.LoggerFactory;
     2.8  import org.slf4j.Logger;
     2.9 -import org.slf4j.LoggerFactory;
    2.10 +
    2.11  
    2.12  /**
    2.13   * Extends the default strategy by accepting {@link GeneralDBSelectQuery} and evaluating
    2.14 @@ -45,9 +46,10 @@
    2.15   */
    2.16  public class PostGISEvaluation extends GeneralDBEvaluation {
    2.17  
    2.18 -	private static final Logger logger = LoggerFactory.getLogger(org.openrdf.sail.postgis.evaluation.PostGISEvaluation.class);
    2.19 +	private static final Logger logger = LoggerFactory.getLogger(PostGISEvaluation.class);
    2.20  
    2.21 -	public PostGISEvaluation(GeneralDBQueryBuilderFactory factory, GeneralDBTripleRepository triples, Dataset dataset, IdSequence ids)
    2.22 +	public PostGISEvaluation(GeneralDBQueryBuilderFactory factory, GeneralDBTripleRepository triples, Dataset dataset,
    2.23 +			IdSequence ids)
    2.24  	{
    2.25  		super(factory, triples, dataset, ids);
    2.26  		this.factory = factory;
    2.27 @@ -68,19 +70,19 @@
    2.28  					stmt.setObject(++p, o);
    2.29  				}
    2.30  				Collection<GeneralDBColumnVar> proj = qb.getProjections();
    2.31 -//				System.out.println("In PostGIS Evaluation, query is: \n" + stmt);
    2.32 +				logger.debug("In PostGIS Evaluation, query is: \n{}", stmt);
    2.33  				GeneralDBBindingIteration result = new PostGISBindingIteration(stmt);
    2.34  				result.setProjections(proj);
    2.35  				result.setBindings(bindings);
    2.36  				result.setValueFactory(vf);
    2.37  				result.setIdSequence(ids);
    2.38 -				// addition
    2.39 +				//XXX addition
    2.40  				result.setGeoNames(this.geoNames);
    2.41  				result.setConstructIndexesAndNames(this.constructIndexesAndNames);
    2.42  				
    2.43 -				if (logger.isDebugEnabled()) {
    2.44 -					logger.debug("In PostGIS Evaluation, query is: \n{}", stmt);
    2.45 -				}
    2.46 +				//if (logger.isDebugEnabled()) {
    2.47 +				//	logger.debug("In PostGIS Evaluation, query is: \n{}", stmt);
    2.48 +				//}
    2.49  				return result;
    2.50  			}
    2.51  			catch (SQLException e) {