Index: trunk/src/python/unifiedlogger/wing_project.wpr =================================================================== --- trunk/src/python/unifiedlogger/wing_project.wpr (revision 561) +++ trunk/src/python/unifiedlogger/wing_project.wpr (revision 645) @@ -55,5 +55,20 @@ 'runargs': u'', 'rundir': ('custom', - u'/home/jdalbey/Dropbox/TMCrepo/trunk')})}) + u'/home/jdalbey/Dropbox/TMCrepo/trunk')}), + 'launch-a0u7qlM0pw1rlvbT': ({}, + {'buildcmd': ('project', + None), + 'env': ('project', + [u'']), + 'name': 'default', + 'pyexec': ('project', + u''), + 'pypath': ('project', + []), + 'pyrunargs': ('project', + '-u'), + 'runargs': u'', + 'rundir': ('project', + u'')})}) proj.directory-list = [{'dirloc': loc('.'), 'excludes': (), @@ -72,14 +87,15 @@ loc('extract_caddetails.py'): ('custom', (u'', - 'launch-Dap54cn2qAN7AXZm'))} + 'launch-a0u7qlM0pw1rlvbT'))} proj.main-file = loc('extract_caddetails.py') [user attributes] debug.show-args-dialog = {loc('__main__.py'): False} -edit.file-encoding = {loc('get_revision'): 'UTF-8', +edit.file-encoding = {loc('../../../../../../Audio/mkLabelTrack.py'): 'UTF-8', + loc('get_revision'): 'UTF-8', loc('test_logging_service.py'): 'UTF-8'} guimgr.overall-gui-state = {'windowing-policy': 'combined-window', 'windows': [{'name': '0BtsNVOAornvyNAPNOxHAmuDFR'\ 'v7Dw8l', - 'size-state': '', + 'size-state': 'maximized', 'type': 'dock', 'view': {'area': 'tall', @@ -88,5 +104,5 @@ 'full-screen': False, 'notebook_display': 'normal', - 'notebook_percent': 0.09260908281389135, + 'notebook_percent': 0.189071986123157, 'override_title': None, 'pagelist': [('source-assistant', @@ -127,38 +143,15 @@ 'current_pages': [1, 2], - 'notebook_display': 'normal', - 'notebook_percent': 0.4230235783633842, + 'notebook_display': 'tabs only', + 'notebook_percent': 0.5, 'override_title': None, - 'pagelist': [('batch-search', + 'pagelist': [('debug-data', 'wide', 0, - {'fScope': {'fFileSetName': 'All Source Files', - 'fLocation': None, - 'fRecursive': True, - 'fType': 'documentation'}, - 'fSearchSpec': {'fEndPos': None, - 'fIncludeLinenos': True, - 'fInterpretBackslashes': False, - 'fMatchCase': False, - 'fOmitBinary': True, - 'fRegexFlags': 42, - 'fReplaceText': '', - 'fReverse': False, - 'fSearchText': u'default directory policy', - 'fStartPos': 0, - 'fStyle': 'text', - 'fWholeWords': False, - 'fWrap': True}, - 'fUIOptions': {'fAutoBackground': True, - 'fFilePrefix': 'short-file', - 'fFindAfterReplace': True, - 'fInSelection': False, - 'fIncremental': True, - 'fReplaceOnDisk': False, - 'fShowFirstMatch': False, - 'fShowLineno': True, - 'fShowReplaceWidgets': False}, - 'replace-entry-expanded': False, - 'search-entry-expanded': False}), + {}), + ('debug-exceptions', + 'wide', + 0, + {}), ('interactive-search', 'wide', @@ -174,7 +167,7 @@ 'fOmitBinary': True, 'fRegexFlags': 42, - 'fReplaceText': u'details_file', + 'fReplaceText': u'grid', 'fReverse': False, - 'fSearchText': u'out_file', + 'fSearchText': u'marks', 'fStartPos': 0, 'fStyle': 'text', @@ -190,12 +183,4 @@ 'fShowLineno': True, 'fShowReplaceWidgets': True}}), - ('debug-data', - 'wide', - 0, - {}), - ('debug-exceptions', - 'wide', - 0, - {}), ('python-shell', 'wide', @@ -225,116 +210,189 @@ 'toolbox-percent': 1.0, 'toolbox-tree-sel': 'cmd-zde72uIOzRuMXDlM'})], - 'primary_view_state': {'editor_states': ({'bookmarks': ([[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, + 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('../../../../../../Docs/Academics/Courses_SWE/305/Projects/Roundup_Gsolver/replaySolution.py'), + {'attrib-starts': [('dump|0|', + -1)], + 'code-line': ' print line.strip()\n', + 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 265L, - 'sel-line-start': 8855L, - 'selection_end': 8855L, - 'selection_start': 8855L, + 'sel-line': 2L, + 'sel-line-start': 29L, + 'selection_end': 51L, + 'selection_start': 51L, 'zoom': 0L}, - 1575993818.095502], - [loc('extend_unifiedlogger.py'), - {'attrib-starts': [], - 'code-line': 'os.system("sort -o " + logfilepath + "caddetails.csv'\ - ' " \\\n', - 'first-line': 49L, + 1588365792.660595], + [loc('../../../../../../Docs/Academics/Courses_SWE/305/Projects/Roundup_Gsolver/replaySolution.py'), + {'attrib-starts': [('dump|0|', + 2)], + 'code-line': ' print marks[i][j],\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 6L, + 'sel-line-start': 136L, + 'selection_end': 159L, + 'selection_start': 154L, + 'zoom': 0L}, + 1588365832.206544], + [loc('../../../../../../Docs/Academics/Courses_SWE/305/Projects/Roundup_Gsolver/replaySolution.py'), + {'attrib-starts': [('makeMove|0|', + 56)], + 'code-line': ' x = True\n', + 'first-line': 62L, '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], - [loc('extend_unifiedlogger.py'), - {'attrib-starts': [], - 'code-line': ' entry_incinum = " CAD Log, Incident '\ - '#" + incident_num\n', - 'first-line': 30L, - 'folded-linenos': [], - 'sel-line': 33L, - 'sel-line-start': 1205L, - 'selection_end': 1246L, - 'selection_start': 1246L, - 'zoom': 0L}, - 1577393253.005358], - [loc('logging_service.py'), - {'attrib-starts': [('toHMS|0|', - 7)], - 'code-line': ' return "%02d:%02d:%02d" % (h, m, s) \n', - 'first-line': 42L, - 'folded-linenos': [], - 'sel-line': 10L, - 'sel-line-start': 281L, - 'selection_end': 297L, - 'selection_start': 297L, - 'zoom': 0L}, - 1577393417.740925], - [loc('extend_unifiedlogger.py'), - {'attrib-starts': [], - 'code-line': 'out_file = open(logfilepath + "caddetails.csv", "w")'\ - '\n', - 'first-line': 51L, - 'folded-linenos': [], - 'sel-line': 57L, - 'sel-line-start': 2692L, - 'selection_end': 2700L, - 'selection_start': 2692L, - 'zoom': 0L}, - 1577394088.002284], - [loc('extend_unifiedlogger.py'), - {'attrib-starts': [], - 'code-line': '\n', - 'first-line': 42L, - 'folded-linenos': [], - 'sel-line': 62L, - 'sel-line-start': 2871L, - 'selection_end': 2871L, - 'selection_start': 2871L, - 'zoom': 0L}, - 1577399854.843249], + 'sel-line-start': 1691L, + 'selection_end': 1707L, + 'selection_start': 1707L, + 'zoom': 0L}, + 1590714439.844191], + [loc('../../../../../../Audio/mkLabelTrack.py'), + {'attrib-starts': [], + 'code-line': 'print fields\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 4L, + 'sel-line-start': 121L, + 'selection_end': 133L, + 'selection_start': 133L, + 'zoom': 0L}, + 1590714669.227609], + [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': 543L, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, + 'zoom': 0L}, + 1590714724.736702], + [loc('../../../../../../Audio/mkLabelTrack.py'), + {'attrib-starts': [], + 'code-line': ' print duration\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 7L, + 'sel-line-start': 178L, + 'selection_end': 182L, + 'selection_start': 182L, + 'zoom': 0L}, + 1590714792.934401], + [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, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, + 'zoom': 0L}, + 1590714796.772516], + [loc('../../../../../../Audio/mkLabelTrack.py'), + {'attrib-starts': [], + 'code-line': ' print line\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 4L, + 'sel-line-start': 95L, + 'selection_end': 109L, + 'selection_start': 109L, + 'zoom': 0L}, + 1590714824.10036], + [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, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, + 'zoom': 0L}, + 1590714827.713916], + [loc('../../../../../../Audio/mkLabelTrack.py'), + {'attrib-starts': [], + 'code-line': 'import fileinput\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 1L, + 'sel-line-start': 31L, + 'selection_end': 47L, + 'selection_start': 47L, + 'zoom': 0L}, + 1590714863.217831], + [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, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, + 'zoom': 0L}, + 1590714865.527688], + [loc('../../../../../../Audio/mkLabelTrack.py'), + {'attrib-starts': [], + 'code-line': 'for line in f.readlines():\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 4L, + 'sel-line-start': 85L, + 'selection_end': 85L, + 'selection_start': 85L, + 'zoom': 0L}, + 1590714951.077492], + [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, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, + 'zoom': 0L}, + 1590714954.842588], + [loc('../../../../../../Audio/mkLabelTrack.py'), + {'attrib-starts': [], + 'code-line': '', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}, + 1615741919.892709], + [loc('activitylog_watcher.py'), + {'attrib-starts': [('readFile|0|', + 21)], + 'code-line': ' logfilename = "data.json" #"IncidentActivity.l'\ + 'og"\n', + 'first-line': 27L, + 'folded-linenos': [], + 'sel-line': 26L, + 'sel-line-start': 824L, + 'selection_end': 857L, + 'selection_start': 857L, + 'zoom': 0L}, + 1615742151.801719], [loc('logging_service.py'), {'attrib-starts': [], @@ -347,130 +405,80 @@ 'selection_start': 2695L, 'zoom': 0L}, - 1577400145.321379], + 1615742204.411151], + [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': 582L, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, + 'zoom': 0L}, + 1615742214.410826], + [loc('logging_service.py'), + {'attrib-starts': [], + 'code-line': "if __name__ == '__main__':\n", + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 80L, + 'sel-line-start': 2695L, + 'selection_end': 2735L, + 'selection_start': 2695L, + 'zoom': 0L}, + 1615742245.432202], [loc('extract_caddetails.py'), {'attrib-starts': [], - 'code-line': ' startup()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 62L, - 'sel-line-start': 2826L, - 'selection_end': 2839L, - 'selection_start': 2839L, - 'zoom': 0L}, - 1577400164.213804], - [loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': 'def main():\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 2L, - 'sel-line-start': 134L, - 'selection_end': 145L, - 'selection_start': 134L, - 'zoom': 0L}, - 1577400181.955552], - [loc('extract_caddetails.py'), - {'attrib-starts': [], - 'code-line': ' extract()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 62L, - 'sel-line-start': 3068L, - 'selection_end': 3079L, - 'selection_start': 3079L, - 'zoom': 0L}, - 1577400309.516676], - [loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': 'def main():\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 2L, - 'sel-line-start': 134L, - 'selection_end': 145L, - 'selection_start': 134L, - 'zoom': 0L}, - 1577400449.642736], - [loc('extract_caddetails.py'), - {'attrib-starts': [], - 'code-line': ' extract()\n', - 'first-line': 54L, - 'folded-linenos': [], - 'sel-line': 62L, - 'sel-line-start': 3068L, - 'selection_end': 3079L, - 'selection_start': 3079L, - 'zoom': 0L}, - 1577400694.441992], - [loc('__main__.py'), + 'code-line': '# Move unifiedlogger.zip from deploy folder'\ + ' to webapps folder.\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 6L, + 'sel-line-start': 246L, + 'selection_end': 317L, + 'selection_start': 317L, + 'zoom': 0L}, + 1615742287.829168], + [loc('logging_service.py'), {'attrib-starts': [], 'code-line': "if __name__ == '__main__':\n", 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 13L, - 'sel-line-start': 556L, - 'selection_end': 593L, - 'selection_start': 556L, - 'zoom': 0L}, - 1577400713.516774], - [loc('extract_caddetails.py'), - {'attrib-starts': [], - 'code-line': ' main()\n', - 'first-line': 48L, - 'folded-linenos': [], - 'sel-line': 62L, - 'sel-line-start': 3065L, - 'selection_end': 3073L, - 'selection_start': 3073L, - 'zoom': 0L}, - 1577401207.628608], - [loc('__main__.py'), - {'attrib-starts': [], - 'code-line': "if __name__ == '__main__':\n", - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 13L, - 'sel-line-start': 556L, - 'selection_end': 593L, - 'selection_start': 556L, - 'zoom': 0L}, - 1577401209.827539], - [loc('extract_caddetails.py'), - {'attrib-starts': [], - 'code-line': ' main()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 62L, - 'sel-line-start': 3065L, - 'selection_end': 3073L, - 'selection_start': 3073L, - 'zoom': 0L}, - 1577401579.928], - [loc('__main__.py'), - {'attrib-starts': [], - 'code-line': "if __name__ == '__main__':\n", - 'first-line': 14L, - 'folded-linenos': [], - 'sel-line': 13L, - 'sel-line-start': 556L, - 'selection_end': 593L, - 'selection_start': 556L, - 'zoom': 0L}, - 1577405755.47867]], + 'sel-line': 80L, + 'sel-line-start': 2695L, + 'selection_end': 2735L, + 'selection_start': 2695L, + 'zoom': 0L}, + 1615742466.692804]], 20), - 'current-loc': loc('extract_caddetails.py'), + 'current-loc': loc('activitylog_watcher.py'), 'editor-state-list': [(loc('activitylog_watcher.py'), {'attrib-starts': [('readFile|0|', 21)], - 'code-line': ' logfilename = "data.json" '\ - ' #"IncidentActivity.log"\n', - 'first-line': 39L, + 'code-line': ' # read in data_summary'\ + '_json file that contains Incident summary data\n', + 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 26L, - 'sel-line-start': 824L, - 'selection_end': 857L, - 'selection_start': 857L, + 'sel-line': 38L, + 'sel-line-start': 1253L, + 'selection_end': 1329L, + 'selection_start': 1329L, + 'zoom': 0L}), + (loc('../../../../../../../../usr/lib/python2.7/ConfigParser.py'), + {'attrib-starts': [('ConfigParser|0|', + 85), + ('ConfigParser|0|.get|0|', + 589)], + 'code-line': ' raise NoSectio'\ + 'nError(section)\n', + 'first-line': 582L, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, 'zoom': 0L}), (loc('extract_caddetails.py'), @@ -485,15 +493,4 @@ 'selection_start': 317L, 'zoom': 0L}), - (loc('../../../config/logging_service.cfg'), - {'attrib-starts': [], - 'code-line': 'UnifiedLogPath = webapps/dynam'\ - 'icdata/\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 1L, - 'sel-line-start': 8L, - 'selection_end': 22L, - 'selection_start': 8L, - 'zoom': 0L}), (loc('logging_service.py'), {'attrib-starts': [], @@ -505,34 +502,22 @@ 'selection_end': 2735L, 'selection_start': 2695L, - 'zoom': 0L}), - (loc('__main__.py'), - {'attrib-starts': [], - 'code-line': "if __name__ == '__main__':\n", - 'first-line': 14L, - 'folded-linenos': [], - 'sel-line': 13L, - 'sel-line-start': 556L, - 'selection_end': 593L, - 'selection_start': 556L, 'zoom': 0L})], 'has-focus': True, 'locked': False}, [loc('activitylog_watcher.py'), + loc('../../../../../../../../usr/lib/python2.7/ConfigParser.py'), loc('extract_caddetails.py'), - loc('../../../config/logging_service.cfg'), - loc('logging_service.py'), - loc('__main__.py')]), - 'open_files': [u'../../../config/logging_service.cfg', - u'activitylog_watcher.py', + loc('logging_service.py')]), + 'open_files': [u'extract_caddetails.py', + u'../../../../../../../../usr/lib/python2.7/ConfigParser.py', u'logging_service.py', - u'__main__.py', - u'extract_caddetails.py']}, + u'activitylog_watcher.py']}, 'saved_notebook_display': None, 'split_percents': {0: 0.5}, 'splits': 2, 'tab_location': 'top', - 'traversal_pos': ((1, - 2), - 1577400521.436669), + 'traversal_pos': ((0, + 1), + 1615742204.343147), 'user_data': {}}, 'saved_notebook_display': None, @@ -544,14 +529,105 @@ 1576038340.052804), 'user_data': {}}, - 'window-alloc': (1152, - 30, - 1127, - 726)}]} -guimgr.recent-documents = [loc('extract_caddetails.py'), - loc('__main__.py'), + 'window-alloc': (62, + 18, + 1155, + 691)}]} +guimgr.recent-documents = [loc('activitylog_watcher.py'), loc('logging_service.py'), - loc('activitylog_watcher.py'), - loc('../../../config/logging_service.cfg')] -guimgr.visual-state = {loc('cad_watcher.py'): {'attrib-starts': [('getLogEnt'\ + loc('extract_caddetails.py')] +guimgr.visual-state = {loc('../../../../../../Audio/mkLabelTrack.py'): {'att'\ + 'rib-starts': [], + 'code-line': '', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}, + loc('../../../../../../Docs/Academics/Courses_SWE/305/Projects/RoundupBoards/echoboard.py'): {'a'\ + 'ttrib-starts': [('dump|0|', + 1)], + 'code-line': ' print line.strip()\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 2L, + 'sel-line-start': 29L, + 'selection_end': 51L, + 'selection_start': 51L, + 'zoom': 0L}, + loc('../../../../../../Docs/Academics/Courses_SWE/305/Projects/Roundup_Gsolver/replaySolution.py'): {'a'\ + 'ttrib-starts': [('makeMove|0|', + 56)], + 'code-line': ' x = True\n', + 'first-line': 62L, + 'folded-linenos': [], + 'sel-line': 64L, + 'sel-line-start': 1691L, + 'selection_end': 1707L, + 'selection_start': 1707L, + 'zoom': 0L}, + loc('../../../../../../Docs/Academics/Courses_SWE/305/Projects/Roundup_Gsolver/rotate.py'): {'a'\ + 'ttrib-starts': [], + 'code-line': ' print matches[selected]\n', + 'first-line': 27L, + 'folded-linenos': [], + 'sel-line': 48L, + 'sel-line-start': 1653L, + 'selection_end': 1663L, + 'selection_start': 1663L, + 'zoom': 0L}, + loc('../../../../../../Docs/Academics/Courses_SWE/305/Projects/Roundup_Gsolver/sortboard.py'): {'a'\ + 'ttrib-starts': [], + 'code-line': ' idx = randint(0,len(solmap[solkey])-1)\n', + 'first-line': 27L, + 'folded-linenos': [], + 'sel-line': 47L, + 'sel-line-start': 1357L, + 'selection_end': 1403L, + 'selection_start': 1357L, + 'zoom': 0L}, + loc('../../../../../Documents/crosswordsocial1.py'): {'a'\ + 'ttrib-starts': [], + 'code-line': 'img_pixels = im.load()\n', + 'first-line': 9L, + 'folded-linenos': [], + 'sel-line': 10L, + 'sel-line-start': 257L, + 'selection_end': 267L, + 'selection_start': 257L, + 'zoom': 0L}, + loc('../../../config/logging_service.cfg'): {'attrib-'\ + 'starts': [], + 'code-line': 'UnifiedLogPath = webapps/dynamicdata/\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 1L, + 'sel-line-start': 8L, + 'selection_end': 22L, + 'selection_start': 8L, + 'zoom': 0L}, + loc('__main__.py'): {'attrib-starts': [], + 'code-line': "if __name__ == '__main__':\n", + 'first-line': 14L, + 'folded-linenos': [], + 'sel-line': 13L, + 'sel-line-start': 556L, + 'selection_end': 593L, + 'selection_start': 556L, + 'zoom': 0L}, + loc('activitylog_watcher.py'): {'attrib-starts': [('r'\ + 'eadFile|0|', + 21)], + 'code-line': ' logfilename = "data.json" #"IncidentActivity.log'\ + '"\n', + 'first-line': 39L, + 'folded-linenos': [], + 'sel-line': 26L, + 'sel-line-start': 824L, + 'selection_end': 857L, + 'selection_start': 857L, + 'zoom': 0L}, + loc('cad_watcher.py'): {'attrib-starts': [('getLogEnt'\ 'ries|0|', 18)], @@ -585,11 +661,12 @@ 'zoom': 0L}, loc('extract_caddetails.py'): {'attrib-starts': [], - 'code-line': ' main()\n', + 'code-line': '# Move unifiedlogger.zip from deploy folder t'\ + 'o webapps folder.\n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 62L, - 'sel-line-start': 3065L, - 'selection_end': 3073L, - 'selection_start': 3073L, + 'sel-line': 6L, + 'sel-line-start': 246L, + 'selection_end': 317L, + 'selection_start': 317L, 'zoom': 0L}, loc('get_app_properties.py'): {'attrib-starts': [], @@ -610,4 +687,13 @@ 'selection_end': 455L, 'selection_start': 455L, + 'zoom': 0L}, + loc('logging_service.py'): {'attrib-starts': [], + 'code-line': "if __name__ == '__main__':\n", + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 80L, + 'sel-line-start': 2695L, + 'selection_end': 2735L, + 'selection_start': 2695L, 'zoom': 0L}, loc('test_logging_service.py'): {'attrib-starts': [('t'\ @@ -641,5 +727,5 @@ 589)], 'code-line': ' raise NoSectionError(section)\n', - 'first-line': 575L, + 'first-line': 589L, 'folded-linenos': [], 'sel-line': 606L, @@ -689,3 +775,7 @@ proj.env-vars = {None: ('default', [u''])} -search.search-history = [u'default directory policy'] +search.replace-history = [u'sol', + u'img_pixels'] +search.search-history = [u'text', + u'px', + u'default directory policy'] Index: trunk/src/python/unifiedlogger/activitylog_watcher.py =================================================================== --- trunk/src/python/unifiedlogger/activitylog_watcher.py (revision 644) +++ trunk/src/python/unifiedlogger/activitylog_watcher.py (revision 645) @@ -45,8 +45,18 @@ config.read('config/logging_service.cfg') return config.get('Paths', 'ActivityLogPath') + +# get data filenames from configuration +# returns incident data filename, incident summary filename +# jdalbey 2022.9.1 +def getLogFilenames(): + config = ConfigParser.ConfigParser() + config.read('config/logging_service.cfg') + file1 = config.get('Files','ActivityLogDataFilename') + file2 = config.get('Files','ActivityLogSummaryFilename') + return file1,file2 # Read the activty log entries def readFile1(): - logfilename = "incident_activity.json" #"IncidentActivity.log" + logfilename = getLogFilenames()[0] #"IncidentActivity.log" output = [] try: @@ -64,5 +74,6 @@ # It has a different format than incident_activity.json, so we put it in a separate function. def readFile2(): - data_summary = "incident_description.json" + data_summary = getLogFilenames()[1] #"incident_description.json" + output = [] try: Index: trunk/src/python/unifiedlogger/__main__.py =================================================================== --- trunk/src/python/unifiedlogger/__main__.py (revision 452) +++ trunk/src/python/unifiedlogger/__main__.py (revision 645) @@ -5,5 +5,5 @@ config = ConfigParser.ConfigParser() try: - config.read('config/application_properties.cf') + config.read('config/application_properties.cfg') revNum = config.get('Versions', 'revision_number') except: # If config file not found, use a question mark placeholder