Changeset 513 in tmcsimulator for trunk/src/python/unifiedlogger

Timestamp:

11/07/2019 07:22:39 PM (6 years ago)

Author:

jdalbey

Message:

activitylog_watcher.py Implement tickets #188, #192

File:

• trunk/src/python/unifiedlogger/activitylog_watcher.py (modified) (3 diffs)

trunk/src/python/unifiedlogger/activitylog_watcher.py

@@ -26 +26 @@
     logfilepath = config.get('Paths', 'ActivityLogPath')
     logfilename = "data.json"   #"IncidentActivity.log"
+    data_summary = "data_summary.json"
     lines = []
-    
+    output = []
     try:
         json_file = open (logfilepath + logfilename,'r')
@@ -34 +35 @@
     else:
         jsonData=json_file.read()
+        # implement ticket #192
+        output = json.loads(jsonData)['data'] 
+        # read in data_summary_json file
+        # assuming the data_summary.json is in the trunk foldera
+        data_summary = open(logfilepath + data_summary, 'r')
+        summary_json = data_summary.read()
+        data_lst = json.loads(summary_json)['data']
+        for entry in data_lst:
+            # put the first 3 entries as place holder to be consistent with other type of logging
+            output.append([entry[0], entry[1] , entry[2], entry[3] , ", Incident Created, ", ""]) 
         json_file.close()
-    return json.loads(jsonData)['data']    
+    return output
     
 def setup():
@@ -51 +62 @@
     # Format messages into desired result format
     for item in currList:
+        # implement ticket #188
         # extract desired fields
+        incident_num = item[0].split("-")[1] 
+        # extract the incident number from the date time field
         name = item[3].replace(',','')
         code = item[4].replace(',','')
         msg = item[5].replace(',','')
-        desiredFields = "Activity Log.,"+name+","+code+" "+msg
+        desiredFields = "Activity Log.,"+name+"," + incident_num + " " + code+" "+msg
         # Append to results list
         resultList.append(desiredFields)