From 0f35814188ff798747fc742bd20d404689e89a6e Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Thu, 26 Sep 2024 22:50:13 +0100 Subject: [PATCH] clean up the code --- .../api/v1/resources/resource_analyser.py | 3 --- omero_search_engine/api/v1/resources/utils.py | 2 -- omero_search_engine/validation/results_validator.py | 10 ++-------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/omero_search_engine/api/v1/resources/resource_analyser.py b/omero_search_engine/api/v1/resources/resource_analyser.py index 5d8691b..3a681d0 100644 --- a/omero_search_engine/api/v1/resources/resource_analyser.py +++ b/omero_search_engine/api/v1/resources/resource_analyser.py @@ -901,9 +901,6 @@ def get_resource_names(resource, name=None, description=False, data_source=None) return build_error_message( "This release does not support search by description." ) - - print ("data source: ", data_source) - if resource != "all": returned_results = get_the_results(resource, name, description, data_source) else: diff --git a/omero_search_engine/api/v1/resources/utils.py b/omero_search_engine/api/v1/resources/utils.py index 53abd16..b11468f 100644 --- a/omero_search_engine/api/v1/resources/utils.py +++ b/omero_search_engine/api/v1/resources/utils.py @@ -1010,7 +1010,6 @@ def search_index_using_search_after( e_index, query, bookmark_, pagination_dict, return_containers, data_source=None, ret_type=None ) -> object: #toz ya - print ("========================>>>>>>%s"%data_source) returned_results = [] if bookmark_ and not pagination_dict: add_paination = False @@ -1190,7 +1189,6 @@ def search_resource_annotation( query["aggs"] = json.loads( count_attr_template.substitute(field="project_name.keyvalue") ) - print("===>>>>>>",data_source) query["_source"] = {"includes": [""]} res = search_index_using_search_after( res_index, diff --git a/omero_search_engine/validation/results_validator.py b/omero_search_engine/validation/results_validator.py index 4b75fd5..d0513f9 100644 --- a/omero_search_engine/validation/results_validator.py +++ b/omero_search_engine/validation/results_validator.py @@ -294,14 +294,11 @@ def get_results_searchengine(self, operator=None): """ if self.type == "buckets": if self.name: - print ("11111111111111111111111111") res = get_key_values_return_contents( self.name, "image", data_source=self.data_source, csv=False ) self.searchengine_results = json.loads(res.data) elif self.value: - print("2222222222222222222222222222222") - self.searchengine_results = search_value_for_resource( "image", self.value, self.data_source ) @@ -800,8 +797,8 @@ def test_no_images(data_source): headers = lines[0] headers = headers.split("\t") - for i in range(len(headers) - 1): - print(i, headers[i]) + #for i in range(len(headers) - 1): + # print(i, headers[i]) names = {} for line in lines: if lines.index(line) == 0: @@ -1018,10 +1015,8 @@ def check_number_images_sql_containers_using_ids(data_source): test_array.append(res.get("id")) for ress in results: if ress["id"] not in test_array: - print("================>>>>") print(ress["id"]) search_omero_app.logger.info("ERROR: Not equal results") - print("=====================") print (sql, query_data) print ("searchengine_results:",searchengine_results) print ("postgres_results: ",postgres_results) @@ -1059,7 +1054,6 @@ def get_no_images_sql_containers(data_source, write_report=True): for data_source_ in search_omero_app.config.database_connectors.keys(): if data_source_.lower()!=data_source.lower(): continue - print (data_source) conn = search_omero_app.config.database_connectors[data_source] all_names = get_resource_names("all",data_source=json.dumps(data_source))