Changeset 545 in tmcsimulator for trunk/src/python/unifiedlogger/extend_unifiedlogger.py

Timestamp:

12/19/2019 08:12:21 AM (6 years ago)

Author:

jdalbey

Message:

extend_unifiedlogger.py Fixed defect - wasn't including time and incident fields.

File:

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

trunk/src/python/unifiedlogger/extend_unifiedlogger.py

@@ -7 +7 @@
 
 # read in the incident script in XML format
-tree = ET.parse(logfilepath + 'incident_script_test.xml')
+tree = ET.parse(logfilepath + 'incident_script.xml')
 # root is TMC_SCRIPT tag 
 root = tree.getroot()
@@ -28 +28 @@
             # Add the time index field to entry string
             if info_type.tag == 'TIME_INDEX':
-                entry_str +=  info_type.text + ","
+                entry_time =  info_type.text + ","
             # Get the incident number to entry string 
             if info_type.tag == "INCIDENT":
                 incident_num = info_type.attrib["LogNum"]
-                entry_str += " CAD Log, Incident #" + incident_num
+                entry_incinum = " CAD Log, Incident #" + incident_num
             # Get the cad data info 
             if info_type.tag == 'CAD_DATA':
@@ -40 +40 @@
                     if event.tag == 'CAD_INCIDENT_EVENT':
                         # set flag to check if DETAIL field exist
-                        detail = False
+                        detailFlag = False
+                        detailText = ""
                         for info in event:
                             # Add the incident detail to entry string 
                             if info.tag == "DETAIL":
                                 # replace commas with whitespace
-                                text = info.text.replace(",", " ")
-                                # if it's not the first DETAIL field, 
-                                # append to the end without "Detail" text
-                                if detail:
-                                    entry_str += "; " + text
-                                else:
-                                    entry_str += ", Detail: " + text
-                                detail = True
-                        
-                        # if there's detail field
-                        # add it to the entries 
-                        if detail:
+                                infotext = info.text.replace(",", " ")
+                                # if it's the second DETAIL field, 
+                                # we don't need the "Detail" label
+                                if not detailFlag:
+                                    detailText = ", Detail: "
+                                    detailFlag = True
+                                detailText += infotext                                
+                        # Build the complete line from the header and details
+                        entry_str += entry_time + entry_incinum + detailText                                    
+                        # if there's detail field add it to the entries 
+                        if detailFlag:
                             entries += entry_str + "\n"
 # write all the entries from incident_sript.xml to the output file