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

[Bruno P. <pos...@us...>]

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

Modified Files:
	d2w.d2wmodel 
Log Message:
the rule to determine to query configuration for the filtering page needs to be a ERDDelayedKeyValueAssignment

Index: d2w.d2wmodel
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Resources/d2w.d2wmodel,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** d2w.d2wmodel	22 Feb 2005 14:50:22 -0000	1.85
--- d2w.d2wmodel	15 Apr 2005 22:23:31 -0000	1.86
***************
*** 190,194 ****
  {    author = 10;     class = "com.webobjects.directtoweb.Rule";     rhs = {        class = "er.directtoweb.ERDDelayedLocalizedAssignment";         keyPath = objectUnsetMessage;         value = "ERDInspect.objectUnsetMessage";     }; }, 
  {    author = 20;     class = "com.webobjects.directtoweb.Rule";     lhs = {        class = com.webobjects.eocontrol.EOKeyValueQualifier;         key = targetOutput;         selectorName = "isEqualTo";         value = xml;     };     rhs = {        class = "com.webobjects.directtoweb.Assignment";         keyPath = offset;         value = 0;     }; }, 
! {    author = 0;     class = "com.webobjects.directtoweb.Rule";     rhs = {        class = "er.directtoweb.ERDKeyValueAssignment";         keyPath = pageConfigurationForFiltering;         value = queryConfigurationName;     }; }, 
  {    author = 200;     class = "com.webobjects.directtoweb.Rule";     lhs = {        class = com.webobjects.eocontrol.EOAndQualifier;         qualifiers = (            {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = task;                 selectorName = "isEqualTo";                 value = list;             },             {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = targetOutput;                 selectorName = "isEqualTo";                 value = xml;             }        );     };     rhs = {        class = "er.directtoweb.ERDKeyValueAssignment";         keyPath = pageName;         value = templateNameForListXMLPage;     }; }, 
  {    author = 100;     class = "com.webobjects.directtoweb.Rule";     lhs = {        class = com.webobjects.eocontrol.EOAndQualifier;         qualifiers = (            {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = task;                 selectorName = "isEqualTo";                 value = list;             },             {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = subTask;                 selectorName = "isEqualTo";                 value = calendar;             }        );     };     rhs = {        class = "er.directtoweb.ERDKeyValueAssignment";         keyPath = pageName;         value = templateNameForListCalendarPage;     }; }, 
--- 190,194 ----
  {    author = 10;     class = "com.webobjects.directtoweb.Rule";     rhs = {        class = "er.directtoweb.ERDDelayedLocalizedAssignment";         keyPath = objectUnsetMessage;         value = "ERDInspect.objectUnsetMessage";     }; }, 
  {    author = 20;     class = "com.webobjects.directtoweb.Rule";     lhs = {        class = com.webobjects.eocontrol.EOKeyValueQualifier;         key = targetOutput;         selectorName = "isEqualTo";         value = xml;     };     rhs = {        class = "com.webobjects.directtoweb.Assignment";         keyPath = offset;         value = 0;     }; }, 
! {    author = 0;     class = "com.webobjects.directtoweb.Rule";     rhs = {        class = "er.directtoweb.ERDDelayedKeyValueAssignment";         keyPath = pageConfigurationForFiltering;         value = queryConfigurationName;     }; }, 
  {    author = 200;     class = "com.webobjects.directtoweb.Rule";     lhs = {        class = com.webobjects.eocontrol.EOAndQualifier;         qualifiers = (            {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = task;                 selectorName = "isEqualTo";                 value = list;             },             {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = targetOutput;                 selectorName = "isEqualTo";                 value = xml;             }        );     };     rhs = {        class = "er.directtoweb.ERDKeyValueAssignment";         keyPath = pageName;         value = templateNameForListXMLPage;     }; }, 
  {    author = 100;     class = "com.webobjects.directtoweb.Rule";     lhs = {        class = com.webobjects.eocontrol.EOAndQualifier;         qualifiers = (            {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = task;                 selectorName = "isEqualTo";                 value = list;             },             {                class = com.webobjects.eocontrol.EOKeyValueQualifier;                 key = subTask;                 selectorName = "isEqualTo";                 value = calendar;             }        );     };     rhs = {        class = "er.directtoweb.ERDKeyValueAssignment";         keyPath = pageName;         value = templateNameForListCalendarPage;     }; },