|
Author: jleroux
Date: Fri Feb 6 09:21:24 2009 New Revision: 741487 URL: http://svn.apache.org/viewvc?rev=741487&view=rev Log: <result-to-field result-name="(.*)" map.*="(.*)"/> => <result-to-field result-name="$1" field="$2.$1"/> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=741487&r1=741486&r2=741487&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Fri Feb 6 09:21:24 2009 @@ -289,7 +289,7 @@ <set from-field="newUserLogin.currentPassword" field="personUserLoginContext.currentPasswordVerify"/> <!-- the above copy is okay since we checked already that they are the same --> <call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext"> - <result-to-field result-name="partyId" map-name="tempMap"/> + <result-to-field result-name="partyId" field="tempMap.partyId"/> <result-to-field field="createdUserLogin" result-name="newUserLogin"/> </call-service> <set-current-user-login value-field="createdUserLogin"/> @@ -314,7 +314,7 @@ <!-- address not used, do nothing --> <else> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="contactMechId" map-name="addressPurposeContext"/> + <result-to-field result-name="contactMechId" field="addressPurposeContext.contactMechId"/> </call-service> <set from-field="tempMap.partyId" field="addressPurposeContext.partyId"/> <!-- create the shipping location --> @@ -329,7 +329,7 @@ <!-- home phone --> <if-not-empty field="parameters.CUSTOMER_HOME_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext"> - <result-to-field result-name="contactMechId" map-name="homePhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="homePhonePurposeContext.contactMechId"/> </call-service> <set from-field="tempMap.partyId" field="homePhonePurposeContext.partyId"/> <set value="PHONE_HOME" field="homePhonePurposeContext.contactMechPurposeTypeId"/> @@ -341,7 +341,7 @@ <!-- work phone --> <if-not-empty field="parameters.CUSTOMER_WORK_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext"> - <result-to-field result-name="contactMechId" map-name="workPhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="workPhonePurposeContext.contactMechId"/> </call-service> <set from-field="tempMap.partyId" field="workPhonePurposeContext.partyId"/> <set value="PHONE_WORK" field="workPhonePurposeContext.contactMechPurposeTypeId"/> @@ -351,7 +351,7 @@ <!-- fax phone --> <if-not-empty field="parameters.CUSTOMER_FAX_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext"> - <result-to-field result-name="contactMechId" map-name="faxPhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="faxPhonePurposeContext.contactMechId"/> </call-service> <set from-field="tempMap.partyId" field="faxPhonePurposeContext.partyId"/> <set value="FAX_NUMBER" field="faxPhonePurposeContext.contactMechPurposeTypeId"/> @@ -361,7 +361,7 @@ <!-- mobile phone --> <if-not-empty field="parameters.CUSTOMER_MOBILE_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext"> - <result-to-field result-name="contactMechId" map-name="mobilePhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="mobilePhonePurposeContext.contactMechId"/> </call-service> <set from-field="tempMap.partyId" field="mobilePhonePurposeContext.partyId"/> <set value="PHONE_MOBILE" field="mobilePhonePurposeContext.contactMechPurposeTypeId"/> @@ -371,7 +371,7 @@ <!-- email address --> <if-not-empty field="emailContext.emailAddress"> <call-service service-name="createPartyEmailAddress" in-map-name="emailContext"> - <result-to-field result-name="contactMechId" map-name="emailPurposeContext"/> + <result-to-field result-name="contactMechId" field="emailPurposeContext.contactMechId"/> </call-service> <set from-field="tempMap.partyId" field="emailPurposeContext.partyId"/> <set value="PRIMARY_EMAIL" field="emailPurposeContext.contactMechPurposeTypeId"/> @@ -671,7 +671,7 @@ <!-- call the create person service --> <call-service service-name="createPerson" in-map-name="personMap"> - <result-to-field result-name="partyId" map-name="tempMap"/> + <result-to-field result-name="partyId" field="tempMap.partyId"/> <result-to-request result-name="partyId"/> </call-service> @@ -761,13 +761,13 @@ <call-service service-name="updatePartyPostalAddress" in-map-name="addressContext"> <!-- this is needed for the "anonymous" checkout process, will be used as the shipping address --> <result-to-request result-name="contactMechId"/> - <result-to-field result-name="contactMechId" map-name="addressContext"/> + <result-to-field result-name="contactMechId" field="addressContext.contactMechId"/> </call-service> <else> <set field="addressContext.partyId" from-field="partyId"/> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="contactMechId" map-name="addressContext"/> - <result-to-field result-name="contactMechId" map-name="addressPurposeContext"/> + <result-to-field result-name="contactMechId" field="addressContext.contactMechId"/> + <result-to-field result-name="contactMechId" field="addressPurposeContext.contactMechId"/> <result-to-request result-name="contactMechId"/> </call-service> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml?rev=741487&r1=741486&r2=741487&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml Fri Feb 6 09:21:24 2009 @@ -55,7 +55,7 @@ processor-name="newAffilPostal" in-map-name="parameters" out-map-name="pa_context"/> <check-errors/> <call-service service-name="createPostalAddress" in-map-name="pa_context"> - <result-to-field result-name="contactMechId" map-name="parameters"/> + <result-to-field result-name="contactMechId" field="parameters.contactMechId"/> </call-service> <!-- Create the Postal Address Purpose --> @@ -69,7 +69,7 @@ processor-name="newAffilPhone" in-map-name="parameters" out-map-name="ph_context"/> <check-errors/> <call-service service-name="createTelecomNumber" in-map-name="ph_context"> - <result-to-field result-name="contactMechId" map-name="parameters"/> + <result-to-field result-name="contactMechId" field="parameters.contactMechId"/> </call-service> <!-- Create the Phone ContactMech Purpose --> @@ -85,7 +85,7 @@ <if-not-empty field="fax_context.contactNumber"> <call-service service-name="createTelecomNumber" in-map-name="fax_context"> - <result-to-field result-name="contactMechId" map-name="parameters"/> + <result-to-field result-name="contactMechId" field="parameters.contactMechId"/> </call-service> </if-not-empty> @@ -102,7 +102,7 @@ processor-name="newAffilEmail" in-map-name="parameters" out-map-name="em_context"/> <check-errors/> <call-service service-name="createEmailAddress" in-map-name="em_context"> - <result-to-field result-name="contactMechId" map-name="parameters"/> + <result-to-field result-name="contactMechId" field="parameters.contactMechId"/> </call-service> <!-- Create the Email ContactMech Purpose --> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=741487&r1=741486&r2=741487&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Fri Feb 6 09:21:24 2009 @@ -206,7 +206,7 @@ <if-compare field="parameters.useAddress" operator="equals" value="true"> <set from-field="partyId" field="addressContext.partyId"/> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="contactMechId" map-name="addressPurposeContext"/> + <result-to-field result-name="contactMechId" field="addressPurposeContext.contactMechId"/> <result-to-request result-name="contactMechId"/> </call-service> <set from-field="tempMap.partyId" field="addressPurposeContext.partyId"/> @@ -229,7 +229,7 @@ <!-- call the create person service --> <call-service service-name="createPerson" in-map-name="personMap"> - <result-to-field result-name="partyId" map-name="tempMap"/> + <result-to-field result-name="partyId" field="tempMap.partyId"/> <result-to-request result-name="partyId"/> </call-service> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=741487&r1=741486&r2=741487&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Fri Feb 6 09:21:24 2009 @@ -252,7 +252,7 @@ <set from-field="parameters.custRequestId" field="newEntity.custRequestId"/> <set from-field="parameters.noteInfo" field="newNoteMap.note"/> <call-service service-name="createNote" in-map-name="newNoteMap"> - <result-to-field result-name="noteId" map-name="newEntity"/> + <result-to-field result-name="noteId" field="newEntity.noteId"/> </call-service> <create-value value-field="newEntity"/> <field-to-result field="newEntity.noteId" result-name="noteId"/> @@ -271,7 +271,7 @@ <set from-field="parameters.custRequestItemSeqId" field="newEntity.custRequestItemSeqId"/> <set from-field="parameters.note" field="newNoteMap.note"/> <call-service service-name="createNote" in-map-name="newNoteMap"> - <result-to-field result-name="noteId" map-name="newEntity"/> + <result-to-field result-name="noteId" field="newEntity.noteId"/> </call-service> <create-value value-field="newEntity"/> <field-to-result field="newEntity.noteId" result-name="noteId"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=741487&r1=741486&r2=741487&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Fri Feb 6 09:21:24 2009 @@ -72,7 +72,7 @@ <set field="context.infoString" from-field="parameters.infoString"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="${successMessageProperty}"/> - <result-to-field result-name="contactMechId" map-name="newValue"/> + <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <field-to-result field="newValue.contactMechId" result-name="contactMechId"/> <field-to-request field="newValue.contactMechId" request-name="contactMechId"/> @@ -104,7 +104,7 @@ <set field="context.contactMechTypeId" value="POSTAL_ADDRESS"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/> - <result-to-field result-name="contactMechId" map-name="newValue"/> + <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <set-nonpk-fields map="parameters" value-field="newValue"/> <create-value value-field="newValue"/> @@ -139,14 +139,14 @@ <log level="info" message="Postal address need updating"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map-name="newValue"/> + <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <create-value value-field="newValue"/> <else> <set field="context.contactMechId" from-field="parameters.contactMechId"/> <call-service service-name="updateContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map-name="newValue"/> + <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <if-compare-field to-field="newValue.contactMechId" field="oldValue.contactMechId" operator="not-equals"> <log level="info" message="Postal address need updating, contact mech changed"/> @@ -167,7 +167,7 @@ <set field="context.contactMechTypeId" value="TELECOM_NUMBER"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/> - <result-to-field result-name="contactMechId" map-name="newValue"/> + <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <set-nonpk-fields map="parameters" value-field="newValue"/> <create-value value-field="newValue"/> @@ -186,14 +186,14 @@ <log level="info" message="Telecom number needs updating"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map-name="newValue"/> + <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <create-value value-field="newValue"/> <else> <set field="context.contactMechId" from-field="parameters.contactMechId"/> <call-service service-name="updateContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map-name="newValue"/> + <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <if-compare-field to-field="newValue.contactMechId" field="oldValue.contactMechId" operator="not-equals"> <log level="info" message="Telecom Number need updating, contact mech changed"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=741487&r1=741486&r2=741487&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Fri Feb 6 09:21:24 2009 @@ -52,7 +52,7 @@ <if-empty field="parameters.contactMechId"> <set-service-fields service-name="createContactMech" map="parameters" to-map="createContactMechMap"/> <call-service service-name="createContactMech" in-map-name="createContactMechMap"> - <result-to-field result-name="contactMechId" map-name="newValue"/> + <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <log level="info" message="ContactMech created"/> <else> @@ -93,7 +93,7 @@ <set-service-fields service-name="updateContactMech" map="parameters" to-map="updateContactMechMap"/> <call-service service-name="updateContactMech" in-map-name="updateContactMechMap"> <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map-name="newPartyContactMech"/> + <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/> </call-service> <else> <set field="newPartyContactMech.contactMechId" from-field="parameters.newContactMechId"/> @@ -161,7 +161,7 @@ <set-service-fields service-name="createPostalAddress" map="parameters" to-map="createPostalAddressMap"/> <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/> - <result-to-field result-name="contactMechId" map-name="newPartyContactMech"/> + <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/> </call-service> <check-errors/> @@ -208,7 +208,7 @@ <set-service-fields service-name="createTelecomNumber" map="parameters" to-map="createTelecomNumberMap"/> <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/> - <result-to-field result-name="contactMechId" map-name="newPartyContactMech"/> + <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/> </call-service> <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="createPartyContactMechMap"/> @@ -293,7 +293,7 @@ <set field="input.entityName" value="PartyAndContactMech"/> <set field="input.filterByDate" value="Y"/> <set field="input.inputFields.infoString" from-field="parameters.address"/> - <if-empty map-name="parameters" field-name="caseInsensitive"> + <if-empty field="parameters.caseInsensitive"> <call-bsh><