svn commit: r731861 - /ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml

[jonesde]

Author: jonesde
Date: Mon Jan  5 23:56:56 2009
New Revision: 731861

URL: http://svn.apache.org/viewvc?rev=731861&view=rev
Log:
More simple-method cleanups

Modified:
    ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=731861&r1=731860&r2=731861&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Mon Jan  5 23:56:56 2009
@@ -698,18 +698,18 @@
                         <if-compare-field field="telephone.contactMechPurposeTypeId" to-field="type" operator="equals">
                             <set field="found" value="notImportant"/>
                             <if-not-empty field="telephone.countryCode">
-                                <field-to-result map-name="telephone" field="countryCode"/>
+                                <field-to-result field="telephone.countryCode" result-name="countryCode"/>
                             </if-not-empty>
                             <if-not-empty field="telephone.areaCode">
-                                <field-to-result map-name="telephone" field="areaCode"/>
+                                <field-to-result field="telephone.areaCode" result-name="areaCode"/>
                             </if-not-empty>
                             <if-not-empty field="telephone.contactNumber">
-                                <field-to-result map-name="telephone" field="contactNumber"/>
+                                <field-to-result field="telephone.contactNumber" result-name="contactNumber"/>
                             </if-not-empty>
                             <if-not-empty field="telephone.extension">
-                                <field-to-result map-name="telephone" field="extension"/>
+                                <field-to-result field="telephone.extension" result-name="extension"/>
                             </if-not-empty>
-                            <field-to-result map-name="telephone" field="contactMechPurposeTypeId"/>
+                            <field-to-result field="telephone.contactMechPurposeTypeId" result-name="contactMechPurposeTypeId"/>
                         </if-compare-field>
                     </if-empty>
                 </iterate>
@@ -728,7 +728,7 @@
                     <field-to-result field="telephone.tnContactNumber" result-name="contactNumber"/>
                 </if-not-empty>
                 <if-not-empty field="telephone.extension">
-                    <field-to-result map-name="telephone" field="extension"/>
+                    <field-to-result field="telephone.extension" result-name="extension"/>
                 </if-not-empty>
             </else>
         </if-not-empty>
@@ -736,8 +736,8 @@
     
     <!-- address match map -->
     <simple-method method-name="createAddressMatchMap" short-description="create a AddressMatchMap">
-        <call-object-method obj-field="mapValue" obj-map-name="parameters" method-name="toUpperCase" ret-field="mapValue" ret-map-name="parameters"/>
-        <call-object-method obj-field="mapKey" obj-map-name="parameters" method-name="toUpperCase" ret-field="mapKey" ret-map-name="parameters"/>
+        <call-object-method obj-field="parameters.mapValue" method-name="toUpperCase" ret-field="parameters.mapValue"/>
+        <call-object-method obj-field="parameters.mapKey" method-name="toUpperCase" ret-field="parameters.mapKey"/>
         <make-value entity-name="AddressMatchMap" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -815,7 +815,7 @@
     
     <!-- send party creation email notification -->
     <simple-method method-name="sendCreatePartyEmailNotification" short-description="Notification email on party creation" login-required="false">
-        <map-to-map map-name="parameters" to-map-name="bodyParameters"/>    
+        <map-to-map map="parameters" to-map="bodyParameters"/>    
         <entity-condition entity-name="ProductStoreEmailSetting" list="productStoreEmailSettings">
             <condition-list>
                 <condition-expr field-name="emailType" operator="equals" value="PARTY_REGIS_CONFIRM"/>
@@ -846,7 +846,7 @@
 
     <!-- send personal information update email notification -->
     <simple-method method-name="sendUpdatePersonalInfoEmailNotification" short-description="Send the Notification email on personal information updation" login-required="false">
-        <map-to-map map-name="parameters" to-map-name="bodyParameters"/>
+        <map-to-map map="parameters" to-map="bodyParameters"/>
         <entity-condition entity-name="ProductStoreEmailSetting" list="productStoreEmailSettings">
             <condition-list>
                 <condition-expr field-name="emailType" operator="equals" value="UPD_PRSNL_INF_CNFRM"/>
@@ -980,5 +980,4 @@
         <field-to-result field="contactMech.infoString" result-name="emailAddress"/>
         <field-to-result field="contactMechId"/>
     </simple-method>
-
 </simple-methods>