Changeset 549 in tmcsimulator

Timestamp:

12/26/2019 06:37:15 AM (6 years ago)

Author:

jdalbey

Message:

unifiedlogger Correct messages to have similar capitalization and punctuation.

Location:

trunk/src

Files:

• python/unifiedlogger/activitylog_watcher.py (modified) (1 diff)
• python/unifiedlogger/cms_watcher.py (modified) (1 diff)
• python/unifiedlogger/wing_project.wpr (modified) (1 diff)
• tmcsim/application.properties (modified) (1 diff)
• tmcsim/cadsimulator/Coordinator.java (modified) (3 diffs)

trunk/src/python/unifiedlogger/activitylog_watcher.py

@@ -69 +69 @@
         code = item[4].replace(',','')
         msg = item[5].replace(',','')
-        desiredFields = "Activity Log.,"+name+"," + incident_num + " " + code+" "+msg
+        desiredFields = "Activity Log,"+name+"," + incident_num + " " + code+" "+msg
         # Append to results list
         resultList.append(desiredFields)

trunk/src/python/unifiedlogger/cms_watcher.py

@@ -71 +71 @@
           # Is a new message activated?
           if isEmpty(prevList[idx]) and isFull(currList[idx]):
-               results.append("CMS Activated.," + locationMap[idList[idx]] + ", '" + currList[idx] +"'")
+               results.append("CMS Activated," + locationMap[idList[idx]] + ", '" + currList[idx] +"'")
           # Is an existing message turned off?
           if isEmpty(currList[idx]) and isFull(prevList[idx]):
-               results.append("CMS Deactivated., " + locationMap[idList[idx]])
+               results.append("CMS Deactivated, " + locationMap[idList[idx]])
           # Did a message change?
           if isFull(currList[idx]) and isFull(prevList[idx]) and currList[idx] != prevList[idx]:
-               results.append("CMS Updated., " + locationMap[idList[idx]] + ", '" + currList[idx] +"'")
+               results.append("CMS Updated, " + locationMap[idList[idx]] + ", '" + currList[idx] +"'")
 
      # Save the current list as previous

trunk/src/python/unifiedlogger/wing_project.wpr

@@ -470 +470 @@
                               (loc('extend_unifiedlogger.py'),
                                {'attrib-starts': [],
-                                'code-line': "                        # if t"\
-        "here's detail field add it to the entries \n",
-                                'first-line': 33L,
+                                'code-line': 'out_file.close()\n',
+                                'first-line': 51L,
                                 'folded-linenos': [],
-                                'sel-line': 56L,
-                                'sel-line-start': 2592L,
-                                'selection_end': 2641L,
-                                'selection_start': 2641L,
+                                'sel-line': 69L,
+                                'sel-line-start': 3068L,
+                                'selection_end': 3085L,
+                                'selection_start': 3068L,
                                 'zoom': 0L}),
                               (loc('../../../config/logging_service.cfg'),

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Wed, 27 Nov 2019 09:34:13 -0800
+#Sat, 07 Dec 2019 09:48:16 -0800
 
-Application.revision=531
+Application.revision=540
 
 Application.buildnumber=199

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -279 +279 @@
             final DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
             String logItem = timeFormat.format(new Date())
-                    + " CAD log, "
+                    + " CAD Log, "
                     + "Simulation Started at "
                     + datetimeFmt.format(new Date())
@@ -291 +291 @@
         final DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
         simMgrMsgLog.add(timeFormat.format(new Date())
-                + " CAD log, "
+                + " CAD Log, "
                 + "Simulation Paused.\n");
         // pausing the simulation will halt writing of CAD log,
@@ -869 +869 @@
                 {//17:03:19 CAD Log Entry, Incident #187, Sharon: REQUEST EXTRA ANCHOVIES
                     output.append(timestamp);
-                    output.append(" CAD log, ");
+                    output.append(" CAD Log, ");
                     output.append("Incident #" + incident.logNum + ", ");
                     output.append(initials + ": ");