svn commit: r524319 - in /ofbiz/trunk/applications/marketing: entitydef/entitymodel.xml src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java

[jaz-3]

Author: jaz
Date: Fri Mar 30 16:12:03 2007
New Revision: 524319

URL: http://svn.apache.org/viewvc?view=rev&rev=524319
Log:
from OFBIZ-862 (Anil Patel) fixes index create error and mismatch in cookie name

Modified:
    ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml
    ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java

Modified: ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml?view=diff&rev=524319&r1=524318&r2=524319
==============================================================================
--- ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml Fri Mar 30 16:12:03 2007
@@ -465,16 +465,16 @@
       <prim-key field="returnId"/>
       <prim-key field="orderId"/>
       <prim-key field="trackingCodeTypeId"/>
-      <relation type="one" fk-name="TKNG_CODODR_ODRTN" rel-entity-name="ReturnHeader">
+      <relation type="one" fk-name="TKNG_CODODR_RTN" rel-entity-name="ReturnHeader">
         <key-map field-name="returnId"/>
       </relation>
       <relation type="one" fk-name="TKNG_CODODR_ODRTN" rel-entity-name="OrderHeader">
         <key-map field-name="orderId"/>
       </relation>
-      <relation type="one" fk-name="TKNG_CODODR_TKCD" rel-entity-name="TrackingCode">
+      <relation type="one" fk-name="TKNG_CODODR_RTNTKCD" rel-entity-name="TrackingCode">
         <key-map field-name="trackingCodeId"/>
       </relation>
-      <relation type="one" fk-name="TKNG_CODODR_TYP" rel-entity-name="TrackingCodeType">
+      <relation type="one" fk-name="TKNG_CODODR_RTNTYP" rel-entity-name="TrackingCodeType">
         <key-map field-name="trackingCodeTypeId"/>
       </relation>
     </entity>

Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java?view=diff&rev=524319&r1=524318&r2=524319
==============================================================================
--- ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java (original)
+++ ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java Fri Mar 30 16:12:03 2007
@@ -383,7 +383,7 @@
                 String cookieName = cookies[i].getName();
 
                 // find the siteId cookie if it exists
-                if ("Ofbiz.TKCD.siteId".equals(cookieName)) {
+                if ("Ofbiz.TKCD.SiteId".equals(cookieName)) {
                     siteId = cookies[i].getValue();
                 }