svn commit: r470680 - in /incubator/ofbiz/trunk/applications: content/script/org/ofbiz/content/content/ content/script/org/ofbiz/content/data/ product/script/org/ofbiz/product/inventory/

[jacopoc]

Author: jacopoc
Date: Thu Nov  2 22:16:03 2006
New Revision: 470680

URL: http://svn.apache.org/viewvc?view=rev&rev=470680
Log:
Applied patch from Ashish Vijaywargiya (OFBIZ-402) to convert deprecated minilang operations.

Modified:
    incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml
    incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
    incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml

Modified: incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml?view=diff&rev=470680&r1=470679&r2=470680
==============================================================================
--- incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml (original)
+++ incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml Thu Nov  2 22:16:03 2006
@@ -56,7 +56,7 @@
 
       <session-to-field session-name="currentEntityMap" field-name="entityMap" />
       <if-not-empty field-name="entityMap" >
-          <env-to-env env-name="entityMap" to-env-name="currentEntityMap" />
+          <set field="currentEntityMap" from-field="entityMap"/>
       </if-not-empty>
       <make-value entity-name="Content" value-name="contentPK"/>
       <env-to-field env-name="contentId"

Modified: incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?view=diff&rev=470680&r1=470679&r2=470680
==============================================================================
--- incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Thu Nov  2 22:16:03 2006
@@ -618,7 +618,7 @@
     <!-- Util -->
     <simple-method method-name="findAssocContent" short-description="Find associated content">
         <set from-field="parameters.contentId" field="queryMap.contentId"/>
-        <field-to-env field-name="mapKeys" map-name="parameters"/>
+        <set field="mapKeys" from-field="parameters.mapKeys" />
         <field-to-list field-name="mapKey" list-name="mapKeys"/>
         <iterate entry-name="mapKey" list-name="mapKeys">
             <set from-field="mapKey" field="queryMap.mapKey"/>

Modified: incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?view=diff&rev=470680&r1=470679&r2=470680
==============================================================================
--- incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Thu Nov  2 22:16:03 2006
@@ -563,8 +563,8 @@
     -->
 
     <simple-method method-name="getElectronicText" short-description="Get Electronic Text" login-required="false">
-        <field-to-env field-name="userLogin" map-name="parameters" env-name="userLogin"/>
-        <field-to-env field-name="content" map-name="parameters" env-name="currentContent"/>
+        <set field="userLogin" from-field="parameters.userLogin" />
+        <set field="currentContent" from-field="parameters.content" />
         <log level="always" message="GETELECTRONICTEXT, currentContent:${currentContent}"/>
         
         <if-empty field-name="currentContent">

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?view=diff&rev=470680&r1=470679&r2=470680
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Thu Nov  2 22:16:03 2006
@@ -41,9 +41,9 @@
                         <if-not-empty field-name="orderItem.productId">
                             <clear-field field-name="callSvcMap"/>
                             <set-service-fields to-map-name="callSvcMap" service-name="issueImmediatelyFulfilledOrderItem" map-name="orderItem"/>
-                            <env-to-env env-name="orderHeader" to-env-name="callSvcMap.orderHeader"/>
-                            <env-to-env env-name="orderItem" to-env-name="callSvcMap.orderItem"/>
-                            <env-to-env env-name="productStore" to-env-name="callSvcMap.productStore"/>
+                            <set field="callSvcMap.orderHeader" from-field="orderHeader" />
+                            <set field="callSvcMap.orderItem" from-field="orderItem" />
+                            <set field="callSvcMap.productStore" from-field="productStore" />
                             <call-service service-name="issueImmediatelyFulfilledOrderItem" in-map-name="callSvcMap"/>
                         </if-not-empty>
                     </iterate>
@@ -62,7 +62,7 @@
         <if-empty field-name="parameters.orderItem">
             <entity-one entity-name="OrderItem" value-name="orderItem"/>
         <else>
-            <env-to-env env-name="parameters.orderItem" to-env-name="orderItem"/>
+            <set field="orderItem" from-field="parameters.orderItem" />
         </else>
         </if-empty>
 
@@ -74,7 +74,7 @@
             <if-empty field-name="parameters.orderHeader">
                 <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
             <else>
-                <env-to-env env-name="parameters.orderHeader" to-env-name="orderHeader"/>
+                <set field="orderHeader" from-field="parameters.orderHeader" />
             </else>
             </if-empty>
             
@@ -84,7 +84,7 @@
                     <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/>
                 </entity-one>
             <else>
-                <env-to-env env-name="parameters.productStore" to-env-name="productStore"/>
+                <set field="productStore" from-field="parameters.productStore" />
             </else>
             </if-empty>
             
@@ -107,11 +107,11 @@
             </else>
             </if-compare>
             <field-to-list field-name="orderByString" list-name="orderByList"/>
-            <env-to-env env-name="orderItem.productId" to-env-name="lookupFieldMap.productId"/>
-            <env-to-env env-name="orderHeader.originFacilityId" to-env-name="lookupFieldMap.facilityId"/>
+            <set field="lookupFieldMap.productId" from-field="orderItem.productId" />
+            <set field="lookupFieldMap.facilityId" from-field="orderHeader.originFacilityId" />            
             <find-by-and entity-name="InventoryItem" map-name="lookupFieldMap" list-name="inventoryItemList" order-by-list-name="orderByList"/>
     
-            <env-to-env env-name="orderItem.quantity" to-env-name="parameters.quantityNotIssued"/>
+            <set field="parameters.quantityNotIssued" from-field="orderItem.quantity" />
 
             <iterate entry-name="inventoryItem" list-name="inventoryItemList">
                 <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names -->
@@ -125,17 +125,17 @@
                     <set field="issuanceCreateMap.orderId" from-field="parameters.orderId" />
                     <set field="issuanceCreateMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />
                     <set field="issuanceCreateMap.inventoryItemId" from-field="lastNonSerInventoryItem.inventoryItemId" />
-                    <env-to-env env-name="parameters.quantityNotIssued" to-env-name="issuanceCreateMap.quantity"/>
+                    <set field="issuanceCreateMap.quantity" from-field="parameters.quantityNotIssued" />
                     <call-service service-name="createItemIssuance" in-map-name="issuanceCreateMap">
                         <result-to-field result-name="itemIssuanceId"/>
                     </call-service>
 
                     <!-- subtract from quantityNotIssued from the availableToPromise and quantityOnHand of existing inventory item -->
                     <!-- instead of updating InventoryItem, add an InventoryItemDetail -->
-                    <env-to-env env-name="lastNonSerInventoryItem.inventoryItemId" to-env-name="createDetailMap.inventoryItemId"/>
-                    <env-to-env env-name="parameters.orderId" to-env-name="createDetailMap.orderId"/>
-                    <env-to-env env-name="parameters.orderItemSeqId" to-env-name="createDetailMap.orderItemSeqId"/>
-                    <env-to-env env-name="itemIssuanceId" to-env-name="createDetailMap.itemIssuanceId"/>
+                    <set field="createDetailMap.inventoryItemId" from-field="lastNonSerInventoryItem.inventoryItemId" />
+                    <set field="createDetailMap.orderId" from-field="parameters.orderId" />
+                    <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />                                        
+                    <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId" />                    
                     <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
                         <calcop field-name="parameters.quantityNotIssued" operator="negative"/>
                     </calculate>
@@ -161,16 +161,16 @@
                     <set field="issuanceCreateMap.orderId" from-field="parameters.orderId" />
                     <set field="issuanceCreateMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />
                     <set field="issuanceCreateMap.inventoryItemId" from-field="createInvItemOutMap.inventoryItemId"/>
-                    <env-to-env env-name="parameters.quantityNotIssued" to-env-name="issuanceCreateMap.quantity"/>
+                    <set field="issuanceCreateMap.quantity" from-field="parameters.quantityNotIssued" />
                     <call-service service-name="createItemIssuance" in-map-name="issuanceCreateMap">
                         <result-to-field result-name="itemIssuanceId"/>
                     </call-service>
 
                     <!-- also create a detail record with the quantities -->
                     <set field="createDetailMap.inventoryItemId" from-field="createInvItemOutMap.inventoryItemId"/>
-                    <env-to-env env-name="parameters.orderId" to-env-name="createDetailMap.orderId"/>
-                    <env-to-env env-name="parameters.orderItemSeqId" to-env-name="createDetailMap.orderItemSeqId"/>
-                    <env-to-env env-name="itemIssuanceId" to-env-name="createDetailMap.itemIssuanceId"/>
+                    <set field="createDetailMap.orderId" from-field="parameters.orderId" />
+                    <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />
+                    <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId" />
                     <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
                         <calcop field-name="parameters.quantityNotIssued" operator="negative"/>
                     </calculate>
@@ -231,10 +231,10 @@
                         </call-service>
 
                         <!-- instead of updating InventoryItem, add an InventoryItemDetail -->
-                        <env-to-env env-name="inventoryItem.inventoryItemId" to-env-name="createDetailMap.inventoryItemId"/>
-                        <env-to-env env-name="parameters.orderId" to-env-name="createDetailMap.orderId"/>
-                        <env-to-env env-name="parameters.orderItemSeqId" to-env-name="createDetailMap.orderItemSeqId"/>
-                        <env-to-env env-name="itemIssuanceId" to-env-name="createDetailMap.itemIssuanceId"/>
+                        <set field="createDetailMap.inventoryItemId" from-field="inventoryItem.inventoryItemId" />
+                        <set field="createDetailMap.orderId" from-field="parameters.orderId" />
+                        <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />
+                        <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId" />
                         <!-- update availableToPromiseDiff AND quantityOnHandDiff since this is an issuance -->
                         <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
                             <calcop field-name="parameters.deductAmount" operator="negative"/>
@@ -258,7 +258,7 @@
 
                 <!-- keep track of the last non-serialized inventory item for use if inventory is not sufficient for amount already issued -->
                 <!-- use env variable named lastNonSerInventoryItem -->
-                <env-to-env env-name="inventoryItem" to-env-name="lastNonSerInventoryItem"/>
+                <set field="lastNonSerInventoryItem" from-field="inventoryItem" />
             </if-compare>
         </if-compare>
     </simple-method>