Index: trunk/src/python/unifiedlogger/wing_project.wpr =================================================================== --- trunk/src/python/unifiedlogger/wing_project.wpr (revision 443) +++ trunk/src/python/unifiedlogger/wing_project.wpr (revision 444) @@ -35,4 +35,5 @@ [user attributes] debug.show-args-dialog = {loc('__main__.py'): False} +edit.file-encoding = {loc('get_revision'): 'UTF-8'} guimgr.overall-gui-state = {'windowing-policy': 'combined-window', 'windows': [{'name': '0BtsNVOAornvyNAPNOxHAmuDFR'\ @@ -84,6 +85,6 @@ 'current_pages': [3, 1], - 'notebook_display': 'hidden', - 'notebook_percent': 0.0, + 'notebook_display': 'normal', + 'notebook_percent': 0.30000000000000004, 'override_title': None, 'pagelist': [('batch-search', @@ -182,89 +183,52 @@ 'toolbox-percent': 1.0, 'toolbox-tree-sel': ''})], - 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('../../../../../../../usr/lib/wing-personal7/doc/TOC'), - {'displayed-index': 102, - 'viewer-state': {'history': [-1, - 60, - -1, - 6, - 1, - -1, - 102, - 234], - 'history-pos': 6, - 'index': 102, - 'top': 0, - 'top-left-pos': 5971}}, - 1562879090.358421], - [loc('../../../../../../../usr/lib/wing-personal7/doc/TOC'), - {'displayed-index': 234, - 'viewer-state': {'history': [-1, - 60, - -1, - 6, - 1, - -1, - 102, - 234], - 'history-pos': 7, - 'index': 234, - 'top': 0, - 'top-left-pos': 20113}}, - 1562879176.767588], - [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': 597L, - 'folded-linenos': [], - 'sel-line': 606L, - 'sel-line-start': 22028L, - 'selection_end': 22028L, - 'selection_start': 22028L, - 'zoom': 0L}, - 1562879399.049104], - [loc('../../../../../../../usr/lib/wing-personal7/doc/TOC'), - {'displayed-index': 234, - 'viewer-state': {'history': [-1, - 60, - -1, - 6, - 1, - -1, - 102, - 234], - 'history-pos': 7, - 'index': 234, - 'top': 0, - 'top-left-pos': 101}}, - 1562879632.459482], - [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': 597L, - 'folded-linenos': [], - 'sel-line': 606L, - 'sel-line-start': 22028L, - 'selection_end': 22028L, - 'selection_start': 22028L, - 'zoom': 0L}, - 1562879640.602333], + 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('cad_watcher.py'), + {'attrib-starts': [('setup|0|', + 31)], + 'code-line': ' return\n', + 'first-line': 15L, + 'folded-linenos': [], + 'sel-line': 33L, + 'sel-line-start': 888L, + 'selection_end': 898L, + 'selection_start': 898L, + 'zoom': 0L}, + 1562953860.143117], [loc('logging_service.py'), {'attrib-starts': [('startup|0|', - 16)], - 'code-line': ' timeStamp = getSimTime()\n', - 'first-line': 18L, - 'folded-linenos': [], - 'sel-line': 41L, - 'sel-line-start': 1347L, - 'selection_end': 1378L, - 'selection_start': 1378L, - 'zoom': 0L}, - 1562879647.165641], + 17)], + 'code-line': ' f = open(logfilepath + outputFilename, "'\ + 'a")\n', + 'first-line': 6L, + 'folded-linenos': [], + 'sel-line': 63L, + 'sel-line-start': 2214L, + 'selection_end': 2263L, + 'selection_start': 2263L, + 'zoom': 0L}, + 1563130761.348523], + [loc('cad_watcher.py'), + {'attrib-starts': [], + 'code-line': '# Read the cad comments log \n', + 'first-line': 15L, + 'folded-linenos': [], + 'sel-line': 19L, + 'sel-line-start': 546L, + 'selection_end': 838L, + 'selection_start': 546L, + 'zoom': 0L}, + 1563130779.821267], + [loc('unknown:untitled-1.py'), + {'attrib-starts': [('readFile|0|', + 3)], + 'code-line': '', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 15L, + 'sel-line-start': 412L, + 'selection_end': 412L, + 'selection_start': 412L, + 'zoom': 0L}, + 1563130943.219386], [loc('__main__.py'), {'attrib-starts': [('main|0|', @@ -279,180 +243,195 @@ 'selection_start': 183L, 'zoom': 0L}, - 1562879668.696399], + 1563130944.74234], + [loc('get_revision'), + {'attrib-starts': [], + 'code-line': 'print readFile()', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 15L, + 'sel-line-start': 412L, + 'selection_end': 418L, + 'selection_start': 418L, + 'zoom': 0L}, + 1563130972.859102], [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 16)], - 'code-line': ' timeStamp = getSimTime()\n', - 'first-line': 18L, - 'folded-linenos': [], - 'sel-line': 41L, - 'sel-line-start': 1347L, - 'selection_end': 1378L, - 'selection_start': 1378L, - 'zoom': 0L}, - 1562880191.70851], - [loc('cms_watcher.py'), - {'attrib-starts': [('extractMessages|0|', - 45)], - 'code-line': '\n', - 'first-line': 45L, - 'folded-linenos': [], - 'sel-line': 56L, - 'sel-line-start': 1978L, - 'selection_end': 1978L, - 'selection_start': 1978L, - 'zoom': 0L}, - 1562880439.712792], + {'attrib-starts': [], + 'code-line': 'import cms_watcher, cad_watcher, time, json, ConfigP'\ + 'arser, get_revision\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 71L, + 'selection_start': 71L, + 'zoom': 0L}, + 1563131014.214975], + [loc('get_revision'), + {'attrib-starts': [], + 'code-line': '', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 15L, + 'sel-line-start': 415L, + 'selection_end': 415L, + 'selection_start': 415L, + 'zoom': 0L}, + 1563131037.968315], [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 16)], - 'code-line': ' timeStamp = getSimTime()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 41L, - 'sel-line-start': 1347L, - 'selection_end': 1378L, - 'selection_start': 1378L, - 'zoom': 0L}, - 1562880463.667528], - [loc('cms_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 61)], - 'code-line': " results.append(\"CMS Updated., \" + l"\ - "ocationMap[idList[idx]] + \", '\" + currList[idx] +"\ - "\"'\")\n", - 'first-line': 57L, - 'folded-linenos': [], - 'sel-line': 78L, - 'sel-line-start': 2846L, - 'selection_end': 2924L, - 'selection_start': 2924L, - 'zoom': 0L}, - 1562880625.962149], - [loc('cad_watcher.py'), - {'attrib-starts': [('setup|0|', - 31)], - 'code-line': ' return\n', - 'first-line': 24L, - 'folded-linenos': [], - 'sel-line': 33L, - 'sel-line-start': 888L, - 'selection_end': 898L, - 'selection_start': 898L, - 'zoom': 0L}, - 1562882880.377423], - [loc('cms_watcher.py'), - {'attrib-starts': [('extractMessages|0|', - 45)], - 'code-line': " msgList[idx]['cms']['message']['"\ - "phase2']['Line2'] + ':' +\n", - 'first-line': 39L, - 'folded-linenos': [], - 'sel-line': 54L, - 'sel-line-start': 1829L, - 'selection_end': 1903L, - 'selection_start': 1903L, - 'zoom': 0L}, - 1562883842.916941], + {'attrib-starts': [], + 'code-line': 'import cms_watcher, cad_watcher, time, json, ConfigP'\ + 'arser, get_revision\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 71L, + 'selection_start': 71L, + 'zoom': 0L}, + 1563131045.946787], + [loc('get_revision'), + {'attrib-starts': [], + 'code-line': '', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 18L, + 'sel-line-start': 455L, + 'selection_end': 455L, + 'selection_start': 455L, + 'zoom': 0L}, + 1563131163.18444], + [loc('logging_service.py'), + {'attrib-starts': [], + 'code-line': 'import cms_watcher, cad_watcher, time, json, ConfigP'\ + 'arser, get_revision\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 71L, + 'selection_start': 71L, + 'zoom': 0L}, + 1563131223.451037], + [loc('get_app_properties.py'), + {'attrib-starts': [('getRevision|0|', + 14)], + 'code-line': 'def getRevision(lines):\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 14L, + 'sel-line-start': 370L, + 'selection_end': 385L, + 'selection_start': 374L, + 'zoom': 0L}, + 1563131232.527418], [loc('logging_service.py'), {'attrib-starts': [('startup|0|', 17)], - 'code-line': ' f = open(logfilepath + outputFilename, "'\ - 'a")\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 63L, - 'sel-line-start': 2214L, - 'selection_end': 2263L, - 'selection_start': 2263L, - 'zoom': 0L}, - 1562887416.91585], + 'code-line': 'def startup():\n', + 'first-line': 7L, + 'folded-linenos': [], + 'sel-line': 17L, + 'sel-line-start': 533L, + 'selection_end': 547L, + 'selection_start': 547L, + 'zoom': 0L}, + 1563131266.147045], [loc('__main__.py'), {'attrib-starts': [('main|0|', 2)], - 'code-line': ' print "Unified Logging Service starting from ",o'\ - 's.getcwd()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 3L, - 'sel-line-start': 132L, - 'selection_end': 183L, - 'selection_start': 183L, - 'zoom': 0L}, - 1562892803.750792], - [loc('cms_watcher.py'), - {'attrib-starts': [('isEmpty|0|', - 12)], - 'code-line': ' return cmsitem == ":::::"\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 13L, - 'sel-line-start': 324L, - 'selection_end': 353L, - 'selection_start': 353L, - 'zoom': 0L}, - 1562893146.713132], + 'code-line': ' print "revision ",get_app_properties.getRevision'\ + '()\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 4L, + 'sel-line-start': 215L, + 'selection_end': 269L, + 'selection_start': 269L, + 'zoom': 0L}, + 1563131297.40217], + [loc('logging_service.py'), + {'attrib-starts': [], + 'code-line': 'import cms_watcher, cad_watcher, time, json, ConfigP'\ + 'arser\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 57L, + 'selection_start': 57L, + 'zoom': 0L}, + 1563131307.615114], + [loc('get_app_properties.py'), + {'attrib-starts': [('getRevision|0|', + 14)], + 'code-line': 'def getRevision(lines):\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 14L, + 'sel-line-start': 382L, + 'selection_end': 382L, + 'selection_start': 382L, + 'zoom': 0L}, + 1563131330.855952], [loc('__main__.py'), {'attrib-starts': [('main|0|', 2)], - 'code-line': ' print "Unified Logging Service starting from ",o'\ - 's.getcwd()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 3L, - 'sel-line-start': 132L, - 'selection_end': 183L, - 'selection_start': 183L, - 'zoom': 0L}, - 1562953832.001241], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 17)], - 'code-line': ' f = open(logfilepath + outputFilename, "'\ - 'a")\n', - 'first-line': 33L, - 'folded-linenos': [], - 'sel-line': 63L, - 'sel-line-start': 2214L, - 'selection_end': 2263L, - 'selection_start': 2263L, - 'zoom': 0L}, - 1562953847.965491], - [loc('cms_watcher.py'), - {'attrib-starts': [('isEmpty|0|', - 12)], - 'code-line': ' return cmsitem == ":::::"\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 13L, - 'sel-line-start': 324L, - 'selection_end': 353L, - 'selection_start': 353L, - 'zoom': 0L}, - 1562953854.594261], - [loc('cad_watcher.py'), - {'attrib-starts': [('setup|0|', - 31)], - 'code-line': ' return\n', - 'first-line': 15L, - 'folded-linenos': [], - 'sel-line': 33L, - 'sel-line-start': 888L, - 'selection_end': 898L, - 'selection_start': 898L, - 'zoom': 0L}, - 1562953860.143117]], + 'code-line': ' print "revision ",get_app_properties.getRevision'\ + '()\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 4L, + 'sel-line-start': 215L, + 'selection_end': 215L, + 'selection_start': 215L, + 'zoom': 0L}, + 1563131341.340806], + [loc('get_app_properties.py'), + {'attrib-starts': [('getRevision|0|', + 14)], + 'code-line': ' lines = getProperties()\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 15L, + 'sel-line-start': 401L, + 'selection_end': 413L, + 'selection_start': 413L, + 'zoom': 0L}, + 1563131376.535666], + [loc('__main__.py'), + {'attrib-starts': [('main|0|', + 2)], + 'code-line': ' print "Unified Logging Service v"+revNum,"starti'\ + 'ng from ",os.getcwd()\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 4L, + 'sel-line-start': 198L, + 'selection_end': 244L, + 'selection_start': 244L, + 'zoom': 0L}, + 1563131462.025839], + [loc('get_app_properties.py'), + {'attrib-starts': [], + 'code-line': '\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}, + 1563131503.437265]], 20), - 'current-loc': loc('logging_service.py'), + 'current-loc': loc('__main__.py'), 'editor-state-list': [(loc('cad_watcher.py'), - {'attrib-starts': [('setup|0|', - 31)], - 'code-line': ' return\n', + {'attrib-starts': [], + 'code-line': '# Read the cad comments log \n', 'first-line': 15L, 'folded-linenos': [], - 'sel-line': 33L, - 'sel-line-start': 888L, - 'selection_end': 898L, - 'selection_start': 898L, + 'sel-line': 19L, + 'sel-line-start': 546L, + 'selection_end': 838L, + 'selection_start': 546L, 'zoom': 0L}), (loc('cms_watcher.py'), @@ -468,15 +447,24 @@ 'selection_start': 353L, 'zoom': 0L}), + (loc('get_app_properties.py'), + {'attrib-starts': [], + 'code-line': '\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}), (loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 17)], - 'code-line': ' f = open(logfilepa'\ - 'th + outputFilename, "a")\n', - 'first-line': 48L, + {'attrib-starts': [], + 'code-line': 'import cms_watcher, cad_watche'\ + 'r, time, json, ConfigParser\n', + 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 63L, - 'sel-line-start': 2214L, - 'selection_end': 2263L, - 'selection_start': 2263L, + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 57L, + 'selection_start': 57L, 'zoom': 0L}), (loc('__main__.py'), @@ -484,22 +472,24 @@ 2)], 'code-line': ' print "Unified Logging Ser'\ - 'vice starting from ",os.getcwd()\n', + 'vice v"+revNum,"starting from ",os.getcwd()\n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 3L, - 'sel-line-start': 132L, - 'selection_end': 183L, - 'selection_start': 183L, + 'sel-line': 4L, + 'sel-line-start': 198L, + 'selection_end': 244L, + 'selection_start': 244L, 'zoom': 0L})], - 'has-focus': False, + 'has-focus': True, 'locked': False}, [loc('cad_watcher.py'), loc('cms_watcher.py'), + loc('get_app_properties.py'), loc('logging_service.py'), loc('__main__.py')]), - 'open_files': [u'__main__.py', + 'open_files': [u'cms_watcher.py', u'cad_watcher.py', - u'cms_watcher.py', - u'logging_service.py']}, + u'logging_service.py', + u'get_app_properties.py', + u'__main__.py']}, 'saved_notebook_display': None, 'split_percents': {0: 0.5}, @@ -508,5 +498,5 @@ 'traversal_pos': ((0, 3), - 1562879301.119771), + 1563131330.846264), 'user_data': {}}, 'saved_notebook_display': None, @@ -516,5 +506,5 @@ 'traversal_pos': ((0, 4), - 1562892833.554952), + 1563131442.756592), 'user_data': {}}, 'window-alloc': (29, @@ -522,9 +512,19 @@ 1197, 722)}]} -guimgr.recent-documents = [loc('logging_service.py'), +guimgr.recent-documents = [loc('__main__.py'), + loc('get_app_properties.py'), + loc('logging_service.py'), loc('cad_watcher.py'), - loc('cms_watcher.py'), - loc('__main__.py')] -guimgr.visual-state = {loc('../../../../../../../usr/lib/python2.7/ConfigParser.py'): {'a'\ + loc('cms_watcher.py')] +guimgr.visual-state = {loc('get_revision'): {'attrib-starts': [], + 'code-line': '', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 18L, + 'sel-line-start': 455L, + 'selection_end': 455L, + 'selection_start': 455L, + 'zoom': 0L}, + loc('../../../../../../../usr/lib/python2.7/ConfigParser.py'): {'a'\ 'ttrib-starts': [('ConfigParser|0|', 85), Index: trunk/src/python/unifiedlogger/get_app_properties.py =================================================================== --- trunk/src/python/unifiedlogger/get_app_properties.py (revision 444) +++ trunk/src/python/unifiedlogger/get_app_properties.py (revision 444) @@ -0,0 +1,20 @@ + + +# Read the application properties file +def getProperties(): + lines = [] + try: + text_file = open("src/tmcsim/application.properties", "r") + except IOError: + print "Error: missing src/timc/application.properties file." + else: + lines = text_file.read().split('\n') + text_file.close() + return lines + +# Accessor to SVN version number +def getRevision(): + lines = getProperties() + revNumber = lines[2].split("=")[1] + return revNumber + Index: trunk/src/python/unifiedlogger/__main__.py =================================================================== --- trunk/src/python/unifiedlogger/__main__.py (revision 439) +++ trunk/src/python/unifiedlogger/__main__.py (revision 444) @@ -1,6 +1,7 @@ -import logging_service, os +import logging_service, os, get_app_properties # This main module is provided so the application can be conveniently bundled for deployment def main(): - print "Unified Logging Service starting from ",os.getcwd() + revNum = get_app_properties.getRevision() + print "Unified Logging Service v"+revNum,"starting from ",os.getcwd() logging_service.startup()