Strabon

changeset 1233:6f23ffd29a1e

merge
author Stella Giannakopoulou <sgian@di.uoa.gr>
date Thu Jul 18 13:11:45 2013 +0300 (2013-07-18)
parents 80caaccb3761 866bf84309ae
children 7728e6f633ca
files
line diff
     1.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISEvaluation.java	Thu Jul 18 13:11:00 2013 +0300
     1.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISEvaluation.java	Thu Jul 18 13:11:45 2013 +0300
     1.3 @@ -70,7 +70,9 @@
     1.4  					stmt.setObject(++p, o);
     1.5  				}
     1.6  				Collection<GeneralDBColumnVar> proj = qb.getProjections();
     1.7 -				logger.debug("In PostGIS Evaluation, query is: \n{}", stmt);
     1.8 +				if (logger.isDebugEnabled()) {
     1.9 +					logger.debug("In PostGIS Evaluation, query is: \n{}", stmt);
    1.10 +				}
    1.11  				GeneralDBBindingIteration result = new PostGISBindingIteration(stmt);
    1.12  				result.setProjections(proj);
    1.13  				result.setBindings(bindings);
    1.14 @@ -80,9 +82,6 @@
    1.15  				result.setGeoNames(this.geoNames);
    1.16  				result.setConstructIndexesAndNames(this.constructIndexesAndNames);
    1.17  				
    1.18 -				//if (logger.isDebugEnabled()) {
    1.19 -				//	logger.debug("In PostGIS Evaluation, query is: \n{}", stmt);
    1.20 -				//}
    1.21  				return result;
    1.22  			}
    1.23  			catch (SQLException e) {
     2.1 --- a/scripts/endpoint	Thu Jul 18 13:11:00 2013 +0300
     2.2 +++ b/scripts/endpoint	Thu Jul 18 13:11:45 2013 +0300
     2.3 @@ -97,22 +97,23 @@
     2.4  DEBUG=0
     2.5  # set default limit
     2.6  MAXLIMIT=0
     2.7 -case "${1}" in
     2.8 -	-d)
     2.9 -		shift
    2.10 -		DEBUG=1
    2.11 -		;;
    2.12 -	-i)
    2.13 -		shift
    2.14 -		PREFIXES="$(cat ${PREFIXES_FILE})
    2.15 -"
    2.16 -		;;
    2.17 -	-l)
    2.18 -		MAXLIMIT="${2}"	
    2.19 -		shift
    2.20 -		shift
    2.21 -		;;
    2.22 -esac
    2.23 +while test $# -gt 0 -a "X${1:0:1}" == "X-"; do
    2.24 +	case "${1}" in
    2.25 +		-d)
    2.26 +			shift
    2.27 +			DEBUG=1
    2.28 +			;;
    2.29 +		-i)
    2.30 +			shift
    2.31 +			PREFIXES="$(cat ${PREFIXES_FILE})"
    2.32 +			;;
    2.33 +		-l)
    2.34 +			MAXLIMIT="${2}"	
    2.35 +			shift
    2.36 +			shift
    2.37 +			;;
    2.38 +	esac
    2.39 +done
    2.40  
    2.41  case "${1}" in
    2.42  	help)
    2.43 @@ -193,7 +194,7 @@
    2.44  				;;
    2.45  		esac
    2.46  
    2.47 -		EXEC="curl -H 'Content-Type:application/x-www-form-urlencoded' -H 'Accept:${MIME_TYPE}' --data-urlencode query='${QUERY}' --data maxLimit='${MAXLIMIT}' ${URL}"
    2.48 +		EXEC="curl -H 'Content-Type:application/x-www-form-urlencoded' -H 'Accept:${MIME_TYPE}' --data-urlencode query='${PREFIXES}${QUERY}' --data maxLimit='${MAXLIMIT}' ${URL}"
    2.49  		;;
    2.50  	queryfile)
    2.51  		shift