svn commit: r1627784 - in /ofbiz/branches/release12.04: ./ applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml applications/content/script/org/ofbiz/content/content/ContentServices.xml

[jacopoc]

Author: jacopoc
Date: Fri Sep 26 13:31:52 2014
New Revision: 1627784

URL: http://svn.apache.org/r1627784
Log:
Applied fix from trunk for revision: 1627776
===

Some simplifications to the code introduced with my last commit: this will also simplify the backporting to release branches.


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
    ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/content/ContentServices.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1627776

Modified: ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=1627784&r1=1627783&r2=1627784&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original)
+++ ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Fri Sep 26 13:31:52 2014
@@ -197,9 +197,16 @@ 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">
-            <field-to-result field="val" result-name="${key}"/>
-        </iterate-map>
+        <field-to-result field="pResults.contentRevisionSeqId" result-name="contentRevisionSeqId"/>
+        <field-to-result field="pResults.contentId" result-name="contentId"/>
+        <field-to-result field="pResults.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="pResults.drDataResourceId" result-name="drDataResourceId"/>
+        <field-to-result field="pResults.caContentIdTo" result-name="caContentIdTo"/>
+        <field-to-result field="pResults.caContentId" result-name="caContentId"/>
+        <field-to-result field="pResults.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
+        <field-to-result field="pResults.caFromDate" result-name="caFromDate"/>
+        <field-to-result field="pResults.caSequenceNum" result-name="caSequenceNum"/>
+        <field-to-result field="pResults.roleTypeList" result-name="roleTypeList"/>
 
         <log level="info" message="pResults : ${pResults}"/>
         <if-not-empty field="pResults.contentIdTo">

Modified: ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1627784&r1=1627783&r2=1627784&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/content/ContentServices.xml Fri Sep 26 13:31:52 2014
@@ -778,9 +778,16 @@
             <results-to-map map-name="persistOut"/>
         </call-service>
 
-        <iterate-map key="key" value="val" map="persistOut">
-            <field-to-result field="val" result-name="${key}"/>
-        </iterate-map>
+        <field-to-result field="persistOut.contentId" result-name="contentId"/>
+        <field-to-result field="persistOut.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="persistOut.drDataResourceId" result-name="drDataResourceId"/>
+        <field-to-result field="persistOut.caContentIdTo" result-name="caContentIdTo"/>
+        <field-to-result field="persistOut.caContentId" result-name="caContentId"/>
+        <field-to-result field="persistOut.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
+        <field-to-result field="persistOut.caFromDate" result-name="caFromDate"/>
+        <field-to-result field="persistOut.caSequenceNum" result-name="caSequenceNum"/>
+        <field-to-result field="persistOut.roleTypeList" result-name="roleTypeList"/>
+        <field-to-result field="persistOut.fromDate" result-name="fromDate"/>
 
         <set field="mapIn.contentId"  from-field="persistOut.contentId"/>
         <!-- <set field="mapIn.fromDate"  from-field="nowTimestamp"/> -->
@@ -816,9 +823,15 @@
         <call-service service-name="updateCommEventContentAssoc" in-map-name="mapIn">
         </call-service>
 
-        <iterate-map key="key" value="val" map="persistOut">
-            <field-to-result field="val" result-name="${key}"/>
-        </iterate-map>
+        <field-to-result field="persistOut.contentId" result-name="contentId"/>
+        <field-to-result field="persistOut.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="persistOut.drDataResourceId" result-name="drDataResourceId"/>
+        <field-to-result field="persistOut.caContentIdTo" result-name="caContentIdTo"/>
+        <field-to-result field="persistOut.caContentId" result-name="caContentId"/>
+        <field-to-result field="persistOut.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
+        <field-to-result field="persistOut.caFromDate" result-name="caFromDate"/>
+        <field-to-result field="persistOut.caSequenceNum" result-name="caSequenceNum"/>
+        <field-to-result field="persistOut.roleTypeList" result-name="roleTypeList"/>
 
     </simple-method>