From a0f69c5375278cf71fb4964aa5d110fc249f262f Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Fri, 26 Jan 2024 11:49:32 +0100 Subject: [PATCH] Remove unused statements in job search function --- lib/galaxy/managers/jobs.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/galaxy/managers/jobs.py b/lib/galaxy/managers/jobs.py index 601979de8a8f..dc46534bb253 100644 --- a/lib/galaxy/managers/jobs.py +++ b/lib/galaxy/managers/jobs.py @@ -391,7 +391,6 @@ def replace_dataset_ids(path, key, value): ) for k, v in wildcard_param_dump.items(): - wildcard_value = None if v == {"__class__": "RuntimeValue"}: # TODO: verify this is always None. e.g. run with runtime input input v = None @@ -400,10 +399,8 @@ def replace_dataset_ids(path, key, value): continue elif k == "chromInfo" and "?.len" in v: continue - wildcard_value = '"%?.len"' - if not wildcard_value: - value_dump = json.dumps(v, sort_keys=True) - wildcard_value = value_dump.replace('"id": "__id_wildcard__"', '"id": %') + value_dump = json.dumps(v, sort_keys=True) + wildcard_value = value_dump.replace('"id": "__id_wildcard__"', '"id": %') a = aliased(JobParameter) if value_dump == wildcard_value: subq = subq.join(a).where( @@ -601,9 +598,6 @@ def replace_dataset_ids(path, key, value): continue elif k == "chromInfo" and "?.len" in v: continue - wildcard_value = '"%?.len"' - if not wildcard_value: - wildcard_value = json.dumps(v, sort_keys=True).replace('"id": "__id_wildcard__"', '"id": %') a = aliased(model.JobParameter) job_parameter_conditions.append( and_(model.Job.id == a.job_id, a.name == k, a.value == json.dumps(v, sort_keys=True))