svn commit: r707593 - /ofbiz/site/dtds/entitymodel.xsd

Author: jleroux
Date: Fri Oct 24 02:57:07 2008
New Revision: 707593

URL: http://svn.apache.org/viewvc?rev=707593&view=rev
Log:
Updated from trunk, still some work on the java side as Adam pointed out

Modified:
    ofbiz/site/dtds/entitymodel.xsd

Modified: ofbiz/site/dtds/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entitymodel.xsd?rev=707593&r1=707592&r2=707593&view=diff
==============================================================================
--- ofbiz/site/dtds/entitymodel.xsd (original)
+++ ofbiz/site/dtds/entitymodel.xsd Fri Oct 24 02:57:07 2008
@@ -134,7 +134,29 @@
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="enable-audit-log" default="false">
-            <xs:annotation><xs:documentation>If this is set to true then whenever the value for this field on a record changes the Entity Engine will record the change in the EntityAuditLog entity. Defaults to false.</xs:documentation></xs:annotation>
+            <xs:annotation>
+                <xs:documentation>
+                    If this is set to true then whenever the value for this field on a record changes the Entity Engine will record the change in the EntityAuditLog entity.
+                    Defaults to false.
+                </xs:documentation>
+            </xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="not-null" default="false">
+            <xs:annotation>
+                <xs:documentation>
+                    This makes the field NOT NULL on the database (like primary key fields).
+                    It's possible to use an id-ne similiar field type.
+                    But rows can be added from outside of ofbiz (e.g. database manager, third party programm, etc).
+                    This patch uses the ability of a database to set not null constraints.
+                    Defaults to false.
+                </xs:documentation>
+            </xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>
@@ -223,6 +245,7 @@
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="alias-all"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="alias"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="view-link"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="filter"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="relation"/>
             </xs:sequence>
             <xs:attributeGroup ref="attlist.view-entity"/>
@@ -418,6 +441,26 @@
             </xs:simpleType>
         </xs:attribute>
     </xs:attributeGroup>
+    <xs:element name="filter">
+        <xs:annotation>
+            <xs:documentation>
+                Allows to filter a view using "entity-alias", "field-name", "operator" and "value"  
+                operator being one of (see EntityOperator.java for more details)
+                {not-in, greater, greaterThanEqualTo, less-equals, equals, or, greater-than, less-than-equal-to, like, in, not-equals,
+                greater-than-equal-to, and, not, lessThanEqualTo, not-equal, lessThan, greater-equals, greaterThan, not-like, less-than,
+                notEqual, between, less}
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.filter"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.filter">
+        <xs:attribute type="xs:string" name="entity-alias" use="required"/>
+        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute type="xs:string" name="operator" use="required"/>
+        <xs:attribute type="xs:string" name="value" use="required"/>
+    </xs:attributeGroup>
 
     <xs:element name="extend-entity">
         <xs:complexType>