Index: trunk/src/python/unifiedlogger/extend_unifiedlogger.py =================================================================== --- trunk/src/python/unifiedlogger/extend_unifiedlogger.py (revision 544) +++ trunk/src/python/unifiedlogger/extend_unifiedlogger.py (revision 545) @@ -7,5 +7,5 @@ # 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,9 +28,9 @@ # 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,21 +40,21 @@ 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 Index: trunk/src/python/unifiedlogger/wing_project.wpr =================================================================== --- trunk/src/python/unifiedlogger/wing_project.wpr (revision 522) +++ trunk/src/python/unifiedlogger/wing_project.wpr (revision 545) @@ -46,5 +46,9 @@ proj.launch-config = {loc('__main__.py'): ('custom', (u'', + 'launch-Dap54cn2qAN7AXZm')), + loc('extend_unifiedlogger.py'): ('custom', + (u'', 'launch-Dap54cn2qAN7AXZm'))} +proj.main-file = loc('extend_unifiedlogger.py') [user attributes] debug.show-args-dialog = {loc('__main__.py'): False} @@ -61,5 +65,5 @@ 'full-screen': False, 'notebook_display': 'normal', - 'notebook_percent': 0.2564559216384684, + 'notebook_percent': 0.09260908281389135, 'override_title': None, 'pagelist': [('source-assistant', @@ -101,5 +105,5 @@ 1], 'notebook_display': 'normal', - 'notebook_percent': 0.30000000000000004, + 'notebook_percent': 0.16227461858529824, 'override_title': None, 'pagelist': [('batch-search', @@ -198,55 +202,113 @@ 'toolbox-percent': 1.0, 'toolbox-tree-sel': ''})], - 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('../../../../../../../../usr/lib/python2.7/ConfigParser.py'), - {'attrib-starts': [('ConfigParser|0|', - 85), - ('ConfigParser|0|.get|0|', - 589)], - 'code-line': ' raise NoSectionError(section)\n', - 'first-line': 589L, + 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('logging_service.py'), + {'attrib-starts': [('getSimTime|0|', + 13)], + 'code-line': ' print "Proceeding with previous time: ", toHMS'\ + '(seconds)\n', + 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 606L, - 'sel-line-start': 22028L, - 'selection_end': 22028L, - 'selection_start': 22028L, + 'sel-line': 21L, + 'sel-line-start': 649L, + 'selection_end': 649L, + 'selection_start': 649L, 'zoom': 0L}, - 1566600751.835139], - [loc('activitylog_watcher.py'), + 1569957016.54503], + [loc('__main__.py'), + {'attrib-starts': [], + 'code-line': 'import logging_service, os, ConfigParser\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 40L, + 'selection_start': 28L, + 'zoom': 0L}, + 1573490786.397811], + [loc('cad_watcher.py'), + {'attrib-starts': [('getLogEntries|0|', + 24)], + 'code-line': ' fileSize = os.path.getsize(pathToLog)\n', + 'first-line': 18L, + 'folded-linenos': [], + 'sel-line': 46L, + 'sel-line-start': 1365L, + 'selection_end': 1410L, + 'selection_start': 1410L, + 'zoom': 0L}, + 1573492071.42135], + [loc('cms_watcher.py'), {'attrib-starts': [('readFile|0|', - 21)], - 'code-line': " logfilepath = config.get('Paths', 'ActivityLogPa"\ - "th')\n", - 'first-line': 15L, - 'folded-linenos': [], - 'sel-line': 25L, - 'sel-line-start': 767L, - 'selection_end': 767L, - 'selection_start': 767L, - 'zoom': 0L}, - 1566600765.566783], - [loc('../../../config/logging_service.cfg'), + 18)], + 'code-line': ' \n', + 'first-line': 6L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 564L, + 'selection_end': 565L, + 'selection_start': 565L, + 'zoom': 0L}, + 1573492072.884505], + [loc('cad_watcher.py'), + {'attrib-starts': [('getLogEntries|0|', + 18)], + 'code-line': ' return []\n', + 'first-line': 33L, + 'folded-linenos': [], + 'sel-line': 45L, + 'sel-line-start': 1479L, + 'selection_end': 1479L, + 'selection_start': 1479L, + 'zoom': 0L}, + 1575992486.57154], + [loc('logging_service.py'), + {'attrib-starts': [('getSimTime|0|', + 13)], + 'code-line': ' print "Proceeding with previous time: ", toHM'\ + 'S(seconds)\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 649L, + 'selection_end': 649L, + 'selection_start': 649L, + 'zoom': 0L}, + 1575992490.79159], + [loc('cms_watcher.py'), + {'attrib-starts': [('readFile|0|', + 18)], + 'code-line': ' \n', + 'first-line': 6L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 564L, + 'selection_end': 565L, + 'selection_start': 565L, + 'zoom': 0L}, + 1575992492.507506], + [loc('logging_service.py'), + {'attrib-starts': [('getSimTime|0|', + 13)], + 'code-line': ' print "Proceeding with previous time: ", toHM'\ + 'S(seconds)\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 649L, + 'selection_end': 649L, + 'selection_start': 649L, + 'zoom': 0L}, + 1575992506.47608], + [loc('extend_unifiedlogger.py'), {'attrib-starts': [], - 'code-line': 'UnifiedLogPath = webapps/dynamicdata/\n', + 'code-line': 'import xml.etree.ElementTree as ET\n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 1L, - 'sel-line-start': 8L, - 'selection_end': 22L, - 'selection_start': 8L, - 'zoom': 0L}, - 1566600771.661802], - [loc('activitylog_watcher.py'), - {'attrib-starts': [('readFile|0|', - 21)], - 'code-line': " logfilepath = config.get('Paths', 'UnifiedLogPat"\ - "h')\n", - 'first-line': 15L, - 'folded-linenos': [], - 'sel-line': 25L, - 'sel-line-start': 767L, - 'selection_end': 767L, - 'selection_start': 767L, - 'zoom': 0L}, - 1566600786.484821], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}, + 1575992565.713171], [loc('../../../../../../../../usr/lib/python2.7/ConfigParser.py'), {'attrib-starts': [('ConfigParser|0|', @@ -255,5 +317,5 @@ 589)], 'code-line': ' raise NoSectionError(section)\n', - 'first-line': 596L, + 'first-line': 575L, 'folded-linenos': [], 'sel-line': 606L, @@ -262,66 +324,30 @@ 'selection_start': 22028L, 'zoom': 0L}, - 1566600797.469543], - [loc('activitylog_watcher.py'), - {'attrib-starts': [('readFile|0|', - 21)], - 'code-line': " logfilepath = config.get('Paths', 'UnifiedLogPat"\ - "h')\n", - 'first-line': 15L, - 'folded-linenos': [], - 'sel-line': 25L, - 'sel-line-start': 767L, - 'selection_end': 767L, - 'selection_start': 767L, - 'zoom': 0L}, - 1566600824.872938], - [loc('__main__.py'), + 1575992592.926503], + [loc('extend_unifiedlogger.py'), {'attrib-starts': [], - 'code-line': 'import logging_service, os, ConfigParser\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 40L, - 'selection_start': 28L, - 'zoom': 0L}, - 1566600828.88837], - [loc('activitylog_watcher.py'), - {'attrib-starts': [('readFile|0|', - 21)], - 'code-line': " logfilepath = config.get('Paths', 'ActivityLogPa"\ - "th')\n", - 'first-line': 15L, - 'folded-linenos': [], - 'sel-line': 25L, - 'sel-line-start': 767L, - 'selection_end': 814L, - 'selection_start': 814L, - 'zoom': 0L}, - 1566600871.549505], - [loc('__main__.py'), - {'attrib-starts': [], - 'code-line': 'import logging_service, os, ConfigParser\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 40L, - 'selection_start': 28L, - 'zoom': 0L}, - 1566600879.173012], - [loc('activitylog_watcher.py'), - {'attrib-starts': [('readFile|0|', - 21)], - 'code-line': ' logfilename = "data.json" #"IncidentActivity.l'\ - 'og"\n', - 'first-line': 18L, - 'folded-linenos': [], - 'sel-line': 26L, - 'sel-line-start': 824L, - 'selection_end': 857L, - 'selection_start': 857L, - 'zoom': 0L}, - 1566600913.173925], + 'code-line': 'for script_event in root:\n', + 'first-line': 16L, + 'folded-linenos': [], + 'sel-line': 24L, + 'sel-line-start': 759L, + 'selection_end': 759L, + 'selection_start': 759L, + 'zoom': 0L}, + 1575993280.146251], + [loc('../../../../../../../../usr/lib/python2.7/xml/etree/ElementTree.py'), + {'attrib-starts': [('Element|0|', + 170), + ('Element|0|.__getitem__|0|', + 76)], + 'code-line': ' return self._children[index]\n', + 'first-line': 152L, + 'folded-linenos': [], + 'sel-line': 265L, + 'sel-line-start': 8855L, + 'selection_end': 8855L, + 'selection_start': 8855L, + 'zoom': 0L}, + 1575993294.116046], [loc('../../../../../../../../usr/lib/python2.7/ConfigParser.py'), {'attrib-starts': [('ConfigParser|0|', @@ -330,5 +356,5 @@ 589)], 'code-line': ' raise NoSectionError(section)\n', - 'first-line': 596L, + 'first-line': 575L, 'folded-linenos': [], 'sel-line': 606L, @@ -337,118 +363,97 @@ 'selection_start': 22028L, 'zoom': 0L}, - 1566600921.8293], - [loc('activitylog_watcher.py'), - {'attrib-starts': [('readFile|0|', - 21)], - 'code-line': ' logfilename = "data.json" #"IncidentActivity.l'\ - 'og"\n', - 'first-line': 18L, - 'folded-linenos': [], - 'sel-line': 26L, - 'sel-line-start': 824L, - 'selection_end': 857L, - 'selection_start': 857L, - 'zoom': 0L}, - 1566600922.721255], - [loc('__main__.py'), + 1575993296.639257], + [loc('../../../../../../../../usr/lib/python2.7/xml/etree/ElementTree.py'), + {'attrib-starts': [('Element|0|', + 170), + ('Element|0|.__getitem__|0|', + 76)], + 'code-line': ' return self._children[index]\n', + 'first-line': 152L, + 'folded-linenos': [], + 'sel-line': 265L, + 'sel-line-start': 8855L, + 'selection_end': 8855L, + 'selection_start': 8855L, + 'zoom': 0L}, + 1575993297.661174], + [loc('extend_unifiedlogger.py'), {'attrib-starts': [], - 'code-line': 'import logging_service, os, ConfigParser\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 40L, - 'selection_start': 28L, - 'zoom': 0L}, - 1566600934.334362], - [loc('activitylog_watcher.py'), - {'attrib-starts': [('readFile|0|', - 21)], - 'code-line': ' logfilename = "data.json" #"IncidentActivity.l'\ - 'og"\n', - 'first-line': 57L, - 'folded-linenos': [], - 'sel-line': 26L, - 'sel-line-start': 824L, - 'selection_end': 857L, - 'selection_start': 857L, - 'zoom': 0L}, - 1569956230.004631], - [loc('logging_service.py'), - {'attrib-starts': [('getSimTime|0|', - 13)], - 'code-line': ' print "Proceeding with previous time: ", toHM'\ - 'S(seconds)\n', - 'first-line': 27L, - 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 649L, - 'selection_end': 649L, - 'selection_start': 649L, - 'zoom': 0L}, - 1569956272.961653], - [loc('activitylog_watcher.py'), - {'attrib-starts': [('readFile|0|', - 21)], - 'code-line': ' logfilename = "data.json" #"IncidentActivity.l'\ - 'og"\n', - 'first-line': 39L, - 'folded-linenos': [], - 'sel-line': 26L, - 'sel-line-start': 824L, - 'selection_end': 857L, - 'selection_start': 857L, - 'zoom': 0L}, - 1569956463.251688], - [loc('logging_service.py'), - {'attrib-starts': [('getSimTime|0|', - 13)], - 'code-line': ' print "Proceeding with previous time: ", toHM'\ - 'S(seconds)\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 649L, - 'selection_end': 649L, - 'selection_start': 649L, - 'zoom': 0L}, - 1569957016.54503], - [loc('__main__.py'), + 'code-line': ' for info_type in script_event:\n', + 'first-line': 15L, + 'folded-linenos': [], + 'sel-line': 27L, + 'sel-line-start': 879L, + 'selection_end': 879L, + 'selection_start': 879L, + 'zoom': 0L}, + 1575993810.141825], + [loc('../../../../../../../../usr/lib/python2.7/xml/etree/ElementTree.py'), + {'attrib-starts': [('Element|0|', + 170), + ('Element|0|.__getitem__|0|', + 76)], + 'code-line': ' return self._children[index]\n', + 'first-line': 256L, + 'folded-linenos': [], + 'sel-line': 265L, + 'sel-line-start': 8855L, + 'selection_end': 8855L, + 'selection_start': 8855L, + 'zoom': 0L}, + 1575993818.095502], + [loc('extend_unifiedlogger.py'), {'attrib-starts': [], - 'code-line': 'import logging_service, os, ConfigParser\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 40L, - 'selection_start': 28L, - 'zoom': 0L}, - 1573490786.397811], - [loc('cad_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 24)], - 'code-line': ' fileSize = os.path.getsize(pathToLog)\n', - 'first-line': 18L, - 'folded-linenos': [], - 'sel-line': 46L, - 'sel-line-start': 1365L, - 'selection_end': 1410L, - 'selection_start': 1410L, - 'zoom': 0L}, - 1573492071.42135], - [loc('cms_watcher.py'), - {'attrib-starts': [('readFile|0|', - 18)], - 'code-line': ' \n', - 'first-line': 6L, - 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 564L, - 'selection_end': 565L, - 'selection_start': 565L, - 'zoom': 0L}, - 1573492072.884505]], + 'code-line': 'os.system("sort -o " + logfilepath + "caddetails.csv'\ + ' " \\\n', + 'first-line': 49L, + 'folded-linenos': [], + 'sel-line': 64L, + 'sel-line-start': 2490L, + 'selection_end': 2490L, + 'selection_start': 2490L, + 'zoom': 0L}, + 1576038685.82371], + [loc('../../../../../../../../usr/lib/python2.7/xml/etree/ElementTree.py'), + {'attrib-starts': [('Element|0|', + 170), + ('Element|0|.__getitem__|0|', + 76)], + 'code-line': ' return self._children[index]\n', + 'first-line': 256L, + 'folded-linenos': [], + 'sel-line': 265L, + 'sel-line-start': 8855L, + 'selection_end': 8855L, + 'selection_start': 8855L, + 'zoom': 0L}, + 1576038687.450623], + [loc('extend_unifiedlogger.py'), + {'attrib-starts': [], + 'code-line': ' # add it to the entries \n', + 'first-line': 55L, + 'folded-linenos': [], + 'sel-line': 56L, + 'sel-line-start': 2446L, + 'selection_end': 2490L, + 'selection_start': 2490L, + 'zoom': 0L}, + 1576775656.200445], + [loc('../../../../../../../../usr/lib/python2.7/xml/etree/ElementTree.py'), + {'attrib-starts': [('XMLParser|0|', + 1467), + ('XMLParser|0|._raiseerror|0|', + 1518)], + 'code-line': ' raise err\n', + 'first-line': 1449L, + 'folded-linenos': [], + 'sel-line': 1522L, + 'sel-line-start': 51967L, + 'selection_end': 51967L, + 'selection_start': 51967L, + 'zoom': 0L}, + 1576776077.910363]], 20), - 'current-loc': loc('cad_watcher.py'), + 'current-loc': loc('extend_unifiedlogger.py'), 'editor-state-list': [(loc('activitylog_watcher.py'), {'attrib-starts': [('readFile|0|', @@ -463,25 +468,14 @@ 'selection_start': 857L, 'zoom': 0L}), - (loc('cad_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 18)], - 'code-line': ' return []\n', + (loc('extend_unifiedlogger.py'), + {'attrib-starts': [], + 'code-line': " # if t"\ + "here's detail field add it to the entries \n", 'first-line': 33L, 'folded-linenos': [], - 'sel-line': 45L, - 'sel-line-start': 1479L, - 'selection_end': 1479L, - 'selection_start': 1479L, - 'zoom': 0L}), - (loc('cms_watcher.py'), - {'attrib-starts': [('readFile|0|', - 18)], - 'code-line': ' \n', - 'first-line': 6L, - 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 564L, - 'selection_end': 565L, - 'selection_start': 565L, + 'sel-line': 56L, + 'sel-line-start': 2592L, + 'selection_end': 2641L, + 'selection_start': 2641L, 'zoom': 0L}), (loc('../../../config/logging_service.cfg'), @@ -522,15 +516,13 @@ 'locked': False}, [loc('activitylog_watcher.py'), - loc('cad_watcher.py'), - loc('cms_watcher.py'), + loc('extend_unifiedlogger.py'), loc('../../../config/logging_service.cfg'), loc('logging_service.py'), loc('__main__.py')]), 'open_files': [u'../../../config/logging_service.cfg', + u'__main__.py', u'activitylog_watcher.py', u'logging_service.py', - u'__main__.py', - u'cms_watcher.py', - u'cad_watcher.py']}, + u'extend_unifiedlogger.py']}, 'saved_notebook_display': None, 'split_percents': {0: 0.5}, @@ -539,5 +531,5 @@ 'traversal_pos': ((0, 3), - 1566600913.140074), + 1576777529.191873), 'user_data': {}}, 'saved_notebook_display': None, @@ -547,5 +539,5 @@ 'traversal_pos': ((0, 4), - 1566600923.964362), + 1576038340.052804), 'user_data': {}}, 'window-alloc': (29, @@ -553,11 +545,32 @@ 1197, 722)}]} -guimgr.recent-documents = [loc('cad_watcher.py'), - loc('cms_watcher.py'), +guimgr.recent-documents = [loc('extend_unifiedlogger.py'), + loc('logging_service.py'), loc('__main__.py'), - loc('logging_service.py'), loc('activitylog_watcher.py'), loc('../../../config/logging_service.cfg')] -guimgr.visual-state = {loc('get_app_properties.py'): {'attrib-starts': [], +guimgr.visual-state = {loc('cad_watcher.py'): {'attrib-starts': [('getLogEnt'\ + 'ries|0|', + 18)], + 'code-line': ' return []\n', + 'first-line': 33L, + 'folded-linenos': [], + 'sel-line': 45L, + 'sel-line-start': 1479L, + 'selection_end': 1479L, + 'selection_start': 1479L, + 'zoom': 0L}, + loc('cms_watcher.py'): {'attrib-starts': [('readFile|'\ + '0|', + 18)], + 'code-line': ' \n', + 'first-line': 6L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 564L, + 'selection_end': 565L, + 'selection_start': 565L, + 'zoom': 0L}, + loc('get_app_properties.py'): {'attrib-starts': [], 'code-line': '', 'first-line': 0L, @@ -607,5 +620,5 @@ 589)], 'code-line': ' raise NoSectionError(section)\n', - 'first-line': 596L, + 'first-line': 575L, 'folded-linenos': [], 'sel-line': 606L, @@ -637,4 +650,17 @@ 'selection_end': 13534L, 'selection_start': 13534L, + 'zoom': 0L}, + loc('../../../../../../../../usr/lib/python2.7/xml/etree/ElementTree.py'): {'a'\ + 'ttrib-starts': [('XMLParser|0|', + 1467), + ('XMLParser|0|._raiseerror|0|', + 1518)], + 'code-line': ' raise err\n', + 'first-line': 1449L, + 'folded-linenos': [], + 'sel-line': 1522L, + 'sel-line-start': 51967L, + 'selection_end': 51967L, + 'selection_start': 51967L, 'zoom': 0L}} proj.build-cmd = {None: ('default',