svn commit: r792116 - /ofbiz/trunk/framework/entity/dtd/entitymodel.xsd

[jonesde]

Author: jonesde
Date: Wed Jul  8 12:41:04 2009
New Revision: 792116

URL: http://svn.apache.org/viewvc?rev=792116&view=rev
Log:
Some cleanups of the design for the entity-condition stuff; I should have reviewed and cleaned up this XSD more before doing the last commit as there are a number of things that did not work and are not useful in this context from the entity-condition patterns used in the widgets and simple-methods; the implementation is not updated yet for these changes but will be soon; while not all of the changes here are supported yet the ones that are removed were things that did not work anyway; in the mean time feedback on the design is welcome

Modified:
    ofbiz/trunk/framework/entity/dtd/entitymodel.xsd

Modified: ofbiz/trunk/framework/entity/dtd/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/dtd/entitymodel.xsd?rev=792116&r1=792115&r2=792116&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/dtd/entitymodel.xsd (original)
+++ ofbiz/trunk/framework/entity/dtd/entitymodel.xsd Wed Jul  8 12:41:04 2009
@@ -426,6 +426,7 @@
             <xs:sequence>
                 <xs:element minOccurs="0" ref="description"/>
                 <xs:element maxOccurs="unbounded" ref="key-map"/>
+                <xs:element minOccurs="0" ref="entity-condition"/>
             </xs:sequence>
             <xs:attributeGroup ref="attlist.view-link"/>
         </xs:complexType>
@@ -448,7 +449,6 @@
                 <xs:choice minOccurs="0">
                     <xs:element ref="condition-expr"/>
                     <xs:element ref="condition-list"/>
-                    <xs:element ref="condition-object"/>
                 </xs:choice>
                 <xs:element minOccurs="0" ref="having-condition-list"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by"/>
@@ -481,6 +481,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-expr">
+        <xs:attribute name="entity-alias" type="xs:string"/>
         <xs:attribute name="field-name" type="xs:string" use="required"/>
         <xs:attribute name="operator" default="equals">
             <xs:simpleType>
@@ -497,24 +498,9 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="from-field" type="xs:string"/>
+        <xs:attribute name="rel-entity-alias" type="xs:string"/>
+        <xs:attribute name="rel-field-name" type="xs:string"/>
         <xs:attribute name="value" type="xs:string"/>
-        <xs:attribute name="ignore-if-null" default="false">
-            <xs:simpleType>
-                <xs:restriction base="xs:token">
-                    <xs:enumeration value="true"/>
-                    <xs:enumeration value="false"/>
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute name="ignore-if-empty" default="false">
-            <xs:simpleType>
-                <xs:restriction base="xs:token">
-                    <xs:enumeration value="true"/>
-                    <xs:enumeration value="false"/>
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
         <xs:attribute name="ignore-case" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -523,21 +509,12 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="ignore" default="false">
-            <xs:annotation>
-                <xs:documentation>
-                    Ignore the condition if flag is true.
-                    Defaults to false.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="condition-list">
         <xs:complexType>
             <xs:choice maxOccurs="unbounded">
                 <xs:element ref="condition-expr"/>
                 <xs:element ref="condition-list"/>
-                <xs:element ref="condition-object"/>
             </xs:choice>
             <xs:attributeGroup ref="attlist.condition-list"/>
         </xs:complexType>
@@ -552,20 +529,11 @@
             </xs:simpleType>
         </xs:attribute>
     </xs:attributeGroup>
-    <xs:element name="condition-object">
-        <xs:complexType>
-            <xs:attributeGroup ref="attlist.condition-object"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.condition-object">
-        <xs:attribute name="field" type="xs:string" use="required"/>
-    </xs:attributeGroup>
     <xs:element name="having-condition-list">
         <xs:complexType>
             <xs:choice maxOccurs="unbounded">
                 <xs:element ref="condition-expr"/>
                 <xs:element ref="condition-list"/>
-                <xs:element ref="condition-object"/>
             </xs:choice>
             <xs:attributeGroup ref="attlist.having-condition-list"/>
         </xs:complexType>