From 92c0a9cecbc3231d3a23f00cb000bab924e740ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=BCller?= <j.mueller@vr.rwth-aachen.de>
Date: Fri, 6 Mar 2020 10:29:30 +0100
Subject: [PATCH] Edit nest table desing
---
access_node/__main__.py | 2 +-
access_node/controllers/nest_controller.py | 18 ++++++++----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/access_node/__main__.py b/access_node/__main__.py
index ce24a47..77bab50 100644
--- a/access_node/__main__.py
+++ b/access_node/__main__.py
@@ -31,7 +31,7 @@ def SetupNestTables(postgres_username, postgres_password, port):
cur.execute('''CREATE TABLE MULTIMETERS (
MULTIMETER_ID INT PRIMARY KEY NOT NULL UNIQUE,
- ATTRIBUTE CHAR(50) );''')
+ ATTRIBUTE VARCHAR(50) );''')
cur.execute('''CREATE TABLE GIDS (
GID INT PRIMARY KEY NOT NULL UNIQUE,
diff --git a/access_node/controllers/nest_controller.py b/access_node/controllers/nest_controller.py
index 5172843..6b8f1b8 100644
--- a/access_node/controllers/nest_controller.py
+++ b/access_node/controllers/nest_controller.py
@@ -48,8 +48,8 @@ def nest_get_gids_in_population(population_id): # noqa: E501
:rtype: List[int]
"""
con = connect_to_database()
-
cur = con.cursor()
+
cur.execute("SELECT GID FROM GIDS WHERE GIDS.POPULATION_ID ="+str(population_id))
gids = [i[0] for i in cur.fetchall()]
@@ -68,21 +68,19 @@ def nest_get_multimeter_info(): # noqa: E501
con = connect_to_database()
cur = con.cursor()
- cur.execute("SELECT MULTIMETER_ID FROM MULTIMETERS")
- mult_ids = cur.fetchall()
+ ur.execute("SELECT * FROM MULTIMETERS;")
+ attributes = np.array(cur.fetchall())
+
- cur.execute("SELECT regexp_replace(ATTRIBUTE, '\s+$', '') FROM (SELECT * FROM MULTIMETERS) AS MULT_INFO;")
- attributes = cur.fetchall()
-
gids = []
- for id in mult_ids:
+ for id in attributes[:,0]:
cur.execute("SELECT GID FROM MULT_PER_GID WHERE MULTIMETER_ID = %s", (id,))
gids.append([i[0] for i in cur.fetchall()])
mult_info = []
- for i in range(len(mult_ids)):
- mult_info.append({"id": mult_ids[i][0],
- "attributes": attributes[i][0],
+ for i in range(len(attributes)):
+ mult_info.append({"id": attributes[i][0],
+ "attributes": attributes[i][1],
"gids": gids[i]})
--
GitLab