From 806f52c352b5fa6f27d147036266714e8503c656 Mon Sep 17 00:00:00 2001 From: KD4Z Date: Mon, 16 Apr 2018 14:36:14 -0400 Subject: [PATCH 1/2] Change dmr-marc downloader to a static url and back to CSV Real time datadump no longer available do to server load Using wget to allow ignoring the current condition that dmr-marc.net does not have a valid ssl certificate. JSON is out, long live CSV! --- db/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/Makefile b/db/Makefile index 437163b7..063e364e 100644 --- a/db/Makefile +++ b/db/Makefile @@ -32,7 +32,7 @@ dmrmarc2.tmp: dmrmarc.tmp awk -F, -f insert_nick.awk <$< >$@ dmrmarc.tmp: - python2 get_dmrmarc_json.py >$@ 2>get_dmrmarc.errors + timeout 120 wget --no-check-certificate --wait=3 'https://dmr-marc.net/static/users.csv' -O $@ reflector.tmp: curl $(CURL_FLAGS) 'http://registry.dstar.su/reflector.db' | perl -pe '$$_ = "" if ( $$. == 1 ); s#@#,#; s#@.*#,,,,,,#' >$@ From 442b255448defe3ecef0b2ecf54037b78ac87846 Mon Sep 17 00:00:00 2001 From: KD4Z Date: Mon, 16 Apr 2018 15:10:30 -0400 Subject: [PATCH 2/2] Tabs --- db/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/Makefile b/db/Makefile index 84ea14dd..063e364e 100644 --- a/db/Makefile +++ b/db/Makefile @@ -32,7 +32,7 @@ dmrmarc2.tmp: dmrmarc.tmp awk -F, -f insert_nick.awk <$< >$@ dmrmarc.tmp: - timeout 120 wget --no-check-certificate --wait=3 'https://dmr-marc.net/static/users.csv' -O $@ + timeout 120 wget --no-check-certificate --wait=3 'https://dmr-marc.net/static/users.csv' -O $@ reflector.tmp: curl $(CURL_FLAGS) 'http://registry.dstar.su/reflector.db' | perl -pe '$$_ = "" if ( $$. == 1 ); s#@#,#; s#@.*#,,,,,,#' >$@