unico 2004/11/01 03:01:44
Modified: src/stores/org/apache/slide/store/impl/rdbms/expression Tag:
SLIDE_2_1_RELEASE_BRANCH
RDBMSCompareExpression.java
RDBMSPropContainsExpression.java
RDBMSNotPropContainsExpression.java
Log:
normalize <literal> text
Revision Changes Path
No revision
No revision
1.4.2.3 +4 -4
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSCompareExpression.java
Index: RDBMSCompareExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSCompareExpression.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- RDBMSCompareExpression.java 1 Nov 2004 10:52:52 -0000 1.4.2.2
+++ RDBMSCompareExpression.java 1 Nov 2004 11:01:44 -0000 1.4.2.3
@@ -87,7 +87,7 @@
return "(p" + _tableIndex + ".PROPERTY_NAME = '" + getPropertyName() + "'
AND " +
"p" + _tableIndex + ".PROPERTY_NAMESPACE = '" +
getPropertyNamespace() + "' AND " +
"p" + _tableIndex + ".PROPERTY_VALUE " +
COMPARE_OPERATORS.get(_element.getName())
- + " '" + literal.getText() + "')";
+ + " '" + literal.getTextNormalize() + "')";
}
protected String join() {
1.2.2.1 +4 -4
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSPropContainsExpression.java
Index: RDBMSPropContainsExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSPropContainsExpression.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- RDBMSPropContainsExpression.java 28 Jul 2004 09:34:08 -0000 1.2
+++ RDBMSPropContainsExpression.java 1 Nov 2004 11:01:44 -0000 1.2.2.1
@@ -39,6 +39,6 @@
Element literal = _element.getChild(Literals.LITERAL,
NamespaceCache.DEFAULT_NAMESPACE);
return "(p" + _tableIndex + ".PROPERTY_NAME = '" + property.getName() + "'
AND " +
"p" + _tableIndex + ".PROPERTY_NAMESPACE = '" +
property.getNamespaceURI() + "' AND " +
- "p" + _tableIndex + ".PROPERTY_VALUE LIKE '%" + literal.getText() +
"%')";
+ "p" + _tableIndex + ".PROPERTY_VALUE LIKE '%" +
literal.getTextNormalize() + "%')";
}
}
1.2.2.1 +4 -4
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSNotPropContainsExpression.java
Index: RDBMSNotPropContainsExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSNotPropContainsExpression.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- RDBMSNotPropContainsExpression.java 28 Jul 2004 09:34:08 -0000 1.2
+++ RDBMSNotPropContainsExpression.java 1 Nov 2004 11:01:44 -0000 1.2.2.1
@@ -39,6 +39,6 @@
Element literal = _element.getChild(Literals.LITERAL,
NamespaceCache.DEFAULT_NAMESPACE);
return "NOT (p" + _tableIndex + ".PROPERTY_NAME = '" + property.getName() +
"' AND " +
"p" + _tableIndex + ".PROPERTY_NAMESPACE = '" +
property.getNamespaceURI() + "' AND " +
- "p" + _tableIndex + ".PROPERTY_VALUE LIKE '%" + literal.getText() +
"%')";
+ "p" + _tableIndex + ".PROPERTY_VALUE LIKE '%" +
literal.getTextNormalize() + "%')";
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
