Author: jonesde
Date: Tue Feb 6 14:21:02 2007
New Revision: 504333
URL: http://svn.apache.org/viewvc?view=rev&rev=504333
Log:
Added ProductCategoryLink entity and supporting seed data
Modified:
ofbiz/trunk/applications/product/data/ProductTypeData.xml
ofbiz/trunk/applications/product/entitydef/entitygroup.xml
ofbiz/trunk/applications/product/entitydef/entitymodel.xml
Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?view=diff&rev=504333&r1=504332&r2=504333
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Tue Feb 6
14:21:02 2007
@@ -34,8 +34,6 @@
<EnumerationType description="Product Price Parent Enum Type"
enumTypeId="PROD_PRICE" hasTable="N" parentTypeId=""/>
<EnumerationType description="Product Price Input Parameter"
enumTypeId="PROD_PRICE_IN_PARAM" hasTable="N" parentTypeId="PROD_PRICE"/>
- <EnumerationType description="Product Price Condition"
enumTypeId="PROD_PRICE_COND" hasTable="N" parentTypeId="PROD_PRICE"/>
-
<Enumeration description="Product" enumCode="PRODUCT_ID"
enumId="PRIP_PRODUCT_ID" sequenceId="01" enumTypeId="PROD_PRICE_IN_PARAM"/>
<Enumeration description="Product Category" enumCode="PRODUCT_CATEGORY_ID"
enumId="PRIP_PROD_CAT_ID" sequenceId="02" enumTypeId="PROD_PRICE_IN_PARAM"/>
<Enumeration description="Product Catalog" enumCode="PROD_CATALOG_ID"
enumId="PRIP_PROD_CLG_ID" sequenceId="03" enumTypeId="PROD_PRICE_IN_PARAM"/>
@@ -59,6 +57,7 @@
<Enumeration description=">=" enumCode="GTE" enumId="PRC_GTE"
sequenceId="06" enumTypeId="PROD_PRICE_COND"/>
... new style below less technical -->
+ <EnumerationType description="Product Price Condition"
enumTypeId="PROD_PRICE_COND" hasTable="N" parentTypeId="PROD_PRICE"/>
<Enumeration description="Is" enumCode="EQ" enumId="PRC_EQ"
sequenceId="01" enumTypeId="PROD_PRICE_COND"/>
<Enumeration description="Is Not" enumCode="NEQ" enumId="PRC_NEQ"
sequenceId="02" enumTypeId="PROD_PRICE_COND"/>
<Enumeration description="Is Less Than" enumCode="LT" enumId="PRC_LT"
sequenceId="03" enumTypeId="PROD_PRICE_COND"/>
@@ -110,6 +109,10 @@
<Enumeration description="OFBiz URL" enumCode="OFBURL"
enumId="KOTT_OFBURL" enumTypeId="KWOVRD_TRGT_TYPE" sequenceId="03"/>
<Enumeration description="Absolute URL" enumCode="AURL" enumId="KOTT_AURL"
enumTypeId="KWOVRD_TRGT_TYPE" sequenceId="04"/>
+ <EnumerationType description="Product Category Link Type"
enumTypeId="PCAT_LINK_TYPE" hasTable="N" parentTypeId=""/>
+ <Enumeration description="Search Parameters" enumCode="SEARCH_PARAM"
enumId="PCLT_SEARCH_PARAM" sequenceId="01" enumTypeId="PCAT_LINK_TYPE"/>
+ <Enumeration description="Absolute URL" enumCode="ABS_URL"
enumId="PCLT_ABS_URL" sequenceId="02" enumTypeId="PCAT_LINK_TYPE"/>
+
<FacilityType description="Building" facilityTypeId="BUILDING"
hasTable="N" parentTypeId=""/>
<FacilityType description="Floor" facilityTypeId="FLOOR" hasTable="N"
parentTypeId=""/>
<FacilityType description="Office" facilityTypeId="OFFICE" hasTable="N"
parentTypeId=""/>
Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup.xml?view=diff&rev=504333&r1=504332&r2=504333
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Tue Feb 6
14:21:02 2007
@@ -42,6 +42,7 @@
<entity-group group="org.ofbiz" entity="ProductCategoryContent" />
<entity-group group="org.ofbiz" entity="ProductCategoryContentAndInfo" />
<entity-group group="org.ofbiz" entity="ProductCategoryContentType" />
+ <entity-group group="org.ofbiz" entity="ProductCategoryLink" />
<entity-group group="org.ofbiz" entity="ProductCategoryMember" />
<entity-group group="org.ofbiz" entity="ProductCategoryMemberAndRole" />
<entity-group group="org.ofbiz" entity="ProductCategoryRole" />
Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=504333&r1=504332&r2=504333
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Tue Feb 6
14:21:02 2007
@@ -309,25 +309,50 @@
<key-map field-name="parentTypeId"
rel-field-name="prodCatContentTypeId"/>
</relation>
</entity>
+ <entity entity-name="ProductCategoryLink"
+ package-name="org.ofbiz.product.category"
+ title="Product Category Link Entity">
+ <field name="productCategoryId" type="id-ne"></field>
+ <field name="linkSeqId" type="id-ne"></field>
+ <field name="fromDate" type="date-time"></field>
+ <field name="thruDate" type="date-time"></field>
+ <field name="comments" type="comment"><description>Internal comments,
not for public display.</description></field>
+ <field name="sequenceNum" type="numeric"><description>This field is
used to sort the links. The linkSeqId field is not used because it is part of
the primary key and cannot be changed.</description></field>
+ <field name="titleText" type="description"></field>
+ <field name="detailText" type="very-long"></field>
+ <field name="imageUrl" type="description"></field>
+ <field name="linkTypeEnumId" type="id"></field>
+ <field name="linkInfo" type="long-varchar"></field>
+ <field name="detailSubScreen" type="long-varchar"><description>This is
optional. If not specified a default should be used by the category detail
template.</description></field>
+ <prim-key field="productCategoryId"/>
+ <prim-key field="linkSeqId"/>
+ <prim-key field="fromDate"/>
+ <relation type="one" fk-name="PROD_CLNK_CATEGORY"
rel-entity-name="ProductCategory">
+ <key-map field-name="productCategoryId"/>
+ </relation>
+ <relation type="one" fk-name="PROD_CLNK_LKTPENM" title="LinkType"
rel-entity-name="Enumeration">
+ <key-map field-name="linkTypeEnumId" rel-field-name="enumId"/>
+ </relation>
+ </entity>
<entity entity-name="ProductCategoryMember"
- package-name="org.ofbiz.product.category"
- title="Product Category Member Entity">
- <field name="productCategoryId" type="id-ne"></field>
- <field name="productId" type="id-ne"></field>
- <field name="fromDate" type="date-time"></field>
- <field name="thruDate" type="date-time"></field>
- <field name="comments" type="comment"></field>
- <field name="sequenceNum" type="numeric"></field>
- <field name="quantity" type="floating-point"></field>
- <prim-key field="productCategoryId"/>
- <prim-key field="productId"/>
- <prim-key field="fromDate"/>
- <relation type="one" fk-name="PROD_CMBR_PRODUCT"
rel-entity-name="Product">
- <key-map field-name="productId"/>
- </relation>
- <relation type="one" fk-name="PROD_CMBR_CATEGORY"
rel-entity-name="ProductCategory">
- <key-map field-name="productCategoryId"/>
- </relation>
+ package-name="org.ofbiz.product.category"
+ title="Product Category Member Entity">
+ <field name="productCategoryId" type="id-ne"></field>
+ <field name="productId" type="id-ne"></field>
+ <field name="fromDate" type="date-time"></field>
+ <field name="thruDate" type="date-time"></field>
+ <field name="comments" type="comment"></field>
+ <field name="sequenceNum" type="numeric"></field>
+ <field name="quantity" type="floating-point"></field>
+ <prim-key field="productCategoryId"/>
+ <prim-key field="productId"/>
+ <prim-key field="fromDate"/>
+ <relation type="one" fk-name="PROD_CMBR_PRODUCT"
rel-entity-name="Product">
+ <key-map field-name="productId"/>
+ </relation>
+ <relation type="one" fk-name="PROD_CMBR_CATEGORY"
rel-entity-name="ProductCategory">
+ <key-map field-name="productCategoryId"/>
+ </relation>
</entity>
<view-entity entity-name="ProductCategoryMemberAndRole"
package-name="org.ofbiz.product.category"