Author: sichen
Date: Fri Aug 3 09:37:59 2007 New Revision: 562517 URL: http://svn.apache.org/viewvc?view=rev&rev=562517 Log: Cleaning up redundant error messages in uspsAddressValidation and uspsCityStateLookup services; Adding the returnText output attribute to uspsAddressValidation; and having uspsCityStateLookup return failure instead of error. Modified: ofbiz/trunk/applications/product/servicedef/services_shipment_usps.xml ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java Modified: ofbiz/trunk/applications/product/servicedef/services_shipment_usps.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_shipment_usps.xml?view=diff&rev=562517&r1=562516&r2=562517 ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_shipment_usps.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_shipment_usps.xml Fri Aug 3 09:37:59 2007 @@ -45,6 +45,7 @@ <attribute name="state" type="String" mode="INOUT" optional="true"/> <attribute name="zip5" type="String" mode="INOUT" optional="true"/> <attribute name="zip4" type="String" mode="INOUT" optional="true"/> + <attribute name="returnText" type="String" mode="OUT" optional="true"/> </service> <service name="uspsCityStateLookup" engine="java" location="org.ofbiz.shipment.thirdparty.usps.UspsServices" invoke="uspsCityStateLookup"> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?view=diff&rev=562517&r1=562516&r2=562517 ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java Fri Aug 3 09:37:59 2007 @@ -488,6 +488,11 @@ result.put("state", UtilXml.childElementValue(respAddressElement, "State")); result.put("zip5", UtilXml.childElementValue(respAddressElement, "Zip5")); result.put("zip4", UtilXml.childElementValue(respAddressElement, "Zip4")); + Element returnTextElement = UtilXml.firstChildElement(respAddressElement, "ReturnText"); + if (returnTextElement != null) { + result.put("returnText", UtilXml.elementValue(returnTextElement)); + } + return result; } @@ -531,31 +536,30 @@ responseDocument = sendUspsRequest("CityStateLookup", requestDocument); } catch (UspsRequestException e) { Debug.log(e, module); - return ServiceUtil.returnError("Error sending request for USPS City/State Lookup service: " + e.getMessage()); + return ServiceUtil.returnFailure("Error sending request for USPS City/State Lookup service: " + e.getMessage()); } Element respAddressElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "ZipCode"); if (respAddressElement == null) { - return ServiceUtil.returnError("Incomplete response from USPS City/State Lookup service: no ZipCode element found"); + return ServiceUtil.returnFailure("Incomplete response from USPS City/State Lookup service: no ZipCode element found"); } Element respErrorElement = UtilXml.firstChildElement(respAddressElement, "Error"); if (respErrorElement != null) { - return ServiceUtil.returnError("The following error was returned by the USPS City/State Lookup service: " + - UtilXml.childElementValue(respErrorElement, "Description")); + return ServiceUtil.returnFailure(UtilXml.childElementValue(respErrorElement, "Description")); } Map result = ServiceUtil.returnSuccess(); String city = UtilXml.childElementValue(respAddressElement, "City"); if (UtilValidate.isEmpty(city)) { - return ServiceUtil.returnError("Incomplete response from USPS City/State Lookup service: no City element found"); + return ServiceUtil.returnFailure("Incomplete response from USPS City/State Lookup service: no City element found"); } result.put("city", city); String state = UtilXml.childElementValue(respAddressElement, "State"); if (UtilValidate.isEmpty(state)) { - return ServiceUtil.returnError("Incomplete response from USPS City/State Lookup service: no State element found"); + return ServiceUtil.returnFailure("Incomplete response from USPS City/State Lookup service: no State element found"); } result.put("state", state); |
Free forum by Nabble | Edit this page |