You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2008/06/14 08:03:15 UTC
svn commit: r667748 [3/16] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounti...
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml Fri Jun 13 23:03:12 2008
@@ -55,18 +55,18 @@
<entity-condition entity-name="AcctgTransEntry" list-name="acctgTransEntries">
<condition-expr field-name="productId" env-name="productId"/>
</entity-condition>
- <assert><not><if-empty field-name="acctgTransEntries"/></not></assert>
+ <assert><not><if-empty field="acctgTransEntries"/></not></assert>
<iterate list-name="acctgTransEntries" entry-name="acctgTransEntry">
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="UNINVOICED_SHIP_RCPT"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="214000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="UNINVOICED_SHIP_RCPT"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="214000"/>
</assert>
<else>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="INVENTORY_ACCOUNT"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="140000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="INVENTORY_ACCOUNT"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="140000"/>
</assert>
</if-compare>
</else>
@@ -107,18 +107,18 @@
<set field="debitTotal" type="Double" value="0.0"/>
<set field="creditTotal" type="Double" value="0.0"/>
- <assert><not><if-empty field-name="acctgTransEntries"/></not></assert>
+ <assert><not><if-empty field="acctgTransEntries"/></not></assert>
<iterate list-name="acctgTransEntries" entry-name="acctgTransEntry">
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_PAYABLE"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="210000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_PAYABLE"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="210000"/>
</assert>
<calculate field-name="creditTotal">
<calcop operator="add" field-name="acctgTransEntry.origAmount"/>
</calculate>
<else>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<calculate field-name="debitTotal">
<calcop operator="add" field-name="acctgTransEntry.origAmount"/>
</calculate>
@@ -127,7 +127,7 @@
</if-compare>
</iterate>
<assert>
- <if-compare field-name="debitTotal" operator="equals" value="creditTotal"/>
+ <if-compare field="debitTotal" operator="equals" value="creditTotal"/>
</assert>
<check-errors/>
</simple-method>
@@ -161,19 +161,19 @@
<set field="debitTotal" type="Double" value="0.0"/>
<set field="creditTotal" type="Double" value="0.0"/>
- <assert><not><if-empty field-name="acctgTransEntries"/></not></assert>
+ <assert><not><if-empty field="acctgTransEntries"/></not></assert>
<iterate list-name="acctgTransEntries" entry-name="acctgTransEntry">
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<!--<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="GENERAL_CHECKING_ACCOUNT"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="111100"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="GENERAL_CHECKING_ACCOUNT"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="111100"/>
</assert>-->
<set field="creditTotal" from-field="acctgTransEntry.origAmount"/>
<else>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_PAYABLE"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="210000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_PAYABLE"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="210000"/>
</assert>
<set field="debitTotal" from-field="acctgTransEntry.origAmount"/>
</if-compare>
@@ -181,7 +181,7 @@
</if-compare>
</iterate>
<assert>
- <if-compare field-name="debitTotal" operator="equals" value="creditTotal"/>
+ <if-compare field="debitTotal" operator="equals" value="creditTotal"/>
</assert>
<check-errors/>
</simple-method>
@@ -225,18 +225,18 @@
<condition-expr field-name="productId" operator="equals" env-name="productId"/>
</entity-condition>
- <assert><not><if-empty field-name="acctgTransEntries"/></not></assert>
+ <assert><not><if-empty field="acctgTransEntries"/></not></assert>
<iterate list-name="acctgTransEntryList" entry-name="acctgTransEntry">
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="INVENTORY_ACCOUNT"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="140000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="INVENTORY_ACCOUNT"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="140000"/>
</assert>
<else>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="COGS_ACCOUNT"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="500000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="COGS_ACCOUNT"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="500000"/>
</assert>
</if-compare>
</else>
@@ -278,18 +278,18 @@
<first-from-list list-name="acctgTransList" entry-name="acctgTrans"/>
<get-related value-name="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntries"/>
- <assert><not><if-empty field-name="acctgTransEntries"/></not></assert>
+ <assert><not><if-empty field="acctgTransEntries"/></not></assert>
<iterate entry-name="acctgTransEntry" list-name="acctgTransEntries">
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<!--<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="SALES_ACCOUNT"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="400000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="SALES_ACCOUNT"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="400000"/>
</assert>-->
<else>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_RECEIVABLE"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="120000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_RECEIVABLE"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="120000"/>
</assert>
</if-compare>
</else>
@@ -329,21 +329,21 @@
<set field="debitTotal" type="Double" value="0.0"/>
<set field="creditTotal" type="Double" value="0.0"/>
- <assert><not><if-empty field-name="acctgTransEntries"/></not></assert>
+ <assert><not><if-empty field="acctgTransEntries"/></not></assert>
<iterate entry-name="acctgTransEntry" list-name="acctgTransEntries">
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<!--<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_RECEIVABLE"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="120000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_RECEIVABLE"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="120000"/>
</assert>-->
<calculate field-name="creditTotal">
<calcop operator="add" field-name="acctgTransEntry.origAmount"/>
</calculate>
</if-compare>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<!--<assert>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="UNDEPOSITED_RECEIPTS"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="112000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="UNDEPOSITED_RECEIPTS"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="112000"/>
</assert>-->
<calculate field-name="debitTotal">
<calcop operator="add" field-name="acctgTransEntry.origAmount"/>
@@ -351,7 +351,7 @@
</if-compare>
</iterate>
<assert>
- <if-compare field-name="debitTotal" operator="equals" value="creditTotal"/>
+ <if-compare field="debitTotal" operator="equals" value="creditTotal"/>
</assert>
<check-errors/>
</simple-method>
@@ -387,12 +387,12 @@
</condition-list>
</condition-list>
</entity-condition>
- <assert><not><if-empty field-name="workEffortAndInventoryAssigns"/></not></assert>
+ <assert><not><if-empty field="workEffortAndInventoryAssigns"/></not></assert>
<set field="totalIssuedQty_MAT_A_COST" value="0.0" type="Double"/>
<set field="totalIssuedQty_MAT_B_COST" value="0.0" type="Double"/>
<iterate list-name="workEffortAndInventoryAssigns" entry-name="workEffortAndInventoryAssign">
- <if-compare field-name="workEffortAndInventoryAssign.productId" operator="equals" value="MAT_A_COST">
+ <if-compare field="workEffortAndInventoryAssign.productId" operator="equals" value="MAT_A_COST">
<calculate field-name="totalIssuedQty_MAT_A_COST">
<calcop operator="add">
<calcop operator="get" field-name="workEffortAndInventoryAssign.quantity"/>
@@ -400,7 +400,7 @@
</calcop>
</calculate>
<else>
- <if-compare field-name="workEffortAndInventoryAssign.productId" operator="equals" value="MAT_B_COST">
+ <if-compare field="workEffortAndInventoryAssign.productId" operator="equals" value="MAT_B_COST">
<calculate field-name="totalIssuedQty_MAT_B_COST">
<calcop operator="add">
<calcop operator="get" field-name="workEffortAndInventoryAssign.quantity" />
@@ -412,33 +412,33 @@
</if-compare>
</iterate>
<assert>
- <if-compare field-name="totalIssuedQty_MAT_A_COST" operator="equals" value="4.0" type="Double"/>
- <if-compare field-name="totalIssuedQty_MAT_B_COST" operator="equals" value="6.0" type="Double"/>
+ <if-compare field="totalIssuedQty_MAT_A_COST" operator="equals" value="4.0" type="Double"/>
+ <if-compare field="totalIssuedQty_MAT_B_COST" operator="equals" value="6.0" type="Double"/>
</assert>
<entity-and entity-name="AcctgTrans" list-name="acctgTransList">
<field-map field-name="acctgTransTypeId" value="INVENTORY"/>
</entity-and>
- <assert><not><if-empty field-name="acctgTransList"/></not></assert>
+ <assert><not><if-empty field="acctgTransList"/></not></assert>
<iterate list-name="acctgTransList" entry-name="acctgTrans">
<get-related list-name="acctgTransEntryList" relation-name="AcctgTransEntry" value-name="acctgTrans"/>
- <assert><not><if-empty field-name="acctgTransEntryList"/></not></assert>
+ <assert><not><if-empty field="acctgTransEntryList"/></not></assert>
<iterate list-name="acctgTransEntryList" entry-name="acctgTransEntry">
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<assert>
<or>
- <if-compare field-name="acctgTransEntry.productId" operator="equals" value="MAT_A_COST"/>
- <if-compare field-name="acctgTransEntry.productId" operator="equals" value="MAT_B_COST"/>
+ <if-compare field="acctgTransEntry.productId" operator="equals" value="MAT_A_COST"/>
+ <if-compare field="acctgTransEntry.productId" operator="equals" value="MAT_B_COST"/>
</or>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="RAWMAT_INVENTORY"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="141000"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="RAWMAT_INVENTORY"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="141000"/>
</assert>
<else>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<assert>
- <if-compare field-name="acctgTransEntry.productId" operator="equals" value="PROD_COST"/>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="WIP_INVENTORY"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="142000"/>
+ <if-compare field="acctgTransEntry.productId" operator="equals" value="PROD_COST"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="WIP_INVENTORY"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="142000"/>
</assert>
</if-compare>
</else>
@@ -471,22 +471,22 @@
<field-map field-name="workEffortId" env-name="workEffortId"/>
</entity-one>
<get-related value-name="workEffort" relation-name="AcctgTrans" list-name="acctgTransList"/>
- <assert><not><if-empty field-name="acctgTransList"></if-empty></not></assert>
+ <assert><not><if-empty field="acctgTransList"></if-empty></not></assert>
<iterate list-name="acctgTransList" entry-name="acctgTrans">
<get-related value-name="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntryList"/>
<iterate list-name="acctgTransEntryList" entry-name="acctgTransEntry">
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<assert>
- <if-compare field-name="acctgTransEntry.productId" operator="equals" value="PROD_COST"/>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="OPERATING_EXPENSE"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="600000"/>
+ <if-compare field="acctgTransEntry.productId" operator="equals" value="PROD_COST"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="OPERATING_EXPENSE"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="600000"/>
</assert>
<else>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<assert>
- <if-compare field-name="acctgTransEntry.productId" operator="equals" value="PROD_COST"/>
- <if-compare field-name="acctgTransEntry.glAccountTypeId" operator="equals" value="WIP_INVENTORY"/>
- <if-compare field-name="acctgTransEntry.glAccountId" operator="equals" value="142000"/>
+ <if-compare field="acctgTransEntry.productId" operator="equals" value="PROD_COST"/>
+ <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="WIP_INVENTORY"/>
+ <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="142000"/>
</assert>
</if-compare>
</else>
@@ -523,8 +523,8 @@
</entity-and>
<first-from-list list-name="acctgTransEntryList" entry-name="acctgTransEntry"/>
<assert>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C"/>
- <if-compare field-name="acctgTransEntry.origAmount" operator="equals" value="328" type="Double"/>
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C"/>
+ <if-compare field="acctgTransEntry.origAmount" operator="equals" value="328" type="Double"/>
</assert>
<!-- For debit entry -->
@@ -536,9 +536,9 @@
</entity-and>
<first-from-list list-name="acctgTransEntryList" entry-name="acctgTransEntry"/>
<assert>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D"/>
- <if-compare field-name="acctgTransEntry.origAmount" operator="equals" value="328" type="Double"/>
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D"/>
+ <if-compare field="acctgTransEntry.origAmount" operator="equals" value="328" type="Double"/>
</assert>
<check-errors/>
</simple-method>
-</simple-methods>
\ No newline at end of file
+</simple-methods>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Fri Jun 13 23:03:12 2008
@@ -29,10 +29,10 @@
<condition>
<and>
<not>
- <if-empty field-name="parameters.uploadedFile"/>
+ <if-empty field="parameters.uploadedFile"/>
</not>
<not>
- <if-empty field-name="parameters.textData"/>
+ <if-empty field="parameters.textData"/>
</not>
</and>
</condition>
@@ -63,7 +63,7 @@
<if>
<condition>
<not>
- <if-empty field-name="parameters.uploadedFile"/>
+ <if-empty field="parameters.uploadedFile"/>
</not>
</condition>
<then>
@@ -87,7 +87,7 @@
<result-to-field result-name="contentId" field-name="imageContentId"/>
</call-service>
- <if-empty field-name="contentId">
+ <if-empty field="contentId">
<set field="contentIdFrom" from-field="imageContentId"/>
<set field="contentId" from-field="imageContentId"/>
<set field="contentAssocTypeId" value="SUB_CONTENT"/>
@@ -98,7 +98,7 @@
<if>
<condition>
<not>
- <if-empty field-name="parameters.textData"/>
+ <if-empty field="parameters.textData"/>
</not>
</condition>
<then>
@@ -121,7 +121,7 @@
<result-to-field result-name="contentId" field-name="textContentId"/>
</call-service>
- <if-empty field-name="contentId">
+ <if-empty field="contentId">
<set field="contentIdFrom" from-field="textContentId"/>
<set field="contentId" from-field="textContentId"/>
<set field="contentAssocTypeId" value="SUB_CONTENT"/>
@@ -134,10 +134,10 @@
<condition>
<and>
<not>
- <if-empty field-name="contentId"/>
+ <if-empty field="contentId"/>
</not>
<not>
- <if-empty field-name="parameters.summaryData"/>
+ <if-empty field="parameters.summaryData"/>
</not>
</and>
</condition>
@@ -189,7 +189,7 @@
<result-to-field result-name="permissionStatus" field-name="permissionStatus"/>
</call-service>
<log level="info" message="permissionStatus: ${permissionStatus}"/>
- <if-compare operator="equals" field-name="permissionStatus" value="granted">
+ <if-compare operator="equals" field="permissionStatus" value="granted">
<set field="blogList[]" from-field="view"/>
</if-compare>
</iterate>
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=667748&r1=667747&r2=667748&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 Jun 13 23:03:12 2008
@@ -28,14 +28,14 @@
<log message="genCompDocInstance> rootTemplateContent: ${rootTemplateContent}" level="info"/>
<!-- if not passed in, get latest template contentRevisionSeqId from db -->
- <if-empty field-name="parameters.contentRevisionSeqId">
+ <if-empty field="parameters.contentRevisionSeqId">
<entity-condition entity-name="ContentRevision" list-name="contentRevisionList">
<condition-list>
<condition-expr field-name="contentId" operator="equals" env-name="parameters.instanceOfContentId"/>
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
- <if-not-empty field-name="contentRevisionList">
+ <if-not-empty field="contentRevisionList">
<set from-field="contentRevisionList[0].contentRevisionSeqId" field="contentRevisionSeqId"/>
<else>
<set value="" field="contentRevisionSeqId"/>
@@ -48,7 +48,7 @@
<log message="genCompDocInstance> contentRevisionSeqId: ${contentRevisionSeqId}" level="info"/>
<make-value entity-name="Content" value-name="rootInstanceContent"/>
- <if-empty field-name="parameters.rootInstanceContentId">
+ <if-empty field="parameters.rootInstanceContentId">
<sequenced-id-to-env sequence-name="Content" env-name="rootInstanceContent.contentId"/>
<log level="info" message="genCompDocInstance 2> rootInstanceContent: ${rootInstanceContent}"/>
<else>
@@ -56,7 +56,7 @@
<entity-one entity-name="Content" value-name="existingContent">
<field-map field-name="contentId" env-name="parameters.rootInstanceContentId"/>
</entity-one>
- <if-not-empty field-name="existingContent">
+ <if-not-empty field="existingContent">
<add-error>
<fail-message message="Instance compdoc Content for ${parameters.rootInstanceContentId} already exists"/>
</add-error>
@@ -144,13 +144,13 @@
<simple-method method-name="persistCompDoc" short-description="Create CompDoc">
<!-- create the compdoc Content entity -->
<set-service-fields service-name="persistContentAndAssoc" map-name="parameters" to-map-name="persistMap"/>
- <if-not-empty field-name="parameters.mimeTypeId">
+ <if-not-empty field="parameters.mimeTypeId">
<if>
<condition>
<or>
- <if-compare field-name="parameters.mimeTypeId" operator="equals" value="application/msword"/>
- <if-compare field-name="parameters.mimeTypeId" operator="equals" value="application/pdf"/>
- <if-compare field-name="parameters.mimeTypeId" operator="equals" value="application/octet-stream"/>
+ <if-compare field="parameters.mimeTypeId" operator="equals" value="application/msword"/>
+ <if-compare field="parameters.mimeTypeId" operator="equals" value="application/pdf"/>
+ <if-compare field="parameters.mimeTypeId" operator="equals" value="application/octet-stream"/>
</or>
</condition>
<then>
@@ -159,10 +159,10 @@
<else-if>
<condition>
<or>
- <if-compare field-name="parameters.mimeTypeId" operator="equals" value="image/jpeg"/>
- <if-compare field-name="parameters.mimeTypeId" operator="equals" value="image/gif"/>
- <if-compare field-name="parameters.mimeTypeId" operator="equals" value="image/tiff"/>
- <if-compare field-name="parameters.mimeTypeId" operator="equals" value="image/png"/>
+ <if-compare field="parameters.mimeTypeId" operator="equals" value="image/jpeg"/>
+ <if-compare field="parameters.mimeTypeId" operator="equals" value="image/gif"/>
+ <if-compare field="parameters.mimeTypeId" operator="equals" value="image/tiff"/>
+ <if-compare field="parameters.mimeTypeId" operator="equals" value="image/png"/>
</or>
</condition>
<then>
@@ -171,7 +171,7 @@
</else-if>
<else-if>
<condition>
- <if-compare field-name="parameters.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey"/>
+ <if-compare field="parameters.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey"/>
</condition>
<then>
<set value="SURVEY" field="persistMap.dataResourceTypeId"/>
@@ -179,7 +179,7 @@
</else-if>
<else-if>
<condition>
- <if-compare field-name="parameters.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey.response"/>
+ <if-compare field="parameters.mimeTypeId" operator="equals" value="application/vnd.ofbiz.survey.response"/>
</condition>
<then>
<set value="SURVEY_RESPONSE" field="persistMap.dataResourceTypeId"/>
@@ -202,7 +202,7 @@
</iterate-map>
<log level="info" message="pResults : ${pResults}"/>
- <if-not-empty field-name="pResults.contentIdTo">
+ <if-not-empty field="pResults.contentIdTo">
<set from-field="pResults.contentIdTo" field="resequenceMap.contentIdTo"/>
<set value="COMPDOC_PART" field="resequenceMap.typeList[]"/>
<set value="10" field="resequenceMap.seqInc" type="Integer"/>
@@ -212,8 +212,8 @@
<if>
<condition>
<or>
- <if-compare field-name="persistMap.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
- <if-compare field-name="persistMap.contentTypeId" operator="equals" value="TEMPLATE"/>
+ <if-compare field="persistMap.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
+ <if-compare field="persistMap.contentTypeId" operator="equals" value="TEMPLATE"/>
</or>
</condition>
<then>
@@ -224,8 +224,8 @@
<if>
<condition>
<or>
- <if-compare field-name="persistMap.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/>
- <if-compare field-name="persistMap.contentTypeId" operator="equals" value="DOCUMENT"/>
+ <if-compare field="persistMap.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/>
+ <if-compare field="persistMap.contentTypeId" operator="equals" value="DOCUMENT"/>
</or>
</condition>
<then>
@@ -247,8 +247,8 @@
<if>
<condition>
<or>
- <if-compare field-name="persistMap.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
- <if-compare field-name="persistMap.contentTypeId" operator="equals" value="TEMPLATE"/>
+ <if-compare field="persistMap.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
+ <if-compare field="persistMap.contentTypeId" operator="equals" value="TEMPLATE"/>
</or>
</condition>
<then>
@@ -397,7 +397,7 @@
<order-by field-name="contentRevisionSeqId DESC"/>
</entity-condition>
<log level="info" message="contentRevisionList: ${contentRevisionList}"/>
- <if-not-empty field-name="contentRevisionList">
+ <if-not-empty field="contentRevisionList">
<set field="newEntity" from-field="contentRevisionList[0]"/>
<set field="incrementedSeq" from-field="newEntity.contentRevisionSeqId"/>
<else>
@@ -406,7 +406,7 @@
</if-not-empty>
<log level="info" message="incrementedSeq(0): ${incrementedSeq}"/>
<log level="info" message="ContentRevision(0): ${newEntity}"/>
- <if-not-empty field-name="incrementedSeq">
+ <if-not-empty field="incrementedSeq">
<calculate field-name="incrementedSeq" type="Long">
<calcop operator="add">
<calcop operator="get" field-name="incrementedSeq"/>
@@ -431,7 +431,7 @@
<set field="newEntity.contentRevisionSeqId" from-field="paddedSeqId"/>
<log level="info" message="ContentRevision(1): ${newEntity}"/>
<create-value value-name="newEntity"/>
- <if-not-empty field-name="parameters.itemContentId">
+ <if-not-empty field="parameters.itemContentId">
<make-value entity-name="ContentRevisionItem" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set field="newEntity.contentRevisionSeqId" from-field="paddedSeqId"/>
@@ -451,12 +451,12 @@
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
- <if-not-empty field-name="contentRevisionItems">
+ <if-not-empty field="contentRevisionItems">
<set field="contentRevisionItem" from-field="contentRevisionItems[0]"/>
<entity-one entity-name="Content" value-name="content" use-cache="true">
<field-map field-name="contentId" env-name="contentRevisionItem.itemContentId"/>
</entity-one>
- <if-not-empty field-name="content">
+ <if-not-empty field="content">
<entity-one entity-name="DataResource" value-name="dataResource" use-cache="true">
<field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
</entity-one>
@@ -473,7 +473,7 @@
<entity-one entity-name="Content" value-name="content" use-cache="true">
<field-map field-name="contentId" env-name="contentRevisionItem.itemContentId"/>
</entity-one>
- <if-not-empty field-name="content">
+ <if-not-empty field="content">
<entity-one entity-name="DataResource" value-name="dataResource" use-cache="true">
<field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
</entity-one>
@@ -493,7 +493,7 @@
<make-value entity-name="ContentApproval" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.contentApprovalId">
+ <if-empty field="newEntity.contentApprovalId">
<sequenced-id-to-env sequence-name="ContentApproval" env-name="newEntity.contentApprovalId"/>
</if-empty>
<create-value value-name="newEntity"/>
@@ -555,7 +555,7 @@
<order-by field-name="-sequenceNum"/>
</entity-condition>
<log level="info" message="contentApprovalList2: ${contentApprovalList2}"/>
- <if-not-empty field-name="contentApprovalList2">
+ <if-not-empty field="contentApprovalList2">
<set from-field="contentApprovalList2[0].contentApprovalId" field="contentApprovalId"/>
<set from-field="contentApprovalList2[0]" field="contentApproval"/>
<log level="info" message="contentApproval: ${contentApproval}"/>
@@ -627,7 +627,7 @@
<set from-field="maxContentApprovalList[0].maxContentRevisionSeqId" field="maxContentRevisionSeqId"/>
<if>
<condition>
- <if-empty field-name="maxContentRevisionSeqId"/>
+ <if-empty field="maxContentRevisionSeqId"/>
</condition>
<then>
<!-- if an instance track, check to see if there any new or deleted records on the template -->
@@ -675,13 +675,13 @@
<sequenced-id-to-env sequence-name="ContentApproval" env-name="contentApproval.contentApprovalId"/>
<set from-field="nowTimestamp" field="contentApproval.approvalDate"/>
- <if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE">
+ <if-compare field="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE">
<if>
<!-- not rejected, soft rejected or approved, reset to ready -->
<condition>
<or>
- <if-compare field-name="finalApprovalStatusId" operator="equals" value="CNTAP_REJECTED"/>
- <if-compare field-name="finalApprovalStatusId" operator="equals" value="CNTAP_APPROVED"/>
+ <if-compare field="finalApprovalStatusId" operator="equals" value="CNTAP_REJECTED"/>
+ <if-compare field="finalApprovalStatusId" operator="equals" value="CNTAP_APPROVED"/>
</or>
</condition>
<then>
@@ -691,10 +691,10 @@
<!-- soft rejected, reset rejected (shouldn't be any) and soft rejected entities to ready -->
<condition>
<and>
- <if-compare field-name="finalApprovalStatusId" operator="equals" value="CNTAP_SOFT_REJ"/>
+ <if-compare field="finalApprovalStatusId" operator="equals" value="CNTAP_SOFT_REJ"/>
<or>
- <if-compare field-name="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_SOFT_REJ"/>
- <if-compare field-name="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_REJECTED"/>
+ <if-compare field="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_SOFT_REJ"/>
+ <if-compare field="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_REJECTED"/>
</or>
</and>
</condition>
@@ -706,8 +706,8 @@
<condition>
<and>
<!-- soft rejected and current record is not soft/rejected, keep currentstatus -->
- <if-compare field-name="finalApprovalStatusId" operator="equals" value="CNTAP_SOFT_REJ"/>
- <if-compare field-name="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_APPROVED"/>
+ <if-compare field="finalApprovalStatusId" operator="equals" value="CNTAP_SOFT_REJ"/>
+ <if-compare field="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_APPROVED"/>
</and>
</condition>
<then>
@@ -748,7 +748,7 @@
<condition-expr field-name="roleTypeId" operator="equals" env-name="templateContentApproval.roleTypeId" ignore-if-empty="true"/>
</condition-list>
</entity-condition>
- <if-empty field-name="newContentApprovalList">
+ <if-empty field="newContentApprovalList">
<clone-value value-name="templateContentApproval" new-value-name="contentApproval"/>
<set from-field="thisContentRevisionSeqId" field="contentApproval.contentRevisionSeqId"/>
<set field="contentApproval.contentId" from-field="thisContentId"/>
@@ -769,13 +769,13 @@
<find-by-primary-key entity-name="ContentApproval" value-name="contentApproval" map-name="contentApprovalPK" use-cache="true"/>
<set field="partyId" from-field="parameters.userLogin.partyId"/>
<log level="info" message="contentApproval: ${contentApproval}"/>
- <if-compare field-name="contentApproval.partyId" value="${partyId}" operator="equals">
+ <if-compare field="contentApproval.partyId" value="${partyId}" operator="equals">
<set field="approvalPermExists" value="true"/>
<log level="info" message="approvalPermExists: ${approvalPermExists}"/>
<field-to-result result-name="approvalPermExists" field-name="approvalPermExists"/>
<return/>
</if-compare>
- <if-not-empty field-name="contentApproval.roleTypeId">
+ <if-not-empty field="contentApproval.roleTypeId">
<now-timestamp-to-env env-name="nowTimestamp"/>
<entity-condition entity-name="ContentRole" list-name="contentRoleList">
<condition-list combine="and">
@@ -788,7 +788,7 @@
</condition-list>
</condition-list>
</entity-condition>
- <if-not-empty field-name="contentRoleList">
+ <if-not-empty field="contentRoleList">
<set field="approvalPermExists" value="true"/>
<field-to-result field-name="approvalPermExists" result-name="approvalPermExists"/>
<return/>
@@ -828,7 +828,7 @@
<if>
<condition>
<not>
- <if-empty field-name="contentApprovalList"/>
+ <if-empty field="contentApprovalList"/>
</not>
</condition>
<then>
@@ -837,8 +837,8 @@
<if>
<condition>
<or>
- <if-compare field-name="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_SOFT_REJ"/>
- <if-compare field-name="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_REJECTED"/>
+ <if-compare field="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_SOFT_REJ"/>
+ <if-compare field="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_REJECTED"/>
</or>
</condition>
<then>
@@ -846,7 +846,7 @@
</then>
<else-if>
<condition>
- <if-compare field-name="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_APPROVED"/>
+ <if-compare field="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_APPROVED"/>
</condition>
<then>
<set value="CNTAP_APPROVED" field="finalApprovalStatusId"/>
@@ -855,8 +855,8 @@
<else-if>
<condition>
<and>
- <if-compare field-name="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_READY"/>
- <if-compare field-name="finalApprovalStatusId" operator="equals" value="CNTAP_APPROVED"/>
+ <if-compare field="existingContentApproval.approvalStatusId" operator="equals" value="CNTAP_READY"/>
+ <if-compare field="finalApprovalStatusId" operator="equals" value="CNTAP_APPROVED"/>
</and>
</condition>
<then>
@@ -914,7 +914,7 @@
<order-by field-name="-sequenceNum"/>
</entity-condition>
<log level="info" message="contentApprovalList2: ${contentApprovalList2}"/>
- <if-not-empty field-name="contentApprovalList2">
+ <if-not-empty field="contentApprovalList2">
<set from-field="contentApprovalList2[0].contentApprovalId" field="contentApprovalId"/>
<log level="info" message="contentApproval: ${contentApproval}"/>
<set field="contentApprovalIdList[]" from-field="contentApprovalId"/>
@@ -939,7 +939,7 @@
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
<log level="info" message="contentRevisions: ${contentRevisions}"/>
- <if-not-empty field-name="contentRevisions">
+ <if-not-empty field="contentRevisions">
<set from-field="contentRevisions[0].contentRevisionSeqId" field="mostRecentRevisionSeqId"/>
</if-not-empty>
<field-to-result field-name="mostRecentRevisionSeqId" result-name="mostRecentRevisionSeqId"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml Fri Jun 13 23:03:12 2008
@@ -55,7 +55,7 @@
<result-to-field field-name="contentId" result-name="contentId"/>
<result-to-request request-name="contentId" result-name="contentId"/>
</call-service>
- <if-empty field-name="contentId">
+ <if-empty field="contentId">
<add-error>
<fail-message message="Permission not granted."/>
</add-error>
@@ -63,7 +63,7 @@
<check-errors/>
<session-to-field session-name="currentEntityMap" field-name="entityMap"/>
- <if-not-empty field-name="entityMap">
+ <if-not-empty field="entityMap">
<set field="currentEntityMap" from-field="entityMap"/>
</if-not-empty>
<make-value entity-name="Content" value-name="contentPK"/>
@@ -73,7 +73,7 @@
<log level="always" message="currentEntityMap: ${currentEntityMap}"/>
<field-to-session session-name="currentEntityMap" field-name="currentEntityMap"/>
- <if-not-empty field-name="contentPurposeTypeId" map-name="parameters">
+ <if-not-empty field="parameters.contentPurposeTypeId">
<log level="always" message="contentPurposeTypeId: ${parameters.contentPurposeTypeId}"/>
<make-value entity-name="ContentPurpose" value-name="newContentPurpose"/>
<set field="newContentPurpose.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml Fri Jun 13 23:03:12 2008
@@ -23,7 +23,7 @@
<make-value entity-name="Content" value-name="currentContent"/>
<set-pk-fields map-name="parameters" value-name="currentContent"/>
<set-nonpk-fields map-name="parameters" value-name="currentContent"/>
- <if-empty field-name="contentId" map-name="currentContent">
+ <if-empty field="currentContent.contentId">
<make-next-seq-id seq-field-name="contentId" value-name="currentContent"/>
<sequenced-id-to-env env-name="id" sequence-name="Content"/>
<set field="currentContent.contentId" from-field="id"/>
@@ -45,16 +45,16 @@
<log level="always" message="permissionStatus:${permissionStatus}"/>
- <if-compare field-name="permissionStatus" operator="not-equals" type="String" value="granted">
+ <if-compare field="permissionStatus" operator="not-equals" type="String" value="granted">
<add-error>
<fail-message message="Permission not granted."/>
</add-error>
</if-compare>
<check-errors/>
- <if-compare field-name="permissionStatus" operator="equals" type="String" value="granted">
+ <if-compare field="permissionStatus" operator="equals" type="String" value="granted">
<create-value value-name="currentContent"/>
- <if-not-empty field-name="contentPurposeTypeId" map-name="parameters">
+ <if-not-empty field="parameters.contentPurposeTypeId">
<make-value entity-name="ContentPurpose" value-name="newContentPurpose"/>
<set field="newContentPurpose.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
<set field="newContentPurpose.contentId" from-field="currentContent.contentId"/>
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=667748&r1=667747&r2=667748&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 Jun 13 23:03:12 2008
@@ -27,12 +27,12 @@
<set-nonpk-fields value-name="content" map-name="parameters"/>
<set-pk-fields value-name="content" map-name="parameters"/>
- <if-empty field-name="content.contentId">
+ <if-empty field="content.contentId">
<sequenced-id-to-env sequence-name="Content" env-name="contentId"/>
<set field="content.contentId" from-field="contentId"/>
</if-empty>
- <if-empty field-name="content.statusId">
+ <if-empty field="content.statusId">
<!-- get the first status item -->
<entity-and entity-name="StatusItem" list-name="contentStatus">
<field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
@@ -79,7 +79,7 @@
<set field="assoc.contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" />
<now-timestamp-to-env env-name="nowTimestamp"/>
- <if-empty field-name="assoc.fromDate">
+ <if-empty field="assoc.fromDate">
<set field="assoc.fromDate" from-field="nowTimestamp"/>
</if-empty>
@@ -117,13 +117,13 @@
<entity-one entity-name="Content" value-name="content"/>
<field-to-result field-name="content.statusId" result-name="oldStatusId"/>
- <if-compare-field field-name="content.statusId" operator="not-equals" to-field-name="parameters.statusId">
+ <if-compare-field field="content.statusId" to-field="parameters.statusId" operator="not-equals">
<entity-one entity-name="StatusValidChange" value-name="statusChange" auto-field-map="false">
<field-map field-name="statusId" env-name="content.statusId"/>
<field-map field-name="statusIdTo" env-name="parameters.statusId"/>
</entity-one>
- <if-empty field-name="statusChange">
+ <if-empty field="statusChange">
<add-error><fail-message message="Cannot change from ${content.statusId} to ${parameters.statusId}"/></add-error>
<log level="error" message="Cannot change from ${content.statusId} to ${parameters.statusId}"/>
<check-errors/>
@@ -140,7 +140,7 @@
<call-service service-name="getContent" in-map-name="getC">
<result-to-field result-name="view" field-name="content"/>
</call-service>
- <if-not-empty field-name="content.dataResourceId">
+ <if-not-empty field="content.dataResourceId">
<set-service-fields service-name="getElectronicText" map-name="content" to-map-name="getEt"/>
<call-service service-name="getElectronicText" in-map-name="getEt">
<result-to-field result-name="textData" field-name="et.textData"/>
@@ -202,7 +202,7 @@
<find-by-primary-key value-name="currentContent" entity-name="Content" map-name="pk" />
<find-by-primary-key value-name="fromContent" entity-name="Content" map-name="pk" />
- <if-compare field-name="permissionStatus" operator="equals" type="String" value="granted">
+ <if-compare field="permissionStatus" operator="equals" type="String" value="granted">
<make-value entity-name="ContentAssoc" value-name="newContentAssoc"/>
<set from-field="parameters.contentIdTo" field="newContentAssoc.contentIdTo"/>
<set from-field="parameters.contentIdFrom" field="newContentAssoc.contentId"/>
@@ -212,12 +212,12 @@
<now-timestamp-to-env env-name="newContentAssoc.createdDate"/>
<now-timestamp-to-env env-name="newContentAssoc.lastModifiedDate"/>
- <if-empty map-name="parameters" field-name="fromDate" >
+ <if-empty field="parameters.fromDate">
<now-timestamp-to-env env-name="parameters.fromDate"/>
<to-string map-name="parameters" field-name="fromDate" />
</if-empty>
<set from-field="parameters.fromDate" field="newContentAssoc.fromDate"/>
- <if-not-empty map-name="parameters" field-name="thruDate" >
+ <if-not-empty field="parameters.thruDate">
<set from-field="parameters.thruDate" field="newContentAssoc.thruDate"/>
</if-not-empty>
<create-value value-name="newContentAssoc" />
@@ -248,13 +248,13 @@
<!-- Methods for ContentRole -->
<simple-method method-name="createContentRole" short-description="Create Content Role">
- <if-empty field-name="parameters.fromDate">
+ <if-empty field="parameters.fromDate">
<now-timestamp-to-env env-name="parameters.fromDate"/>
</if-empty>
<make-value value-name="partyRolePK" entity-name="PartyRole"/>
<set-pk-fields value-name="partyRolePK" map-name="parameters"/>
<find-by-primary-key entity-name="PartyRole" map-name="partyRolePK" value-name="partyRole"/>
- <if-empty field-name="partyRole">
+ <if-empty field="partyRole">
<make-value entity-name="PartyRole" map-name="partyRolePK" value-name="partyRole"/>
<create-value value-name="partyRole"/>
</if-empty>
@@ -263,7 +263,7 @@
<make-value entity-name="ContentRole" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<find-by-primary-key entity-name="ContentRole" map-name="newEntity" value-name="contentRole"/>
- <if-empty field-name="contentRole">
+ <if-empty field="contentRole">
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</if-empty>
@@ -359,7 +359,7 @@
<make-value entity-name="ContentPurposeType" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="contentPurposeTypeId" map-name="newEntity">
+ <if-empty field="newEntity.contentPurposeTypeId">
<make-next-seq-id seq-field-name="contentPurposeTypeId" value-name="newEntity"/>
</if-empty>
<create-value value-name="newEntity"/>
@@ -542,7 +542,7 @@
<log level="always" message="${parameters}"/>
- <if-not-empty field-name="uploadedFile" map-name="parameters">
+ <if-not-empty field="parameters.uploadedFile">
<log level="always" message="Uploaded file found; processing sub-content"/>
<set-service-fields service-name="createContentFromUploadedFile" map-name="parameters" to-map-name="uploadContext"/>
<set field="uploadContext.ownerContentId" from-field="parameters.parentContentId"/>
@@ -570,7 +570,7 @@
</iterate>
<if>
<condition>
- <if-empty field-name="mapKey" map-name="parameters"/>
+ <if-empty field="parameters.mapKey"/>
</condition>
<then>
<field-to-result field-name="result" result-name="contentAssocs"/>
@@ -631,17 +631,17 @@
</check-permission>
<check-errors/>
- <if-not-empty field-name="subjectDataResourceId" map-name="parameters">
+ <if-not-empty field="parameters.subjectDataResourceId">
<set from-field="parameters.subjectDataResourceId" field="updateSubjectEt.dataResourceId"/>
<set from-field="parameters.subject" field="updateSubjectEt.textData"/>
<call-service service-name="updateElectronicText" in-map-name="updateSubjectEt"/>
</if-not-empty>
- <if-not-empty field-name="plainBodyDataResourceId" map-name="parameters">
+ <if-not-empty field="parameters.plainBodyDataResourceId">
<set from-field="parameters.plainBodyDataResourceId" field="updatePlainBodyEt.dataResourceId"/>
<set from-field="parameters.plainBody" field="updatePlainBodyEt.textData"/>
<call-service service-name="updateElectronicText" in-map-name="updatePlainBodyEt"/>
</if-not-empty>
- <if-not-empty field-name="htmlBodyDataResourceId" map-name="parameters">
+ <if-not-empty field="parameters.htmlBodyDataResourceId">
<set from-field="parameters.htmlBodyDataResourceId" field="updateHtmlBodyEt.dataResourceId"/>
<set from-field="parameters.htmlBody" field="updateHtmlBodyEt.textData"/>
<call-service service-name="updateElectronicText" in-map-name="updateHtmlBodyEt"/>
@@ -669,7 +669,7 @@
</check-permission>
<check-errors/>
- <if-not-empty field-name="fileDataResourceId" map-name="parameters">
+ <if-not-empty field="parameters.fileDataResourceId">
<set from-field="parameters.fileDataResourceId" field="updateFile.dataResourceId"/>
<set from-field="parameters.file" field="updateFile.dataResourceContent"/>
<call-service service-name="updateOtherDataResource" in-map-name="updateFile"/>
@@ -708,7 +708,7 @@
</check-permission>
<check-errors/>
- <if-not-empty field-name="textDataResourceId" map-name="parameters">
+ <if-not-empty field="parameters.textDataResourceId">
<set from-field="parameters.textDataResourceId" field="updateSimpleText.dataResourceId"/>
<set from-field="parameters.text" field="updateSimpleText.textData"/>
<call-service service-name="updateElectronicText" in-map-name="updateSimpleText"/>
@@ -734,26 +734,26 @@
<entity-one entity-name="DataResource" value-name="dataResource">
<field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
</entity-one>
- <if-empty field-name="dataResource">
+ <if-empty field="dataResource">
<add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error>
</if-empty>
<check-errors/>
<set-service-fields service-name="createContent" map-name="parameters" to-map-name="createContentMap"/>
- <if-empty field-name="createContentMap.contentName">
+ <if-empty field="createContentMap.contentName">
<set field="createContentMap.contentName" from-field="dataResource.dataResourceName"/>
</if-empty>
- <if-empty field-name="createContentMap.contentTypeId">
+ <if-empty field="createContentMap.contentTypeId">
<set field="createContentMap.contentTypeId" value="DOCUMENT"/>
</if-empty>
- <if-empty field-name="createContentMap.statusId">
+ <if-empty field="createContentMap.statusId">
<set field="createContentMap.statusId" value="CTNT_INITIAL_DRAFT"/>
</if-empty>
- <if-empty field-name="createContentMap.mimeTypeId">
+ <if-empty field="createContentMap.mimeTypeId">
<set from-field="dataResource.mimeTypeId" field="createContentMap.mimeTypeId"/>
</if-empty>
@@ -780,7 +780,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<set-service-fields to-map-name="persistIn" service-name="persistContentAndAssoc" map-name="parameters"/>
<!-- let's take a guess at what the dataResourceTypeId should be if it is empty -->
- <if-empty field-name="persistIn.dataResourceTypeId">
+ <if-empty field="persistIn.dataResourceTypeId">
<log level="info" message="persistIn.drMimeTypeId: ${persistIn.drMimeTypeId}" />
<if-regexp expr="text.*" field-name="persistIn.drMimeTypeId">
<set field="persistIn.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
@@ -843,7 +843,7 @@
<make-value entity-name="CommEventContentAssoc" value-name="commEventContentAssoc" />
<set-pk-fields value-name="commEventContentAssoc" map-name="parameters"/>
<set-nonpk-fields value-name="commEventContentAssoc" map-name="parameters"/>
- <if-empty field-name="commEventContentAssoc.fromDate">
+ <if-empty field="commEventContentAssoc.fromDate">
<now-timestamp-to-env env-name="commEventContentAssoc.fromDate"/>
</if-empty>
<create-value value-name="commEventContentAssoc" />
@@ -856,7 +856,7 @@
<make-value entity-name="CommEventContentAssoc" value-name="pkCommEventContentAssoc" />
<set-pk-fields value-name="pkCommEventContentAssoc" map-name="parameters"/>
<find-by-primary-key value-name="commEventContentAssoc" map-name="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/>
- <if-empty field-name="commEventContentAssoc">
+ <if-empty field="commEventContentAssoc">
<add-error>
<fail-message message="CommEventContentAssoc entity not found for update, communicationEventId: ${parameters.communicationEventId} and contentId: ${parameters.contentId}"/>
</add-error>
@@ -869,7 +869,7 @@
<make-value entity-name="CommEventContentAssoc" value-name="pkCommEventContentAssoc" />
<set-pk-fields value-name="pkCommEventContentAssoc" map-name="parameters"/>
<find-by-primary-key value-name="commEventContentAssoc" map-name="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/>
- <if-empty field-name="commEventContentAssoc">
+ <if-empty field="commEventContentAssoc">
<add-error>
<fail-message message="CommEventContentAssoc entity not found for removal, communicationEventId: ${parameters.communicationEventId} and contentId: ${parameters.contentId}"/>
</add-error>
@@ -882,7 +882,7 @@
<call-service service-name="createContent" in-map-name="contentData">
<result-to-field result-name="contentId" field-name="newContentId"/>
</call-service>
- <if-not-empty field-name="newContentId">
+ <if-not-empty field="newContentId">
<set-service-fields service-name="createContentAssoc" map-name="parameters" to-map-name="assocData"/>
<set field="assocData.contentId" from-field="newContentId"/>
<call-service service-name="createContentAssoc" in-map-name="assocData">
@@ -898,12 +898,12 @@
<entity-one entity-name="DataResource" value-name="resultData.dataResource">
<field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
</entity-one>
- <if-not-empty field-name="resultData.dataResource">
- <if-compare field-name="resultData.dataResource.dataResourceTypeId" value="ELECTRONIC_TEXT" operator="equals">
+ <if-not-empty field="resultData.dataResource">
+ <if-compare field="resultData.dataResource.dataResourceTypeId" value="ELECTRONIC_TEXT" operator="equals">
<get-related-one value-name="resultData.dataResource" relation-name="ElectronicText"
to-value-name="resultData.electronicText"/>
</if-compare>
- <if-compare field-name="resultData.dataResource.dataResourceTypeId" value="IMAGE_OBJECT" operator="equals">
+ <if-compare field="resultData.dataResource.dataResourceTypeId" value="IMAGE_OBJECT" operator="equals">
<get-related-one value-name="resultData.dataResource" relation-name="ImageDataResource"
to-value-name="resultData.imageDataResource"/>
</if-compare>
@@ -915,8 +915,8 @@
<entity-one entity-name="Content" value-name="resultDataContent.content">
<field-map field-name="contentId" env-name="parameters.contentId"/>
</entity-one>
- <if-not-empty field-name="resultDataContent.content">
- <if-not-empty field-name="resultDataContent.content.dataResourceId">
+ <if-not-empty field="resultDataContent.content">
+ <if-not-empty field="resultDataContent.content.dataResourceId">
<set field="parameters.dataResourceId" from-field="resultDataContent.content.dataResourceId"/>
<call-simple-method method-name="getDataResource"/>
<set field="resultDataContent.dataResource" from-field="resultData.dataResource"/>
@@ -938,12 +938,12 @@
<condition>
<and>
<not>
- <if-empty field-name="parameters.contentIdFrom"/>
+ <if-empty field="parameters.contentIdFrom"/>
</not>
<not>
- <if-empty field-name="parameters.contentId"/>
+ <if-empty field="parameters.contentId"/>
</not>
- <if-empty field-name="parameters.contentIdTo"/>
+ <if-empty field="parameters.contentIdTo"/>
</and>
</condition>
<then>
@@ -954,7 +954,7 @@
<else-if>
<condition>
<not>
- <if-empty field-name="parameters.contentIdTo"/>
+ <if-empty field="parameters.contentIdTo"/>
</not>
</condition>
<then>
@@ -973,7 +973,7 @@
<set field="contentAssocTypeId" from-field="parameters.contentAssocTypeId"/>
<set field="origContentAssocTypeId" from-field="parameters.contentAssocTypeId"/>
<set field="ownerContentId" from-field="parameters.threadContentId"/>
- <if-compare operator="equals" field-name="origContentAssocTypeId" value="PUBLISH_LINK">
+ <if-compare operator="equals" field="origContentAssocTypeId" value="PUBLISH_LINK">
<set field="ownerContentId" from-field="parameters.pubPtContentId"/>
</if-compare>
<set field="contentIdFrom" from-field="parameters.contentIdFrom"/>
@@ -996,7 +996,7 @@
<field field-name="intSubStringLen" type="int"/>
</call-object-method>
<log level="info" message="subDescript:${subDescript}"/>
- <if-compare operator="equals" field-name="contentAssocTypeId" value="PUBLISH_LINK">
+ <if-compare operator="equals" field="contentAssocTypeId" value="PUBLISH_LINK">
<set field="ownerContentId" from-field="pubPtContentId"/>
</if-compare>
@@ -1005,10 +1005,10 @@
<condition>
<and>
<not>
- <if-empty field-name="parameters.uploadedFile"/>
+ <if-empty field="parameters.uploadedFile"/>
</not>
<not>
- <if-empty field-name="parameters.textData"/>
+ <if-empty field="parameters.textData"/>
</not>
</and>
</condition>
@@ -1039,7 +1039,7 @@
<if>
<condition>
<not>
- <if-empty field-name="parameters.uploadedFile"/>
+ <if-empty field="parameters.uploadedFile"/>
</not>
</condition>
<then>
@@ -1063,7 +1063,7 @@
<result-to-field result-name="contentId" field-name="imageContentId"/>
</call-service>
- <if-empty field-name="contentId">
+ <if-empty field="contentId">
<set field="contentIdFrom" from-field="imageContentId"/>
<set field="contentId" from-field="imageContentId"/>
<set field="contentAssocTypeId" value="SUB_CONTENT"/>
@@ -1074,7 +1074,7 @@
<if>
<condition>
<not>
- <if-empty field-name="parameters.textData"/>
+ <if-empty field="parameters.textData"/>
</not>
</condition>
<then>
@@ -1097,7 +1097,7 @@
<result-to-field result-name="contentId" field-name="textContentId"/>
</call-service>
- <if-empty field-name="contentId">
+ <if-empty field="contentId">
<set field="contentIdFrom" from-field="textContentId"/>
<set field="contentId" from-field="textContentId"/>
<set field="contentAssocTypeId" value="SUB_CONTENT"/>
@@ -1110,10 +1110,10 @@
<condition>
<and>
<not>
- <if-empty field-name="contentId"/>
+ <if-empty field="contentId"/>
</not>
<not>
- <if-empty field-name="parameters.summaryData"/>
+ <if-empty field="parameters.summaryData"/>
</not>
</and>
</condition>
@@ -1137,7 +1137,7 @@
</if>
<!-- If a response, still link it to the publish point -->
- <if-compare operator="equals" field-name="origContentAssocTypeId" value="RESPONSE">
+ <if-compare operator="equals" field="origContentAssocTypeId" value="RESPONSE">
<set field="contentAssocMap.contentId" from-field="pubPtContentId"/>
<set field="contentAssocMap.contentIdTo" from-field="contentId"/>
<set field="contentAssocMap.contentAssocTypeId" value="RESPONSE"/>
@@ -1167,10 +1167,10 @@
<condition>
<and>
<not>
- <if-empty field-name="parameters.mainAction"/>
+ <if-empty field="parameters.mainAction"/>
</not>
<not>
- <if-empty field-name="parameters.userLogin"/>
+ <if-empty field="parameters.userLogin"/>
</not>
</and>
</condition>
@@ -1184,7 +1184,7 @@
</call-service>
</then>
</if>
- <if-compare operator="equals" field-name="hasPermission" value="true" type="Boolean">
+ <if-compare operator="equals" field="hasPermission" value="true" type="Boolean">
<set field="contentViewList[]" from-field="view"/>
</if-compare>
</iterate>