From 7f3c8b8486cd215b63f6d7c493ff40d0f0106b9f Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Wed, 11 Nov 2020 17:24:18 +0000
Subject: Conflict in guix-deploy

---
 bh20simplewebuploader/main.py                | 16 ++++++++++------
 scripts/update_virtuoso/check_for_updates.py |  8 +++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/bh20simplewebuploader/main.py b/bh20simplewebuploader/main.py
index 1d7154c..e69caa1 100644
--- a/bh20simplewebuploader/main.py
+++ b/bh20simplewebuploader/main.py
@@ -257,12 +257,16 @@ def send_home():
                                port=os.environ.get('PORT', 6379),
                                db=os.environ.get('REDIS_DB', 0))
     tweets = []
-    for tweet_id in redis_client.zrevrange('bh20-tweet-score:',
-                                           0, -1):
-        tweets.append(
-            {k.decode("utf-8"): v.decode("utf-8") for k, v in
-             redis_client.hgetall(tweet_id).items()}
-        )
+    try:
+        for tweet_id in redis_client.zrevrange('bh20-tweet-score:',
+                                               0, -1):
+            tweets.append(
+                {k.decode("utf-8"): v.decode("utf-8") for k, v in
+                 redis_client.hgetall(tweet_id).items()}
+            )
+    except redis.exceptions.ConnectionError as e:
+        logging.warning(e)
+        pass
     return render_template('home.html', menu='HOME',
                            tweets=tweets,
                            load_map=True)
diff --git a/scripts/update_virtuoso/check_for_updates.py b/scripts/update_virtuoso/check_for_updates.py
index f32d0df..9cb98b4 100755
--- a/scripts/update_virtuoso/check_for_updates.py
+++ b/scripts/update_virtuoso/check_for_updates.py
@@ -14,6 +14,8 @@ import sys
 import os.path
 import subprocess
 
+HOST="http://127.0.0.1:8890/"
+
 assert(len(sys.argv)==4)
 fn = sys.argv[1]
 user = sys.argv[2]
@@ -36,7 +38,7 @@ def upload(fn):
     # Upload into Virtuoso using CURL
     # cmd = "curl -X PUT --digest -u dba:dba -H Content-Type:text/turtle -T metadata.ttl -G http://localhost:8890/sparql-graph-crud-auth --data-urlencode graph=http://covid-19.genenetwork.org/graph".split(" ")
     # print("DELETE "+fn)
-    # cmd = ("curl --digest --user dba:%s --verbose --url -G http://sparql.genenetwork.org/sparql-graph-crud-auth --data-urlencode graph=http://covid-19.genenetwork.org/graph -X DELETE" % pwd).split(" ")
+    # cmd = ("curl --digest --user dba:%s --verbose --url -G http://xsparql.genenetwork.org/sparql-graph-crud-auth --data-urlencode graph=http://covid-19.genenetwork.org/graph -X DELETE" % pwd).split(" ")
 
     print("VALIDATE "+fn)
     cmd = f"rapper -i turtle {fn}"
@@ -48,7 +50,7 @@ def upload(fn):
     assert(p.returncode == 0)
 
     print("UPLOADING "+fn)
-    cmd = ("curl -X PUT --digest -u dba:%s -H Content-Type:text/turtle -T %s -G http://sparql.genenetwork.org/sparql-graph-crud-auth --data-urlencode graph=http://covid-19.genenetwork.org/graph/%s" % (pwd, fn, os.path.basename(fn)) )
+    cmd = (f"curl -X PUT --digest -u dba:%s -H Content-Type:text/turtle -T %s -G {HOST}/sparql-graph-crud-auth --data-urlencode graph=http://covid-19.genenetwork.org/graph/%s" % (pwd, fn, os.path.basename(fn)) )
     print(cmd)
     p = subprocess.Popen(cmd.split(" "),stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out, err = p.communicate()
@@ -79,7 +81,7 @@ if os.path.isfile(fn):
 if force or no_cache or stamp != last_modified_str:
     print("Delete graphs")
     for graph in ["labels.ttl", "metadata.ttl", "countries.ttl"]:
-        cmd = ("curl --digest -u dba:%s --verbose --url http://127.0.0.1:8890/sparql-graph-crud-auth?graph=http://covid-19.genenetwork.org/graph/%s -X DELETE" % (pwd, graph))
+        cmd = (f"curl --digest -u dba:%s --verbose --url {HOST}/sparql-graph-crud-auth?graph=http://covid-19.genenetwork.org/graph/%s -X DELETE" % (pwd, graph))
         print(cmd)
         p = subprocess.Popen(cmd.split(" "))
         output = p.communicate()[0]
-- 
cgit v1.2.3