diff --git a/dataproc/api/__pycache__/urls.cpython-38.pyc b/dataproc/api/__pycache__/urls.cpython-38.pyc
index 901554db35a3c392a06b0c8ff822cb751643cfbd..e013097f3d3a297e1f95cf313e2b77c9fc485d5e 100644
Binary files a/dataproc/api/__pycache__/urls.cpython-38.pyc and b/dataproc/api/__pycache__/urls.cpython-38.pyc differ
diff --git a/dataproc/api/urls.py b/dataproc/api/urls.py
index 791a9516af0b2d0df8450e6f04145874e819d5b8..e4ddb685ae89b2d4b6ba16c8c31fa9daa90092aa 100644
--- a/dataproc/api/urls.py
+++ b/dataproc/api/urls.py
@@ -36,11 +36,18 @@ from api.views.user_view import *
from api.views.relationships_view import *
from api.views.input_view import *
from api.views.proc_input_view import *
+from api.views.autoproc_input_view import *
urlpatterns = [
- path('storeInput', storeInput, name="store_input"),
- path('storeProcInput', storeProcInput, name="store_proc_input"),
+ # path('storeInput', storeInput, name="store_input"),
+ # path('storeProcInput', storeProcInput, name="store_proc_input"),
+ # path('storeautoProcInput', storeautoProcInput, name="store_autoprocinput"),
+
+
+ path('storeInput', storeInput),
+ path('storeProcInput', storeProcInput),
+ path('storeautoProcInput', storeautoProcInput),
# # autoPROC urlpatterns
# path('indexautoPROC', indexautoPROC),
diff --git a/dataproc/api/views/__pycache__/proc_input_view.cpython-38.pyc b/dataproc/api/views/__pycache__/proc_input_view.cpython-38.pyc
index e7c5a9230487bd57d5ff909e480b15aee814ba8d..f0310ac9abb23610193ea243dd5360c4f07793a9 100644
Binary files a/dataproc/api/views/__pycache__/proc_input_view.cpython-38.pyc and b/dataproc/api/views/__pycache__/proc_input_view.cpython-38.pyc differ
diff --git a/dataproc/api/views/draft.py b/dataproc/api/views/draft.py
index 609c47648b33b0b225cdf56ed44ccc7a1afe7e05..b030244296afbe762bc0208563dbc37f140798b4 100644
--- a/dataproc/api/views/draft.py
+++ b/dataproc/api/views/draft.py
@@ -125,4 +125,47 @@
# if input_prc['WatersPresent']==None:
# wp=None
# else:
- # wp=input_prc['WatersPresent']
\ No newline at end of file
+ # wp=input_prc['WatersPresent']
+
+####################################
+####################################
+####################################
+
+# @csrf_exempt
+# def create_or_update_test(node_name, unique_properties_dict, all_properties_dict):
+# logger.info("ACTIVATE FUNCTION")
+
+# keyvaluepair=""
+
+# for keys in unique_properties_dict:
+# logger.info(keys)
+# logger.info(unique_properties_dict[keys])
+
+# keyvaluepair = keyvaluepair + keys + '=' + '\'' + unique_properties_dict[keys] + '\'' + ','
+
+# keyvaluepair=keyvaluepair[:-1]
+# logger.info(keyvaluepair)
+# # exist=Report.nodes.get(jobid="6e83d158-fd27-494a-aa45-90f0fad00432")
+# # logger.info("LOG REPOORT TYPE")
+# # logger.info(type(exist))
+# # test=exist.serialize
+# # logger(test)
+# key='jobid'
+# # val='6e83d158-fd27-494a-aa45-90f0fad00432'
+# all_nodes=Report.nodes
+# logger.info("PRINT ALL NODE")
+# logger.info(type(all_nodes))
+
+# for node in all_nodes:
+# logger.info("PRINT NODE")
+# logger.info(node)
+# # node = node.serialize
+# logger.info("PRINT NODE")
+# logger.info(type(node))
+# logger.info(node.key)
+# if (node[key] == val):
+# exist = node
+# break
+# logger.info("PRINT VALUES")
+# logger.info(keyvaluepair)
+# logger.info(exist)
\ No newline at end of file
diff --git a/dataproc/api/views/proc_input_view.py b/dataproc/api/views/proc_input_view.py
index 5bd7b3bdeeb5992182ecc1022c9a4e315cae3d6e..b9026959e38687f3d2ab0407c9610ec6185d69f0 100644
--- a/dataproc/api/views/proc_input_view.py
+++ b/dataproc/api/views/proc_input_view.py
@@ -46,9 +46,10 @@ def storeProcInput(request):
# json_data_mtz=json_data['dataprocessing']
try:
- create_or_update_test(node_name=Report, unique_properties_dict={"jobid" : "6e83d158-fd27-494a-aa45-90f0fad00432",
- "terminationstatus" : "COMPLETED"}, all_properties_dict=None)
- # report=storeParseReport(json_data_report)
+ # create_or_update_test(node_name=Report, unique_properties_dict={"jobid" : "6e83d158-fd27-494a-aa45-90f0fad00432",
+ # "terminationstatus" : "COMPLETED"}, all_properties_dict=None)
+
+ report=storeParseReport(json_data_report)
# ligand=storeParseLigand(json_data_ligand, report)
# storeParseRC(json_data_rc, report)
# storeParsePRC(json_data_prc, ligand)
@@ -62,47 +63,6 @@ def storeProcInput(request):
except :
return JsonResponse({"STATUS":"ERROR OCCURRED"}, safe=False)
-# @csrf_exempt
-# def create_or_update_test(node_name, unique_properties_dict, all_properties_dict):
-# logger.info("ACTIVATE FUNCTION")
-
-# keyvaluepair=""
-
-# for keys in unique_properties_dict:
-# logger.info(keys)
-# logger.info(unique_properties_dict[keys])
-
-# keyvaluepair = keyvaluepair + keys + '=' + '\'' + unique_properties_dict[keys] + '\'' + ','
-
-# keyvaluepair=keyvaluepair[:-1]
-# logger.info(keyvaluepair)
-# # exist=Report.nodes.get(jobid="6e83d158-fd27-494a-aa45-90f0fad00432")
-# # logger.info("LOG REPOORT TYPE")
-# # logger.info(type(exist))
-# # test=exist.serialize
-# # logger(test)
-# key='jobid'
-# # val='6e83d158-fd27-494a-aa45-90f0fad00432'
-# all_nodes=Report.nodes
-# logger.info("PRINT ALL NODE")
-# logger.info(type(all_nodes))
-
-# for node in all_nodes:
-# logger.info("PRINT NODE")
-# logger.info(node)
-# # node = node.serialize
-# logger.info("PRINT NODE")
-# logger.info(type(node))
-# logger.info(node.key)
-# if (node[key] == val):
-# exist = node
-# break
-# logger.info("PRINT VALUES")
-# logger.info(keyvaluepair)
-# logger.info(exist)
-
-
-
@csrf_exempt
def storeParseReport(data):
diff --git a/dataproc/dataproc/__pycache__/settings.cpython-38.pyc b/dataproc/dataproc/__pycache__/settings.cpython-38.pyc
index 3db7b2d06d8c9319ee3453aed558abfdcce0cdb8..c0255b7f42cd1d207682340f1eccc6785bccf513 100644
Binary files a/dataproc/dataproc/__pycache__/settings.cpython-38.pyc and b/dataproc/dataproc/__pycache__/settings.cpython-38.pyc differ
diff --git a/dataproc/dataproc/settings.py b/dataproc/dataproc/settings.py
index c44118b5605ec687ed8b4f4de176485a36b4c3c3..7fe27a6cbc51d1aa75f6d3ae00d70a55d160596c 100644
--- a/dataproc/dataproc/settings.py
+++ b/dataproc/dataproc/settings.py
@@ -22,7 +22,8 @@ SECRET_KEY = '!g%m-6&hdwfjxafjn61vvrhf1f8q3-d$5@0if_^#_a&en@^lsp'
# DEBUG = True
DEBUG = int(os.environ.get('DEBUG', default=1))
-ALLOWED_HOSTS = ['0.0.0.0']
+# ALLOWED_HOSTS = ['0.0.0.0']
+ALLOWED_HOSTS = []
# Application definition
INSTALLED_APPS = [
@@ -82,8 +83,8 @@ DATABASES = {
}
# Neo4j database settings
-# NEOMODEL_NEO4J_BOLT_URL = os.environ.get('NEO4J_BOLT_URL','bolt://neo4j:neo4@localhost:7687')
-NEOMODEL_NEO4J_BOLT_URL = os.environ.get('NEO4J_BOLT_URL','bolt://neo4j:neo4@docker_neo4j_1:7687')
+NEOMODEL_NEO4J_BOLT_URL = os.environ.get('NEO4J_BOLT_URL','bolt://neo4j:neo4@localhost:7687')
+# NEOMODEL_NEO4J_BOLT_URL = os.environ.get('NEO4J_BOLT_URL','bolt://neo4j:neo4@docker_neo4j_1:7687')
# Password validation. See https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [