svn commit: r1627763 - in /ofbiz/trunk/applications/content/script/org/ofbiz/content: compdoc/CompDocServices.xml content/ContentServices.xml

[jacopoc]

Author: jacopoc
Date: Fri Sep 26 12:52:38 2014
New Revision: 1627763

URL: http://svn.apache.org/r1627763
Log:
The support for dynamic result names in field-to-result:
<field-to-result field="value" result-name="${key}"/>
is no more supported: converted minilang code that was still using this syntax and was broken by the refactoring.


Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.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=1627763&r1=1627762&r2=1627763&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 Fri Sep 26 12:52:38 2014
@@ -197,12 +197,17 @@ under the License.
             <results-to-map map-name="pResults"/>
         </call-service>
         <!--  put all the result fields in this service's result -->
-        <iterate-map map="pResults" key="key" value="val">
-            <if-compare field="key" operator="equals" value="responseMessage">
-                <continue/>
-            </if-compare>
-            <field-to-result field="val" result-name="${key}"/>
-        </iterate-map>
+        <set-service-fields service-name="persistCompDoc" mode="OUT" map="pResults" to-map="filteredPersistOut"/>
+        <field-to-result field="filteredPersistOut.contentRevisionSeqId" result-name="contentRevisionSeqId"/>
+        <field-to-result field="filteredPersistOut.contentId" result-name="contentId"/>
+        <field-to-result field="filteredPersistOut.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="filteredPersistOut.drDataResourceId" result-name="drDataResourceId"/>
+        <field-to-result field="filteredPersistOut.caContentIdTo" result-name="caContentIdTo"/>
+        <field-to-result field="filteredPersistOut.caContentId" result-name="caContentId"/>
+        <field-to-result field="filteredPersistOut.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
+        <field-to-result field="filteredPersistOut.caFromDate" result-name="caFromDate"/>
+        <field-to-result field="filteredPersistOut.caSequenceNum" result-name="caSequenceNum"/>
+        <field-to-result field="filteredPersistOut.roleTypeList" result-name="roleTypeList"/>
 
         <log level="info" message="pResults : ${pResults}"/>
         <if-not-empty field="pResults.contentIdTo">

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=1627763&r1=1627762&r2=1627763&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 Fri Sep 26 12:52:38 2014
@@ -780,12 +780,17 @@
         </call-service>
 
         <set-service-fields service-name="createCommContentDataResource" mode="OUT" map="persistOut" to-map="filteredPersistOut"/>
-        <iterate-map key="key" value="val" map="filteredPersistOut">
-            <if-compare field="key" operator="equals" value="responseMessage">
-                <continue/>
-            </if-compare>
-            <field-to-result field="val" result-name="${key}"/>
-        </iterate-map>
+        <field-to-result field="filteredPersistOut.contentId" result-name="contentId"/>
+        <field-to-result field="filteredPersistOut.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="filteredPersistOut.drDataResourceId" result-name="drDataResourceId"/>
+        <field-to-result field="filteredPersistOut.caContentIdTo" result-name="caContentIdTo"/>
+        <field-to-result field="filteredPersistOut.caContentId" result-name="caContentId"/>
+        <field-to-result field="filteredPersistOut.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
+        <field-to-result field="filteredPersistOut.caFromDate" result-name="caFromDate"/>
+        <field-to-result field="filteredPersistOut.caSequenceNum" result-name="caSequenceNum"/>
+        <field-to-result field="filteredPersistOut.roleTypeList" result-name="roleTypeList"/>
+        <field-to-result field="filteredPersistOut.fromDate" result-name="fromDate"/>
+
         <set field="mapIn.contentId"  from-field="persistOut.contentId"/>
         <set field="mapIn.communicationEventId"  from-field="parameters.communicationEventId"/>
         <set field="mapIn.sequenceNum"  from-field="parameters.sequenceNum"/>
@@ -819,12 +824,16 @@
         <call-service service-name="updateCommEventContentAssoc" in-map-name="mapIn">
         </call-service>
 
-        <iterate-map key="key" value="val" map="persistOut">
-            <if-compare field="key" operator="equals" value="responseMessage">
-                <continue/>
-            </if-compare>
-            <field-to-result field="val" result-name="${key}"/>
-        </iterate-map>
+        <set-service-fields service-name="updateCommContentDataResource" mode="OUT" map="persistOut" to-map="filteredPersistOut"/>
+        <field-to-result field="filteredPersistOut.contentId" result-name="contentId"/>
+        <field-to-result field="filteredPersistOut.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="filteredPersistOut.drDataResourceId" result-name="drDataResourceId"/>
+        <field-to-result field="filteredPersistOut.caContentIdTo" result-name="caContentIdTo"/>
+        <field-to-result field="filteredPersistOut.caContentId" result-name="caContentId"/>
+        <field-to-result field="filteredPersistOut.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
+        <field-to-result field="filteredPersistOut.caFromDate" result-name="caFromDate"/>
+        <field-to-result field="filteredPersistOut.caSequenceNum" result-name="caSequenceNum"/>
+        <field-to-result field="filteredPersistOut.roleTypeList" result-name="roleTypeList"/>
 
     </simple-method>