From 216836e5ba2f53dcfdcffeedcda7013825ec2486 Mon Sep 17 00:00:00 2001
From: erichard <elliot.richard@lal.in2p3.fr>
Date: Mon, 3 Aug 2020 09:54:52 +0200
Subject: [PATCH] customable labelstower : replace selected attributs by select
all attributs from element table.
I refactor the first sql statement to let the developper define is element structure.
The only mandatory attribut for element table will be id. The rest is up to the developper.
---
labelstower/getter.py | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/labelstower/getter.py b/labelstower/getter.py
index 721402c..64ef0a7 100644
--- a/labelstower/getter.py
+++ b/labelstower/getter.py
@@ -26,16 +26,12 @@ def get_selected_elements(id_mandatory_labels: int, id_forbiden_labels: str, num
if(number_of_mandatory_labels):
query = '''
SELECT
- ELEMENT.id
- , element_name
+ ELEMENT.*
FROM
ELEMENT
INNER JOIN
ELEMENT_LABEL
ON ELEMENT.id=ELEMENT_LABEL.id_element
- INNER JOIN
- LABEL
- ON ELEMENT_LABEL.id_label=LABEL.id
WHERE
id_label IN ({})
AND
@@ -46,10 +42,7 @@ def get_selected_elements(id_mandatory_labels: int, id_forbiden_labels: str, num
ELEMENT
INNER JOIN
ELEMENT_LABEL
- ON ELEMENT.id=ELEMENT_LABEL.id_element
- INNER JOIN
- LABEL
- ON ELEMENT_LABEL.id_label=LABEL.id
+ ON ELEMENT.id=ELEMENT_LABEL.id_element
WHERE
id_label IN ({}))
GROUP BY id_element
--
GitLab