svn commit: r594296 - in /ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message: ConfirmBod.ftl ProcessShipment.ftl ReceiveDelivery.ftl

[jonesde]

Author: jonesde
Date: Mon Nov 12 12:59:24 2007
New Revision: 594296

URL: http://svn.apache.org/viewvc?rev=594296&view=rev
Log:
Changed templates to escape characters to avoid those that are in the strings but cause problems when just dropped into an XML file

Modified:
    ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl
    ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
    ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl?rev=594296&r1=594295&r2=594296&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl Mon Nov 12 12:59:24 2007
@@ -56,8 +56,8 @@
         <#if errorMapList?exists>
           <#list errorMapList as errorMap>
             <n:CONFIRMMSG>
-              <of:DESCRIPTN>${errorMap.description?if_exists}</of:DESCRIPTN>
-              <of:REASONCODE>${errorMap.reasonCode?if_exists}</of:REASONCODE>
+              <of:DESCRIPTN>${errorMap.description?if_exists?xml}</of:DESCRIPTN>
+              <of:REASONCODE>${errorMap.reasonCode?if_exists?xml}</of:REASONCODE>
             </n:CONFIRMMSG>
           </#list>
         </#if>

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?rev=594296&r1=594295&r2=594296&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Mon Nov 12 12:59:24 2007
@@ -67,8 +67,8 @@
         <#else>
           <of:FRGHTTERMS>PREPAID</of:FRGHTTERMS>
         </#if>
-        <of:NOTES>${orderItemShipGroup.shippingInstructions?if_exists}</of:NOTES>
-        <of:SHIPNOTES>${shipnotes?if_exists}</of:SHIPNOTES><#-- if order was a return replacement order (associated with return), then set to RETURNLABEL otherwise leave blank -->
+        <of:NOTES>${orderItemShipGroup.shippingInstructions?if_exists?xml}</of:NOTES>
+        <of:SHIPNOTES>${shipnotes?if_exists?xml}</of:SHIPNOTES><#-- if order was a return replacement order (associated with return), then set to RETURNLABEL otherwise leave blank -->
         <of:TRANSMETHD>${orderItemShipGroup.shipmentMethodTypeId?if_exists}</of:TRANSMETHD>
         <os:PARTNER>
           <#if address?has_content>
@@ -79,40 +79,40 @@
             <#-- NOTE: this is the to name -->
             <#assign toName = (address.toName)?default(partyName)?if_exists/>
             <#if (toName?length > partnerNameSize)><#assign toName = (toName?substring(0,partnerNameSize))?if_exists/></#if>
-            <of:NAME>${toName?if_exists}</of:NAME>
+            <of:NAME>${toName?if_exists?xml}</of:NAME>
             <of:PARTNRTYPE>SHIPTO</of:PARTNRTYPE>
             <of:CURRENCY>USD</of:CURRENCY>
             <os:ADDRESS>
               <#assign address1 = address.address1?if_exists/>
               <#if (address1?length > partnerAddressLineSize)><#assign address1 = (address1?substring(0,partnerAddressLineSize))?if_exists/></#if>
-              <of:ADDRLINE>${address1?if_exists}</of:ADDRLINE>
+              <of:ADDRLINE>${address1?if_exists?xml}</of:ADDRLINE>
               <#if address.address2?exists>
                 <#assign address2 = address.address2?if_exists/>
                 <#if (address2?length > partnerAddressLineSize)><#assign address2 = (address2?substring(0,partnerAddressLineSize))?if_exists/></#if>
-                <of:ADDRLINE>${address2}</of:ADDRLINE>
+                <of:ADDRLINE>${address2?xml}</of:ADDRLINE>
               </#if>
               <#assign city = address.city?if_exists/>
               <#if (city?length > partnerAddressCitySize)><#assign city = (city?substring(0,partnerAddressCitySize))?if_exists/></#if>
-              <of:CITY>${city?if_exists}</of:CITY>
+              <of:CITY>${city?if_exists?xml}</of:CITY>
               <#assign countryGeoId = address.countryGeoId?if_exists/>
               <#if (countryGeoId?length > partnerAddressCountrySize)><#assign countryGeoId = (countryGeoId?substring(0,partnerAddressCountrySize))?if_exists/></#if>
               <of:COUNTRY>${countryGeoId?if_exists}</of:COUNTRY>
               <#--<of:DESCRIPTN></of:DESCRIPTN>
               <of:FAX></of:FAX>-->
-              <of:POSTALCODE>${address.postalCode?if_exists}</of:POSTALCODE>
+              <of:POSTALCODE>${address.postalCode?if_exists?xml}</of:POSTALCODE>
               <of:STATEPROVN>${address.stateProvinceGeoId?if_exists}</of:STATEPROVN>
               <#if telecomNumber?has_content>
-              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode}-</#if>${telecomNumber.areaCode?if_exists}-${telecomNumber.contactNumber?if_exists}</of:TELEPHONE>
+              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
               </#if>
             </os:ADDRESS>
             <os:CONTACT>
               <#-- NOTE: this is the attention name -->
               <#assign attnName = (address.attnName)?default(partyName)?if_exists/>
               <#if (attnName?length > partnerContactNameSize)><#assign attnName = (attnName?substring(0,partnerContactNameSize))?if_exists/></#if>
-              <of:NAME>${attnName?if_exists}</of:NAME>
-              <of:EMAIL>${emailString?if_exists}</of:EMAIL>
+              <of:NAME>${attnName?if_exists?xml}</of:NAME>
+              <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL>
               <#--<of:FAX></of:FAX>-->
-              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode}-</#if>${telecomNumber.areaCode?if_exists}-${telecomNumber.contactNumber?if_exists}</of:TELEPHONE>
+              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
             </os:CONTACT>
           </#if>
         </os:PARTNER>
@@ -140,13 +140,13 @@
         <#list externalIdSet?if_exists as externalId>
         <n:DOCUMNTREF>
           <of:DOCTYPE>PARTNER_SO</of:DOCTYPE>
-          <of:DOCUMENTID>${externalId?if_exists}</of:DOCUMENTID>
+          <of:DOCUMENTID>${externalId?if_exists?xml}</of:DOCUMENTID>
         </n:DOCUMNTREF>
         </#list>
         <#list correspondingPoIdSet?if_exists as correspondingPoId>
         <n:DOCUMNTREF>
           <of:DOCTYPE>CUST_PO</of:DOCTYPE>
-          <of:DOCUMENTID>${correspondingPoId?if_exists}</of:DOCUMENTID>
+          <of:DOCUMENTID>${correspondingPoId?if_exists?xml}</of:DOCUMENTID>
         </n:DOCUMNTREF>
         </#list>
         <#-- data preparation code to create the replacementReturnId; this is the returnId if the order is a return replacement order -->

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl?rev=594296&r1=594295&r2=594296&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl Mon Nov 12 12:59:24 2007
@@ -54,26 +54,26 @@
                     <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if>
                     <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if>
                     <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if>
-                    <of:NAME>${postalAddress.toName?default(partyName)?if_exists}</of:NAME>
+                    <of:NAME>${postalAddress.toName?default(partyName)?if_exists?xml}</of:NAME>
                     <of:PARTNRTYPE>SHIPFROM</of:PARTNRTYPE>
                     <of:CURRENCY>USD</of:CURRENCY>
                     <os:ADDRESS>
-                        <of:ADDRLINE>${postalAddress.address1?if_exists}</of:ADDRLINE>
+                        <of:ADDRLINE>${postalAddress.address1?if_exists?xml}</of:ADDRLINE>
                         <#if postalAddress.address2?has_content>
-                        <of:ADDRLINE>${postalAddress.address2?if_exists}</of:ADDRLINE>                        
+                        <of:ADDRLINE>${postalAddress.address2?if_exists?xml}</of:ADDRLINE>                        
                         </#if>    
-                        <of:CITY>${postalAddress.city?if_exists}</of:CITY>
+                        <of:CITY>${postalAddress.city?if_exists?xml}</of:CITY>
                         <of:COUNTRY>${postalAddress.countryGeoId?if_exists}</of:COUNTRY>
                         <#-- <of:FAX></of:FAX> -->
-                        <of:POSTALCODE>${postalAddress.postalCode?if_exists}</of:POSTALCODE>
+                        <of:POSTALCODE>${postalAddress.postalCode?if_exists?xml}</of:POSTALCODE>
                         <of:STATEPROVN>${postalAddress.stateProvinceGeoId?if_exists}</of:STATEPROVN>
-                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode}-</#if>${telecomNumber.areaCode?if_exists}-${telecomNumber.contactNumber?if_exists}</of:TELEPHONE>
+                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
                     </os:ADDRESS>
                     <os:CONTACT>
-                        <of:NAME>${postalAddress.attnName?default(partyName)?if_exists}</of:NAME>
-                        <of:EMAIL>${emailString?if_exists}</of:EMAIL>
+                        <of:NAME>${postalAddress.attnName?default(partyName)?if_exists?xml}</of:NAME>
+                        <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL>
                         <#-- <of:FAX></of:FAX> -->
-                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode}-</#if>${telecomNumber.areaCode?if_exists}-${telecomNumber.contactNumber?if_exists}</of:TELEPHONE>
+                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
                     </os:CONTACT>
                 </#if>
                 </os:PARTNER>
@@ -96,15 +96,15 @@
                         <of:UOM>EACH</of:UOM>
                     </os:QUANTITY>
                     <of:ITEM>${returnItem.productId?if_exists}</of:ITEM>
-                    <of:NOTES>${returnReason.description?if_exists}</of:NOTES>
+                    <of:NOTES>${returnReason.description?if_exists?xml}</of:NOTES>
                     <os:DOCUMNTREF>
                         <of:DOCTYPE>RMA</of:DOCTYPE>
-                        <of:DOCUMENTID>${returnId?if_exists}</of:DOCUMENTID>
+                        <of:DOCUMENTID>${returnItem.returnId}</of:DOCUMENTID>
                         <of:LINENUM>${returnItem.returnItemSeqId}</of:LINENUM>
                     </os:DOCUMNTREF>
                     <#list serialNumberList?if_exists as serialNumber>
                     <n:INVDETAIL>
-                        <of:SERIALNUM>${serialNumber}</of:SERIALNUM>
+                        <of:SERIALNUM>${serialNumber?xml}</of:SERIALNUM>
                     </n:INVDETAIL>
                     </#list>
                 </n:RECEIPTITM>