You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 13:09:18 UTC
svn commit: r730112 - in /ofbiz/trunk/applications:
content/script/org/ofbiz/content/compdoc/
content/script/org/ofbiz/content/content/ order/script/org/ofbiz/order/order/
product/script/org/ofbiz/product/category/
product/script/org/ofbiz/product/inve...
Author: jleroux
Date: Tue Dec 30 04:09:17 2008
New Revision: 730112
URL: http://svn.apache.org/viewvc?rev=730112&view=rev
Log:
<iterate-map : map key value
Modified:
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=730112&r1=730111&r2=730112&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Tue Dec 30 04:09:17 2008
@@ -197,7 +197,7 @@
<results-to-map map-name="pResults"/>
</call-service>
<!-- put all the result fields in this service's result -->
- <iterate-map map-name="pResults" key-name="key" value-name="val">
+ <iterate-map map="pResults" key="key" value="val">
<field-to-result field-name="val" result-name="${key}"/>
</iterate-map>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730112&r1=730111&r2=730112&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Dec 30 04:09:17 2008
@@ -795,7 +795,7 @@
<results-to-map map-name="persistOut"/>
</call-service>
- <iterate-map key-name="key" value-name="val" map-name="persistOut">
+ <iterate-map key="key" value="val" map="persistOut">
<field-to-result field-name="val" result-name="${key}"/>
</iterate-map>
@@ -831,7 +831,7 @@
<call-service service-name="updateCommEventContentAssoc" in-map-name="mapIn">
</call-service>
- <iterate-map key-name="key" value-name="val" map-name="persistOut">
+ <iterate-map key="key" value="val" map="persistOut">
<field-to-result field-name="val" result-name="${key}"/>
</iterate-map>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=730112&r1=730111&r2=730112&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Tue Dec 30 04:09:17 2008
@@ -98,7 +98,7 @@
</iterate>
<!-- go through all send to parties and get email addresses -->
- <iterate-map key-name="sendToPartyId" value-name="sendToPartyIdValue" map-name="sendToPartyIdMap">
+ <iterate-map key="sendToPartyId" value="sendToPartyIdValue" map="sendToPartyIdMap">
<set field="sendToPartyPcmFindMap.partyId" from-field="sendToPartyId"/>
<set field="sendToPartyPcmFindMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
<find-by-and entity-name="PartyAndContactMech" map-name="sendToPartyPcmFindMap" list-name="sendToPartyPartyAndContactMechs"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730112&r1=730111&r2=730112&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Dec 30 04:09:17 2008
@@ -528,7 +528,7 @@
<!-- create ProductFeatureAppl(s) -->
<set field="hasSelectableFeatures" value="N"/>
- <iterate-map map-name="parameters.productFeatureIdByType" key-name="productFeatureTypeId" value-name="productFeatureId">
+ <iterate-map map="parameters.productFeatureIdByType" key="productFeatureTypeId" value="productFeatureId">
<log level="info" message="Applying feature [${productFeatureId}] of type [${productFeatureTypeId}] to product [${productId}]"/>
<set field="createPfaMap.productId" from-field="productId"/>
<set field="createPfaMap.productFeatureId" from-field="productFeatureId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730112&r1=730111&r2=730112&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 04:09:17 2008
@@ -822,7 +822,7 @@
</iterate>
<!-- now go through touchedOrderIdMap keys and make a Set/Map of orderIds that are no longer on back-order -->
- <iterate-map key-name="touchedOrderId" value-name="throwAwayValue" map-name="touchedOrderIdMap">
+ <iterate-map key="touchedOrderId" value="throwAwayValue" map="touchedOrderIdMap">
<set field="checkOrderIsOnBackOrderMap.orderId" from-field="touchedOrderId"/>
<call-service service-name="checkOrderIsOnBackOrder" in-map-name="checkOrderIsOnBackOrderMap">
<result-to-field result-name="isBackOrder"/>
@@ -933,7 +933,7 @@
</iterate>
<!-- now go through touchedOrderIdMap keys and make a Set/Map of orderIds that are no longer on back-order -->
- <iterate-map key-name="touchedOrderId" value-name="throwAwayValue" map-name="touchedOrderIdMap">
+ <iterate-map key="touchedOrderId" value="throwAwayValue" map="touchedOrderIdMap">
<set field="checkOrderIsOnBackOrderMap.orderId" from-field="touchedOrderId"/>
<call-service service-name="checkOrderIsOnBackOrder" in-map-name="checkOrderIsOnBackOrderMap">
<result-to-field result-name="isBackOrder"/>
@@ -965,7 +965,7 @@
<set field="orderItems.${oisgir.orderItemSeqId}" from-field="oisgir"/>
</iterate>
<now-timestamp-to-env env-name="nowTimestamp"/>
- <iterate-map key-name="orderItemSeqId" value-name="oisgir" map-name="orderItems">
+ <iterate-map key="orderItemSeqId" value="oisgir" map="orderItems">
<set field="reassignInventoryReservationsCtx.productId" from-field="oisgir.productId"/>
<set field="reassignInventoryReservationsCtx.facilityId" from-field="oisgir.facilityId"/>
<if-not-empty field="oisgir.shipBeforeDate">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=730112&r1=730111&r2=730112&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Tue Dec 30 04:09:17 2008
@@ -58,7 +58,7 @@
</iterate>
<!-- now get all info for each origin location -->
- <iterate-map key-name="locationSeqId" value-name="perLocationOiirailList" map-name="oiirailByLocMap">
+ <iterate-map key="locationSeqId" value="perLocationOiirailList" map="oiirailByLocMap">
<!-- now for more fun, split up by productId; this should generally not happen, but we'll make sure here -->
<clear-field field="oiirailByProdMap"/>
<iterate entry="orderItemShipGrpInvResAndItemLocation" list="perLocationOiirailList">
@@ -67,7 +67,7 @@
<clear-field field="perProductOiirailList"/>
<clear-field field="productId"/>
- <iterate-map key-name="productId" value-name="perProductOiirailList" map-name="oiirailByProdMap">
+ <iterate-map key="productId" value="perProductOiirailList" map="oiirailByProdMap">
<!-- get product -->
<entity-one entity-name="Product" value-field="moveInfo.product"/>
@@ -274,7 +274,7 @@
</iterate>
<clear-field field="locationSeqId"/>
<clear-field field="perLocationInventoryItemAndLocList"/>
- <iterate-map key-name="locationSeqId" value-name="perLocationInventoryItemAndLocList" map-name="InventoryItemAndLocationByLocMap">
+ <iterate-map key="locationSeqId" value="perLocationInventoryItemAndLocList" map="InventoryItemAndLocationByLocMap">
<if-empty field="fromLocationTotalAvailableToPromise.${locationSeqId}">
<calculate field-name="totalQuantityOnHand" type="Double"><number value="0"/></calculate>
<calculate field-name="totalAvailableToPromise" type="Double"><number value="0"/></calculate>
@@ -444,7 +444,7 @@
<field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByInvItemMap.${orderItemShipGrpInvResAndItemLocation.inventoryItemId}"/>
</iterate>
- <iterate-map key-name="inventoryItemId" value-name="orderItemShipGrpInvResAndItemLocationList" map-name="oiirailByInvItemMap">
+ <iterate-map key="inventoryItemId" value="orderItemShipGrpInvResAndItemLocationList" map="oiirailByInvItemMap">
<entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<!-- if this is a serialized InventoryItem, then just update the location -->
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730112&r1=730111&r2=730112&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Tue Dec 30 04:09:17 2008
@@ -434,7 +434,7 @@
<!-- warn if insufficient QOH for reserved amount -->
- <iterate-map map-name="inventoryItemQuantities" key-name="inventoryItemId" value-name="quantityNeeded">
+ <iterate-map map="inventoryItemQuantities" key="inventoryItemId" value="quantityNeeded">
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItem"/>
<if>
<condition>
@@ -907,7 +907,7 @@
<!-- === handle the ones by FacilityLocation === -->
<!-- make a facilityLocationList from the facilityLocationByLocationSeqIdMap, which was used to guarantee uniqueness of FacilityLocations -->
- <iterate-map map-name="facilityLocationByLocationSeqIdMap" key-name="locationSeqId" value-name="facilityLocationList[]"/>
+ <iterate-map map="facilityLocationByLocationSeqIdMap" key="locationSeqId" value="facilityLocationList[]"/>
<!-- order/sort the facilityLocations -->
<set value="+areaId" field="facilityLocsOrdLst[]"/>
@@ -951,7 +951,7 @@
</iterate>
<!-- create the picklistBinInfoList from the quantityByPicklistBinIdMap -->
- <iterate-map key-name="picklistBinId" value-name="quantity" map-name="facilityLocationInfo.quantityByPicklistBinIdMap">
+ <iterate-map key="picklistBinId" value="quantity" map="facilityLocationInfo.quantityByPicklistBinIdMap">
<clear-field field="picklistBinInfo"/>
<set from-field="picklistBinByIdMap.${picklistBinId}" field="picklistBinInfo.picklistBin"/>
<set from-field="quantity" field="picklistBinInfo.quantity"/>
@@ -964,7 +964,7 @@
<!-- === handle the ones by Product === -->
<!-- make a productList from the productByProductIdMap, which was used to guarantee uniqueness of Products -->
- <iterate-map map-name="productByProductIdMap" key-name="productId" value-name="productList[]"/>
+ <iterate-map map="productByProductIdMap" key="productId" value="productList[]"/>
<!-- order/sort the products -->
<set value="+productId" field="productsOrdLst[]"/>
@@ -992,7 +992,7 @@
</iterate>
<!-- create the picklistBinInfoList from the quantityByPicklistBinIdMap -->
- <iterate-map key-name="picklistBinId" value-name="quantity" map-name="productInfo.quantityByPicklistBinIdMap">
+ <iterate-map key="picklistBinId" value="quantity" map="productInfo.quantityByPicklistBinIdMap">
<clear-field field="picklistBinInfo"/>
<set from-field="picklistBinByIdMap.${picklistBinId}" field="picklistBinInfo.picklistBin"/>
<set from-field="quantity" field="picklistBinInfo.quantity"/>
@@ -1138,7 +1138,7 @@
<!-- This creates facilityLocationInfoList and inventoryItemInfoList (and for internal use facilityLocationMap) -->
<!-- go through all quantities and get inventoryItem and facilityLocation -->
- <iterate-map key-name="inventoryItemId" value-name="quantityNeeded" map-name="inventoryItemQuantities">
+ <iterate-map key="inventoryItemId" value="quantityNeeded" map="inventoryItemQuantities">
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItem"/>
<!-- create a list of locations, then sort it, will have to create a reverse Map to go from location to inventory item -->
@@ -1158,7 +1158,7 @@
</iterate-map>
<!-- make a facilityLocations List from the facilityLocationMap, which was used to guarantee uniqueness -->
- <iterate-map map-name="facilityLocationMap" key-name="locationSeqId" value-name="facilityLocation">
+ <iterate-map map="facilityLocationMap" key="locationSeqId" value="facilityLocation">
<set from-field="facilityLocation" field="facilityLocations[]"/>
</iterate-map>
@@ -1202,12 +1202,12 @@
</iterate>
</iterate>
- <iterate-map key-name="orderItemCompositeId" value-name="orderItem" map-name="orderItemMap">
+ <iterate-map key="orderItemCompositeId" value="orderItem" map="orderItemMap">
<set from-field="orderItem" field="productInfoMap.${orderItem.productId}.orderItemList[]"/>
</iterate-map>
<!-- move all values from productInfoMap to facilityLocationInfo.productInfoList -->
- <iterate-map key-name="productId" value-name="productInfo" map-name="productInfoMap">
+ <iterate-map key="productId" value="productInfo" map="productInfoMap">
<set from-field="productInfo" field="facilityLocationInfo.productInfoList[]"/>
</iterate-map>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730112&r1=730111&r2=730112&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 04:09:17 2008
@@ -710,7 +710,7 @@
</iterate>
<!-- go through all send to parties and get email addresses -->
- <iterate-map key-name="sendToPartyId" value-name="sendToPartyIdValue" map-name="sendToPartyIdMap">
+ <iterate-map key="sendToPartyId" value="sendToPartyIdValue" map="sendToPartyIdMap">
<entity-and entity-name="PartyAndContactMech" list-name="sendToPartyPartyAndContactMechs">
<field-map field-name="partyId" from-field="sendToPartyId"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>