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

Timestamp:

2019-03-11T20:08:39+13:00 (5 years ago)

Author:

ak19

Message:

Part 1 of 2 commits to do with getting errorCallBack working on documentEditing for determining when changes have been saved or not to decided whether editableInitStates can finally be overwritten with current (saved) values.

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

@@ -401 +401 @@
         String statusString = GSXML.getNodeText(statusElem);
         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;
+        } 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;
+                // 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()));
+            }           
+        }       
+        // can finally set statusString
         GSXML.setNodeText(statusElem, statusString);