Changeset 31127 for main

Timestamp:

2016-11-18T14:53:41+13:00 (7 years ago)

Author:

ak19

Message:

Related to previous revision (31125). Fix to concurrency problem when setting multiple metadata using doc editor 1. Better reporting in the status element of the response returned after setting metadata, now it indicates that it has finished setting meta on success. 2. Removed debug statements from experimental fix. 3. Not using logger error for info message in MessageRouter.

Location:

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

Files:

• core/MessageRouter.java (modified) (2 diffs)
• service/GS2Construct.java (modified) (4 diffs)

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

@@ -262 +262 @@
         // gets removed from where it was. This changes the node list - you cant iterate over the node list in a normal manner if you are moving elements out of it
         int num_requests = requests.getLength();
-        logger.error("**** num requests = "+num_requests);
+        logger.info("**** num requests = "+num_requests);
         for (int i = 0; i < num_requests; i++)
         {
@@ -269 +269 @@
             if (req == null)
             {
-                logger.error("request " + i + " is null");
+                logger.warn("request " + i + " is null");
                 continue;
             }

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

@@ -317 +317 @@
         return result;
         }
-
         
         // wait until we can reserve the collection for processing
-        waitUntilReady(request);    
-        
-        logger.error("@@@ RESERVED");
+        waitUntilReady(request);
+    
         
         // process
@@ -329 +327 @@
         if (response.getElementsByTagName(GSXML.ERROR_ELEM).getLength() <= 0) // if no errors, wait for process to finish
         {
-            logger.error("@@@ NO ERRORS");
-            
             Element statusElem = (Element) response.getElementsByTagName(GSXML.STATUS_ELEM).item(0);
             String id = statusElem.getAttribute("pid");
-            logger.error("@@@ GOT PID: " + id);
             
             GS2PerlListener currentListener = this.listeners.get(id);
@@ -342 +337 @@
                 // there is probably a better way to do this.
                 try
-                {
-                    logger.error("@@@ WAITING");
+                {       
                     Thread.currentThread().sleep(100);
                 }
@@ -351 +345 @@
                 statusCode = currentListener.getStatus();
             }       
-        }
+        }       
         
-        else {
-            logger.error("@@@ GOT ERROR");          
-        }
-        
-        logger.error("@@@ RELEASING HOLD");
+        Element statusElem = (Element) response.getElementsByTagName(GSXML.STATUS_ELEM).item(0);
+        String statusString = GSXML.getNodeText(statusElem);
+        statusString += " and monitored until done."; 
+        GSXML.setNodeText(statusElem, statusString);
         
         // release hold on collection