From 59a59e4100cfebd94f8ba726195a2c1fe0881df7 Mon Sep 17 00:00:00 2001
From: Cort Buffington <n0mjs@me.com>
Date: Fri, 16 Mar 2018 20:29:46 -0500
Subject: [PATCH] Accommodate DMR-MARC JSON only database changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Talkgroup files are samples – pick one format or the other if you want
those aliases. this changes the type of dump you do with DMR-MARC and
the way you save files locally. CSV still works, but DMR-MARC will stop
supporting it!!! DO NOT mix .csv filenames and .json downloads. The
extension must match the file data type.
---
 dmrlink_SAMPLE.cfg        | 10 +++++-----
 talkgroup_ids.csv.SAMPLE  |  3 +++
 talkgroup_ids.json.SAMPLE |  6 ++++++
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 talkgroup_ids.csv.SAMPLE
 create mode 100644 talkgroup_ids.json.SAMPLE

diff --git a/dmrlink_SAMPLE.cfg b/dmrlink_SAMPLE.cfg
index 22593a9..7a19568 100644
--- a/dmrlink_SAMPLE.cfg
+++ b/dmrlink_SAMPLE.cfg
@@ -86,11 +86,11 @@ LOG_NAME: DMRlink
 TRY_DOWNLOAD: True
 LOCAL_FILE: False
 PATH: ./
-PEER_FILE: peer_ids.csv
-SUBSCRIBER_FILE: subscriber_ids.csv
-TGID_FILE: talkgroup_ids.csv
-PEER_URL: http://www.dmr-marc.net/cgi-bin/trbo-database/datadump.cgi?table=repeaters&format=csv&header=0
-SUBSCRIBER_URL: http://www.dmr-marc.net/cgi-bin/trbo-database/datadump.cgi?table=users&format=csv&header=0
+PEER_FILE: peer_ids.json
+SUBSCRIBER_FILE: subscriber_ids.json
+TGID_FILE: talkgroup_ids.json
+PEER_URL: http://www.dmr-marc.net/cgi-bin/trbo-database/datadump.cgi?table=repeaters&format=json
+SUBSCRIBER_URL: http://www.dmr-marc.net/cgi-bin/trbo-database/datadump.cgi?table=users&format=json
 STALE_DAYS: 7
 
 
diff --git a/talkgroup_ids.csv.SAMPLE b/talkgroup_ids.csv.SAMPLE
new file mode 100644
index 0000000..7dda501
--- /dev/null
+++ b/talkgroup_ids.csv.SAMPLE
@@ -0,0 +1,3 @@
+1,MARC Wordlwide
+2,Local 2
+3,MARC North America
\ No newline at end of file
diff --git a/talkgroup_ids.json.SAMPLE b/talkgroup_ids.json.SAMPLE
new file mode 100644
index 0000000..abf7749
--- /dev/null
+++ b/talkgroup_ids.json.SAMPLE
@@ -0,0 +1,6 @@
+{"tgids":[
+        {"tgid":"1","name":"MARC Worldwide"},
+        {"tgid":"2","name":"Local 2"},
+        {"tgid":"3","name":"MARC North America"}
+    ]
+}
\ No newline at end of file