Adding json functions

softwares/server/server.py

@@ -3,7 +3,7 @@ import socket
 import json
 import os
 import sys
-# import database as db
+import database.database as db
 sys.path.append(os.path.realpath('../softwares/'))
 
 
@@ -71,9 +71,8 @@ def json_to_dict(js):
 # Function takes a dictionnary for input
 # Function return a Dict containing tool parameters and default parameters
 def db_req(tool: dict):
-    # tool_dict = db.getParameters(tool)
-    # return tool_dict
-    pass
+    tool_dict = db.getParameters(tool)
+    return tool_dict
 
 
 def match_query_dict(biblio: dict, data: dict):
@@ -95,9 +94,8 @@ def match_generator_dict(biblio: dict, Genereator: list):
 
 
 def verif_param(data: dict):
-    # Tuple
     tool = data.keys().strip('[]')
-    # s = db.getParameters(data['tool'])
+    s = db.getParameters(data['tool'])
     parameter = {}
     query = {}
     if s is not None:
@@ -124,3 +122,6 @@ if __name__ == '__main__':
     s = {'Regal': {'size': 'qsd', 'asize': '', 'outputf': 'qsd', 'number': 'ss', 'comp': 'qsd', 'min': 'sqsd', 'con': 'qsd'}}
     #  print(s.get('Regal'))
     print(s.keys())
+    data_test1 = '{"parameters":"request"}'
+    data_load = json.loads(data_test1)
+    print(query_valid(data_load) is True)