Changeset 37585 for main

Timestamp:

2023-03-28T16:09:16+13:00 (13 months ago)

Author:

davidb

Message:

moved setting the status error code to be earlier so it is guaranteed to be set where as before it was only set if there was an error; refactored some variable names

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -412 +412 @@
         statusString += " and monitored until done."; 
         // check for errors
-        int status_code = Integer.parseInt(statusElem.getAttribute(GSXML.STATUS_ERROR_CODE_ATT));
-        if (GSStatus.isError(status_code)) {
-            logger.info("Got error status code: " + status_code);
-            statusString += "But got error status code: " + status_code;
+        int initial_response_status_code = Integer.parseInt(statusElem.getAttribute(GSXML.STATUS_ERROR_CODE_ATT));
+        if (GSStatus.isError(initial_response_status_code)) {
+            logger.info("Got error status code: " + initial_response_status_code);
+            statusString += "But got error status code: " + initial_response_status_code;
         } else { // check for Construction event errors
             String id = statusElem.getAttribute("pid");
             GS2PerlListener currentListener = this.listeners.get(id);
-            status_code = currentListener.getStatus();
-            if (GSStatus.isError(status_code))
-            {
-                logger.info("xxxx Got construction event error. Error status code: " + status_code);
-                statusString += "But got construction event error, status code: " + status_code;
+            int completed_status_code = currentListener.getStatus();
+            // update statusElem so we return the status code on completion
+            statusElem.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(completed_status_code));
+            if (GSStatus.isError(completed_status_code))
+            {
+                logger.info("Got construction event error. Error status code: " + completed_status_code);
+                statusString += "But got construction event error, status code: " + completed_status_code;
                 // add the rest of the messages to the statusElem node
                 statusString += "\n" + currentListener.getUpdate(); 
-                statusElem.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(currentListener.getStatus()));
             }           
         }