From 47f1f393da6a71d2386114943ce78239d0c3e62d Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Wed, 13 Mar 2024 17:55:50 +0100 Subject: [PATCH] Added parameters --- server/Flask/main.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/server/Flask/main.py b/server/Flask/main.py index a19a087..d2951f0 100644 --- a/server/Flask/main.py +++ b/server/Flask/main.py @@ -5,14 +5,11 @@ app = Flask(__name__) @app.route('/') def index(): -# return getData() - nodeNumber = request.args.get('nodenumber', default = None) - nodeList = request.args.get('nodeList', default = None) -# return nodeNumber - return nodeList + node = request.args.get('node', default = None) + dataType = request.args.get('dataType', default = None) + return getData(node, dataType) - -def getData(): +def getData(node, dataType): try: mydb = mysql.connector.connect( host="localhost", @@ -20,9 +17,14 @@ def getData(): password="Dingleberries69!", database="NodeData" ) - +#turn this into a switch statement cursor = mydb.cursor() - query = "SELECT * FROM `Measurement`" + if node: + query = f"SELECT * FROM Measurement WHERE NodeID = {node}" + elif dataType: + query = f"SELECT * FROM Measurement WHERE Type = '{dataType}'" + else: + query = "SELECT * FROM `Measurement`" cursor.execute(query) result = cursor.fetchall() # Fetch the results