From 6b4fa3b47930eb823d6469f33056ed7d5df91d25 Mon Sep 17 00:00:00 2001
From: Cort Buffington <n0mjs@me.com>
Date: Sun, 22 Dec 2013 16:16:10 -0600
Subject: [PATCH] Configuraiton Clean-up

---
 dmrlink.py         | 8 ++++----
 dmrlink_SAMPLE.cfg | 1 +
 rcm.py             | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dmrlink.py b/dmrlink.py
index 25bbc10..8db522c 100755
--- a/dmrlink.py
+++ b/dmrlink.py
@@ -40,7 +40,7 @@ except:
 try:
     for section in config.sections():
         if section == 'GLOBAL':
-            pass
+            PATH = config.get(section, 'PATH')
 
         elif section == 'REPORTS':
             REPORTS = {
@@ -192,7 +192,7 @@ peer_ids = {}
 talkgroup_ids = {}
 
 try:
-    with open(curdir+'/subscriber_ids.csv', 'rU') as subscriber_ids_csv:
+    with open(PATH+'subscriber_ids.csv', 'rU') as subscriber_ids_csv:
         subscribers = csv.reader(subscriber_ids_csv, dialect='excel', delimiter=',')
         for row in subscribers:
             subscriber_ids[int(row[1])] = (row[0])
@@ -200,7 +200,7 @@ except ImportError:
     logger.warning('subscriber_ids.csv not found: Subscriber aliases will not be available')
     
 try:
-    with open(curdir+'/peer_ids.csv', 'rU') as peer_ids_csv:
+    with open(PATH+'peer_ids.csv', 'rU') as peer_ids_csv:
         peers = csv.reader(peer_ids_csv, dialect='excel', delimiter=',')
         for row in peers:
             peer_ids[int(row[1])] = (row[0])
@@ -208,7 +208,7 @@ except ImportError:
     logger.warning('peer_ids.csv not found: Peer aliases will not be available')
 
 try:
-    with open(curdir+'/talkgroup_ids.csv', 'rU') as talkgroup_ids_csv:
+    with open(PATH+'talkgroup_ids.csv', 'rU') as talkgroup_ids_csv:
         talkgroups = csv.reader(talkgroup_ids_csv, dialect='excel', delimiter=',')
         for row in talkgroups:
             talkgroup_ids[int(row[1])] = (row[0])
diff --git a/dmrlink_SAMPLE.cfg b/dmrlink_SAMPLE.cfg
index 7ace0a8..c301bdf 100644
--- a/dmrlink_SAMPLE.cfg
+++ b/dmrlink_SAMPLE.cfg
@@ -5,6 +5,7 @@
 #   There are no global options at this time
 #
 [GLOBAL]
+PATH: /absolute/path/to/DMRlink
 
 
 # STDOUT REPORTING CONFIG
diff --git a/rcm.py b/rcm.py
index 808098a..875fbae 100755
--- a/rcm.py
+++ b/rcm.py
@@ -109,7 +109,8 @@ class rcmIPSC(IPSC):
         pass
         
     def xcmp_xnl(self, _network, _data):
-        print('({}) XCMP/XNL Packet Received From: {}' .format(_network, h(_data)))
+        #print('({}) XCMP/XNL Packet Received From: {}' .format(_network, h(_data)))
+        pass
     
     def group_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
         pass