update python workflow script for hourly updates

Author: guenter hipler

shellscripts/workflow/processSRWMessages.py

@@ -114,7 +114,7 @@ def isOptionsValid(self, givenOpts):
 
     def shutdownMessageCatcher(self):
         #startResult = os.popen('/opt/swissbib/tools/java.tools/tomcat7-axis2/bin/shutdown.sh -force').read()
-        startResult = os.popen( self.CATCHER_WEBAPP_PATH + os.sep + 'shutdown.sh -force').read()
+        startResult = os.popen( 'docker container stop messagecatcher').read()
         #environment variables in shell
         #http://stackoverflow.com/questions/8365394/set-environment-variable-in-python-script
         #do something with result
@@ -125,7 +125,7 @@ def shutdownMessageCatcher(self):
 
     def startMessageCatcher(self):
         #shutDownResult = os.popen('/opt/swissbib/tools/java.tools/tomcat7-axis2/bin/startup.sh').read()
-        shutDownResult = os.popen(self.CATCHER_WEBAPP_PATH + os.sep + 'startup.sh').read()
+        shutDownResult = os.popen('docker run --name messagecatcher -p 9000:9000  -d --rm  -v /swissbib_index/solrDocumentProcessing/FrequentInitialPreProcessing/data/update/updateDir:/updateDir -v /swissbib_index/solrDocumentProcessing/FrequentInitialPreProcessing/data/update/deleteDir:/deleteDir  -v /swissbib_index/solrDocumentProcessing/FrequentInitialPreProcessing/catcher:/base  messagecatcher').read()
         #do something with result
 
 
@@ -156,7 +156,7 @@ def processDeleteMessages(self):
         #</delete>
 
 
-        numberOfFiles = len(glob.glob(self.DELETEDIRLOAD + os.sep + "*REQ_*.xml"))
+        numberOfFiles = len(glob.glob(self.DELETEDIRLOAD + os.sep + ".*?REQ_.*?_delete\.xml"))
         if numberOfFiles > 0:
 
             self.writeLogMessage("{0} messages to delete search docs".format(numberOfFiles))
@@ -171,7 +171,7 @@ def processDeleteMessages(self):
             hDelete_File.write("<delete>" + os.linesep)
 
 
-            pPattern = re.compile(".*?REQ_(.*?)\.xml")
+            pPattern = re.compile(".*?REQ_(.*?)_delete\.xml")
             #Pattern of File REQ_123456.xml
             self.writeLogMessage("files with delete messages:")
 
@@ -212,7 +212,7 @@ def processUpdateMessages(self):
 
         os.system("cd " + self.UPDATEDIRLOAD)
 
-        numberOfFiles = len(glob.glob(self.UPDATEDIRLOAD + os.sep + "*REQ_*.xml"))
+        numberOfFiles = len(glob.glob(self.UPDATEDIRLOAD + os.sep + "*REQ_.*?.xml"))
         self.writeLogMessage("{0} messages to update search docs".format(numberOfFiles))
 
         self.writeLogMessage("files with update messages:")