Changeset 32892 for main

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.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• build/GS2PerlConstructor.java (modified) (2 diffs)
• core/OAIReceptionist.java (modified) (1 diff)
• service/GS2Construct.java (modified) (1 diff)
• util/GSStatus.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -406 +406 @@
 
     // If you want to run a Perl command without doing GS2PerlConstructor's custom logging in the build log
-    // The use the runSimplePerlCommand() versions, which use the default behaviour of running a SafeProcess
+    // Then use the runSimplePerlCommand() versions, which use the default behaviour of running a SafeProcess
     protected boolean runSimplePerlCommand(String[] command) {  
     return runSimplePerlCommand(command, null, null);
@@ -532 +532 @@
         
         if (perlProcess.getExitValue() == 0) { //status = OK;
-        
+        //logger.info("@@@@@@@@ runPerlCommand success - exitvalue = " + perlProcess.getExitValue());
         sendProcessStatus(new ConstructionEvent(this, GSStatus.CONTINUING, "Success"));
         success = true;
 
         } else { //status = ERROR;
+        logger.debug("@@@@@@@@ runPerlCommand failed, exitvalue = " + perlProcess.getExitValue());
         sendProcessStatus(new ConstructionEvent(this, GSStatus.ERROR, "Failure"));
         success = false;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java

@@ -81 +81 @@
   protected boolean noRecordsMatch = false;
       
-  /** A set of all known 'sets' TODO: set_oaiset as name */
+  /** A set of all known 'sets'. */
   protected HashSet<String> set_oaiset = null;
 

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);
         

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSStatus.java

@@ -24 +24 @@
     public static final int SUCCESS = 1; // request succeeded
     public static final int ACCEPTED = 2; // request accepted but not completed
-    public static final int ERROR = 3; // error and process stopped
+    public static final int ERROR = 3; // error and process stopped. BEWARE: If you change the value of ERROR, concurrently update the value checked for in documentedit_scripts_util.js::hadErrorResponseOnSave()
 
     // responses for status requests