Update of /var/cvs/src/org/mmbase/storage/search/implementation
In directory james.mmbase.org:/tmp/cvs-serv30652/search/implementation
Modified Files:
BasicFieldCompareConstraint.java
Log Message:
MMB-1036
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/search/implementation
See also: http://www.mmbase.org/jira/browse/MMB-1036
Index: BasicFieldCompareConstraint.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/search/implementation/BasicFieldCompareConstraint.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- BasicFieldCompareConstraint.java 16 Oct 2006 12:56:57 -0000 1.12
+++ BasicFieldCompareConstraint.java 25 Nov 2008 12:53:25 -0000 1.13
@@ -17,7 +17,7 @@
* The tested operation is equality, unless it is explicitly set.
*
* @author Rob van Maris
- * @version $Id: BasicFieldCompareConstraint.java,v 1.12 2006/10/16 12:56:57
pierre Exp $
+ * @version $Id: BasicFieldCompareConstraint.java,v 1.13 2008/11/25 12:53:25
michiel Exp $
* @since MMBase-1.7
*/
public class BasicFieldCompareConstraint extends BasicFieldConstraint
implements FieldCompareConstraint {
@@ -47,7 +47,7 @@
// Test for defined operator value.
if (operator < FieldCompareConstraint.LESS
- || operator > FieldCompareConstraint.LIKE) {
+ || operator > FieldCompareConstraint.REGEXP) {
throw new IllegalArgumentException(
"Invalid operator value: " + operator );
}
@@ -58,6 +58,11 @@
&& getField().getType() != Field.TYPE_XML) {
throw new IllegalArgumentException("LIKE operator not allowed for
this field type: " + getField().getType());
}
+ if (operator == FieldCompareConstraint.REGEXP
+ && getField().getType() != Field.TYPE_STRING
+ && getField().getType() != Field.TYPE_XML) {
+ throw new IllegalArgumentException("REGEXP operator not allowed
for this field type: " + getField().getType());
+ }
this.operator = operator;
return this;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
