svn commit: r953678 - in /ofbiz/branches/release10.04: ./ framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java framework/widget/dtd/widget-form.xsd framework/widget/dtd/widget-screen.xsd

Author: jleroux
Date: Fri Jun 11 11:57:15 2010
New Revision: 953678

URL: http://svn.apache.org/viewvc?rev=953678&view=rev
Log:
"Applied fix from trunk for revision: 953671  "
------------------------------------------------------------------------
r953671 | jleroux | 2010-06-11 13:44:34 +0200 (ven. 11 juin 2010) | 2 lignes

A patch from Ankit Jain "Missing "not-in" operator in condtion-expr tag." (https://issues.apache.org/jira/browse/OFBIZ-3819) - OFBIZ-3819

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
    ofbiz/branches/release10.04/framework/widget/dtd/widget-form.xsd
    ofbiz/branches/release10.04/framework/widget/dtd/widget-screen.xsd

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 11 11:57:15 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671

Modified: ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java?rev=953678&r1=953677&r2=953678&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java (original)
+++ ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java Fri Jun 11 11:57:15 2010
@@ -199,7 +199,7 @@ public class EntityFinderUtil {
             }
 
             // If IN or BETWEEN operator, see if value is a literal list and split it
-            if ((operator.equals(EntityOperator.IN) || operator.equals(EntityOperator.BETWEEN))
+            if ((operator.equals(EntityOperator.IN) || operator.equals(EntityOperator.BETWEEN) || operator.equals(EntityOperator.NOT_IN))
                     && value instanceof String) {
                 String delim = null;
                 if (((String)value).indexOf("|") >= 0) {
@@ -217,7 +217,7 @@ public class EntityFinderUtil {
             }
 
             // don't convert the field to the desired type if this is an IN or BETWEEN operator and we have a Collection
-            if (!((operator.equals(EntityOperator.IN) || operator.equals(EntityOperator.BETWEEN))
+            if (!((operator.equals(EntityOperator.IN) || operator.equals(EntityOperator.BETWEEN) || operator.equals(EntityOperator.NOT_IN))
                     && value instanceof Collection)) {
                 // now to a type conversion for the target fieldName
                 value = modelEntity.convertFieldValue(modelEntity.getField(fieldName), value, modelFieldTypeReader, context);

Modified: ofbiz/branches/release10.04/framework/widget/dtd/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/dtd/widget-form.xsd?rev=953678&r1=953677&r2=953678&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/branches/release10.04/framework/widget/dtd/widget-form.xsd Fri Jun 11 11:57:15 2010
@@ -1268,6 +1268,7 @@ under the License.
                     <xs:enumeration value="equals"/>
                     <xs:enumeration value="not-equals"/>
                     <xs:enumeration value="in"/>
+                    <xs:enumeration value="not-in"/>
                     <xs:enumeration value="between"/>
                     <xs:enumeration value="like"/>
                 </xs:restriction>

Modified: ofbiz/branches/release10.04/framework/widget/dtd/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/dtd/widget-screen.xsd?rev=953678&r1=953677&r2=953678&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/widget/dtd/widget-screen.xsd (original)
+++ ofbiz/branches/release10.04/framework/widget/dtd/widget-screen.xsd Fri Jun 11 11:57:15 2010
@@ -652,6 +652,7 @@ under the License.
                     <xs:enumeration value="equals"/>
                     <xs:enumeration value="not-equals"/>
                     <xs:enumeration value="in"/>
+                    <xs:enumeration value="not-in"/>
                     <xs:enumeration value="between"/>
                     <xs:enumeration value="like"/>
                 </xs:restriction>