Index: trunk/webapps/unifiedlogger/cms_watcher.py
===================================================================
--- trunk/webapps/unifiedlogger/cms_watcher.py	(revision 433)
+++ trunk/webapps/unifiedlogger/cms_watcher.py	(revision 439)
@@ -8,5 +8,5 @@
 prevList = []  # previous messages
 currList = []  # current messages
-locationMap = {}
+locationMap = {} # map of CMS ID's to locations
 
 # Utility functions
@@ -18,5 +18,5 @@
 # Read the cms message file
 def readFile():     
-     with open ("../dynamicdata/cms_messages.json",'r') as myfile:
+     with open ("webapps/dynamicdata/cms_messages.json",'r') as myfile:
           jsonData=myfile.read()
  
@@ -25,5 +25,5 @@
 # Read the static file of cms locations and create a lookup map
 def loadLocations():
-     with open ("../cptms/data_layers/cms_locations_D12.gjson",'r') as myfile:
+     with open ("webapps/cptms/data_layers/cms_locations_D12.gjson",'r') as myfile:
           jsonData=myfile.read()
  
@@ -40,5 +40,5 @@
      for idx in range(0,len(msgList)):
           idList.append(msgList[idx]['cms']['index'])
-          prevList.append(",,,,,")
+          prevList.append(":::::")
      return msgList
 
@@ -49,9 +49,9 @@
      for idx in range(0,len(msgList)):
           currList.append(
-                    msgList[idx]['cms']['message']['phase1']['Line1'] + ',' + 
-                    msgList[idx]['cms']['message']['phase1']['Line2'] + ',' +
-                    msgList[idx]['cms']['message']['phase1']['Line3'] + ',' +
-                    msgList[idx]['cms']['message']['phase2']['Line1'] + ',' +
-                    msgList[idx]['cms']['message']['phase2']['Line2'] + ',' +
+                    msgList[idx]['cms']['message']['phase1']['Line1'] + ':' + 
+                    msgList[idx]['cms']['message']['phase1']['Line2'] + ':' +
+                    msgList[idx]['cms']['message']['phase1']['Line3'] + ':' +
+                    msgList[idx]['cms']['message']['phase2']['Line1'] + ':' +
+                    msgList[idx]['cms']['message']['phase2']['Line2'] + ':' +
                     msgList[idx]['cms']['message']['phase2']['Line3'])
 
@@ -71,11 +71,11 @@
           # 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
@@ -83,4 +83,5 @@
      return results
 
+# Local main for unit testing
 def main():
      global currList