From 2e1a4c3a58bee1bf5e68ee3f0566f486158bb2f3 Mon Sep 17 00:00:00 2001
From: Cort Buffington <n0mjs@me.com>
Date: Mon, 16 Apr 2018 08:46:42 -0500
Subject: [PATCH] Revert "Accommodate DMR-MARC JSON only database changes"

This reverts commit 59a59e4100cfebd94f8ba726195a2c1fe0881df7.
---
 dmrlink_SAMPLE.cfg        | 10 +++++-----
 talkgroup_ids.csv.SAMPLE  |  3 ---
 talkgroup_ids.json.SAMPLE |  6 ------
 3 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 talkgroup_ids.csv.SAMPLE
 delete mode 100644 talkgroup_ids.json.SAMPLE

diff --git a/dmrlink_SAMPLE.cfg b/dmrlink_SAMPLE.cfg
index 7a19568..22593a9 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.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
+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
 STALE_DAYS: 7
 
 
diff --git a/talkgroup_ids.csv.SAMPLE b/talkgroup_ids.csv.SAMPLE
deleted file mode 100644
index 7dda501..0000000
--- a/talkgroup_ids.csv.SAMPLE
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index abf7749..0000000
--- a/talkgroup_ids.json.SAMPLE
+++ /dev/null
@@ -1,6 +0,0 @@
-{"tgids":[
-        {"tgid":"1","name":"MARC Worldwide"},
-        {"tgid":"2","name":"Local 2"},
-        {"tgid":"3","name":"MARC North America"}
-    ]
-}
\ No newline at end of file