From 27a626cbaf3b8974f5aef82cd05e4fd6644f97e0 Mon Sep 17 00:00:00 2001 From: Nishchal-007 Date: Sat, 3 Jul 2021 19:42:24 +0530 Subject: [PATCH] Fixed Minor bug related to naming issue --- modules/cold-extraction/ColdDataRetriever.py | 20 ++++++++++---------- modules/frontend/server.py | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/cold-extraction/ColdDataRetriever.py b/modules/cold-extraction/ColdDataRetriever.py index 117e157..dacf926 100644 --- a/modules/cold-extraction/ColdDataRetriever.py +++ b/modules/cold-extraction/ColdDataRetriever.py @@ -21,17 +21,17 @@ def initialize_config_and_execute(valuesDict): global DCM4CHE_BIN, SRC_AET, QUERY_AET, DEST_AET, NIGHTLY_ONLY, START_HOUR, END_HOUR, IS_EXTRACTION_NOT_RUNNING, NIFFLER_ID, MAX_PROCESSES, SEPARATOR global accessions, patients, dates, niffler_log, resume, length - storage_folder = valuesDict['storage_folder'] - file_path = valuesDict['file_path'] + storage_folder = valuesDict['StorageFolder'] + file_path = valuesDict['FilePath'] csv_file = valuesDict['CsvFile'] - extraction_type = valuesDict['extraction_type'] - accession_index = int(valuesDict['accession_index']) - patient_index = int(valuesDict['patient_index']) - date_index = int(valuesDict['date_index']) - date_type = valuesDict['date_type'] - date_format = valuesDict['date_format'] - email = valuesDict['email'] - send_email = bool(valuesDict['send_email']) + extraction_type = valuesDict['ExtractionType'] + accession_index = int(valuesDict['AccessionIndex']) + patient_index = int(valuesDict['PatientIndex']) + date_index = int(valuesDict['DateIndex']) + date_type = valuesDict['DateType'] + date_format = valuesDict['DateFormat'] + email = valuesDict['YourEmail'] + send_email = bool(valuesDict['SendEmail']) system_json = valuesDict['NifflerSystem'] # Reads the system_json file. diff --git a/modules/frontend/server.py b/modules/frontend/server.py index bdf4d81..39a05f3 100644 --- a/modules/frontend/server.py +++ b/modules/frontend/server.py @@ -167,16 +167,16 @@ def cold_extraction(): if checkfile: cold_extraction_values['NifflerSystem'] = NifflerSystem_File - cold_extraction_values['storage_folder'] = request.form['StorageFolder'] - cold_extraction_values['file_path'] = file_path - cold_extraction_values['extraction_type'] = request.form['ExtractionType'] - cold_extraction_values['accession_index'] = accession_index - cold_extraction_values['patient_index'] = patient_index - cold_extraction_values['date_index'] = date_index - cold_extraction_values['date_type'] = request.form['DateType'] - cold_extraction_values['date_format'] = date_format - cold_extraction_values['send_email'] = request.form['sendEmail'] - cold_extraction_values['email'] = request.form['email'] + cold_extraction_values['StorageFolder'] = request.form['StorageFolder'] + cold_extraction_values['FilePath'] = file_path + cold_extraction_values['ExtractionType'] = request.form['ExtractionType'] + cold_extraction_values['AccessionIndex'] = accession_index + cold_extraction_values['PatientIndex'] = patient_index + cold_extraction_values['DateIndex'] = date_index + cold_extraction_values['DateType'] = request.form['DateType'] + cold_extraction_values['DateFormat'] = date_format + cold_extraction_values['SendEmail'] = request.form['sendEmail'] + cold_extraction_values['YourEmail'] = request.form['email'] import sys import io