svn commit: r562461 - in /ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis: OagisServices.java OagisShipmentServices.java

[jonesde]

Author: jonesde
Date: Fri Aug  3 06:29:40 2007
New Revision: 562461

URL: http://svn.apache.org/viewvc?view=rev&rev=562461
Log:
A few more error handling and development mode things

Modified:
    ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
    ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java

Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java?view=diff&rev=562461&r1=562460&r2=562461
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java Fri Aug  3 06:29:40 2007
@@ -87,6 +87,8 @@
         
         GenericDelegator delegator = ctx.getDelegator();
         LocalDispatcher dispatcher = ctx.getDispatcher();
+        
+        String errorReferenceId = (String) context.get("referenceId");
 
         String sendToUrl = (String) context.get("sendToUrl");
         if (UtilValidate.isEmpty(sendToUrl)) {
@@ -94,7 +96,17 @@
         }
 
         String saveToFilename = (String) context.get("saveToFilename");
+        if (UtilValidate.isEmpty(saveToFilename)) {
+            String saveToFilenameBase = UtilProperties.getPropertyValue("oagis.properties", "test.save.outgoing.filename.base", "");
+            if (UtilValidate.isNotEmpty(saveToFilenameBase)) {
+                saveToFilename = saveToFilenameBase + "ConfirmBod" + errorReferenceId + ".xml";
+            }
+        }
         String saveToDirectory = (String) context.get("saveToDirectory");
+        if (UtilValidate.isEmpty(saveToDirectory)) {
+            saveToDirectory = UtilProperties.getPropertyValue("oagis.properties", "test.save.outgoing.directory");
+        }
+
         OutputStream out = (OutputStream) context.get("outputStream");
         
         GenericValue userLogin = null;
@@ -122,7 +134,7 @@
         bodyParameters.put("errorLogicalId", context.get("logicalId"));
         bodyParameters.put("errorComponent", context.get("component"));
         bodyParameters.put("errorTask", context.get("task"));
-        bodyParameters.put("errorReferenceId", context.get("referenceId"));
+        bodyParameters.put("errorReferenceId", errorReferenceId);
         bodyParameters.put("errorMapList",(List) context.get("errorMapList"));
         bodyParameters.put("origRef", context.get("origRefId"));
         String bodyScreenUri = UtilProperties.getPropertyValue("oagis.properties", "Oagis.Template.ConfirmBod");
@@ -444,7 +456,7 @@
                 Debug.logError(e, errMsg, module);
                 return ServiceUtil.returnError(errMsg);
             }
-        } else if (UtilValidate.isNotEmpty(saveToFilename)) {
+        } else if (UtilValidate.isNotEmpty(saveToFilename) && UtilValidate.isNotEmpty(saveToDirectory)) {
             try {
                 File outdir = new File(saveToDirectory);
                 if (!outdir.exists()) {

Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?view=diff&rev=562461&r1=562460&r2=562461
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Fri Aug  3 06:29:40 2007
@@ -293,7 +293,9 @@
         String saveToFilename = (String) context.get("saveToFilename");
         if (UtilValidate.isEmpty(saveToFilename)) {
             String saveToFilenameBase = UtilProperties.getPropertyValue("oagis.properties", "test.save.outgoing.filename.base", "");
-            saveToFilename = saveToFilenameBase + "ProcessShipment" + orderId + ".xml";
+            if (UtilValidate.isNotEmpty(saveToFilenameBase)) {
+                saveToFilename = saveToFilenameBase + "ProcessShipment" + orderId + ".xml";
+            }
         }
         String saveToDirectory = (String) context.get("saveToDirectory");
         if (UtilValidate.isEmpty(saveToDirectory)) {
@@ -534,12 +536,15 @@
         String saveToFilename = (String) context.get("saveToFilename");
         if (UtilValidate.isEmpty(saveToFilename)) {
             String saveToFilenameBase = UtilProperties.getPropertyValue("oagis.properties", "test.save.outgoing.filename.base", "");
-            saveToFilename = saveToFilenameBase + "ProcessShipment" + returnId + ".xml";
+            if (UtilValidate.isNotEmpty(saveToFilenameBase)) {
+                saveToFilename = saveToFilenameBase + "ReceiveDelivery" + returnId + ".xml";
+            }
         }
         String saveToDirectory = (String) context.get("saveToDirectory");
         if (UtilValidate.isEmpty(saveToDirectory)) {
             saveToDirectory = UtilProperties.getPropertyValue("oagis.properties", "test.save.outgoing.directory");
         }
+
         OutputStream out = (OutputStream) context.get("outputStream");
         
         Map result = ServiceUtil.returnSuccess();