[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERDirectToWeb/Resources d2w.d2wmodel,1.81,1.82

[Anjo K. <an...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21993/Common/Frameworks/ERDirectToWeb/Resources

Modified Files:
	d2w.d2wmodel 
Log Message:
QueryNonNull now more flexible, localized

Index: d2w.d2wmodel
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Resources/d2w.d2wmodel,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** d2w.d2wmodel	22 Jun 2004 13:43:26 -0000	1.81
--- d2w.d2wmodel	28 Jul 2004 11:03:01 -0000	1.82
***************
*** 15,18 ****
--- 15,19 ----
  {    author = 250;     class = "com.webobjects.directtoweb.Rule";     lhs = {        class = com.webobjects.eocontrol.EOAndQualifier;         qualifiers = (            {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = targetOutput;                 selectorName = "isEqualTo";                 value = xml;             },             {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = "smartAttribute.userInfo.erPrototype";                 selectorName = "isEqualTo";                 value = Boolean;             },             {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = pageConfiguration;                 selectorName = "isLike";                 value = "*";             }        );     };     rhs = {        class = "com.webobjects.directtoweb.Assignment";         keyPath = choicesNames;         value = (Y, N);     }; }, 
  {    author = 10;     class = "com.webobjects.directtoweb.Rule";     lhs = {        class = com.webobjects.eocontrol.EOOrQualifier;         qualifiers = (            {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = "smartAttribute.allowsNull";                 selectorName = "isEqualTo";                 value = {class = java.lang.Number; value = 1; };             },             {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = isMandatory;                 selectorName = "isEqualTo";                 value = {class = java.lang.Number; value = 0; };             }        );     };     rhs = {        class = "com.webobjects.directtoweb.Assignment";         keyPath = choicesNames;         value = (Yes, No, Unset);     }; }, 
+ {    author = 10;     class = "com.webobjects.directtoweb.Rule";     lhs = {        class = com.webobjects.eocontrol.EOKeyValueQualifier;         key = componentName;         selectorName = "isEqualTo";         value = ERD2WQueryNonNull;     };     rhs = {        class = "com.webobjects.directtoweb.Assignment";         keyPath = choicesNames;         value = ("Don't care", Yes, No);     }; }, 
  {    author = 0;     class = "com.webobjects.directtoweb.Rule";     rhs = {        class = "com.webobjects.directtoweb.Assignment";         keyPath = choicesNames;         value = (Yes, No);     }; }, 
  {    author = 250;     class = "com.webobjects.directtoweb.Rule";     lhs = {        class = com.webobjects.eocontrol.EOAndQualifier;         qualifiers = (            {                class = com.webobjects.eocontrol.EOOrQualifier;                 qualifiers = (                    {                        class = com.webobjects.eocontrol.EOKeyValueQualifier;                         key = "relationship.isToMany";                         selectorName = "isEqualTo";                         value = {class = java.lang.Number; value = 1; };                     },                     {                        class = com.webobjects.eocontrol.EOKeyValueQualifier;                         key = "smartRelationship.isToMany";                         selectorName = "isEqualTo";                         value = {class = java.lang.Number; value = 1; };                     }                );             },             {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = targetOutput;                 selectorName = "isEqualTo";                 value = xml;             },             {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = pageConfiguration;                 selectorName = "isLike";                 value = "*";             }        );     };     rhs = {        class = "com.webobjects.directtoweb.Assignment";         keyPath = componentName;         value = ERD2WXMLDisplayToMany;     }; },