Author: rwesten
Date: Wed Nov 6 13:29:29 2013
New Revision: 1539336
URL: http://svn.apache.org/r1539336
Log:
fix for STANBOL-1204 in the trunk
Modified:
stanbol/trunk/entityhub/query/sparql/src/main/java/org/apache/stanbol/entityhub/query/sparql/SparqlQueryUtils.java
Modified:
stanbol/trunk/entityhub/query/sparql/src/main/java/org/apache/stanbol/entityhub/query/sparql/SparqlQueryUtils.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/query/sparql/src/main/java/org/apache/stanbol/entityhub/query/sparql/SparqlQueryUtils.java?rev=1539336&r1=1539335&r2=1539336&view=diff
==============================================================================
---
stanbol/trunk/entityhub/query/sparql/src/main/java/org/apache/stanbol/entityhub/query/sparql/SparqlQueryUtils.java
(original)
+++
stanbol/trunk/entityhub/query/sparql/src/main/java/org/apache/stanbol/entityhub/query/sparql/SparqlQueryUtils.java
Wed Nov 6 13:29:29 2013
@@ -752,6 +752,9 @@ public final class SparqlQueryUtils {
if (constraint.getPatternType() == PatternType.none) {
if (constraint.isCaseSensitive()) {
boolean first = true;
+ if(constraint.getTexts().size() > 1){
+ queryString.append('('); //start language
filter group (STANBOL-1204)
+ }
for (String textConstraint :
constraint.getTexts()) {
if (first) {
first = false;
@@ -764,6 +767,9 @@ public final class SparqlQueryUtils {
queryString.append("\")");
}
}
+ if(constraint.getTexts().size() > 1){
+ queryString.append(')'); //end language filter
group (STANBOL-1204)
+ }
} else {
Collection<String> regexQueryTexts = new
ArrayList<String>(
constraint.getTexts().size());
@@ -795,7 +801,6 @@ public final class SparqlQueryUtils {
}
}
} // else nothing to do add language Filters
- // TODO check if FILTER ( is already written!
if (constraint.getLanguages() != null &&
!constraint.getLanguages().isEmpty()) {
log.trace("Constraint has languages [filter-added :: {}].",
@@ -916,6 +921,9 @@ public final class SparqlQueryUtils {
Collection<String> regexContraints,
boolean isCasesensitive) {
boolean first = true;
+ if(regexContraints.size() > 1){
+ queryString.append('('); //STANBOL-1204
+ }
for (String regex : regexContraints) {
if (regex != null && !regex.isEmpty()) {
if (first) {
@@ -932,6 +940,9 @@ public final class SparqlQueryUtils {
queryString.append(')');
}
}
+ if(regexContraints.size() > 1){
+ queryString.append(')'); //STANBOL-1204
+ }
}
/**
