diff --git a/core/class/ExportControler.php b/core/class/ExportControler.php
index 44a215c345ad2ed3eb8b22b3a2ce3dd3c62be3c0..aebc115c1f38f0330e87de7c6fd9a507178a1bff 100755
--- a/core/class/ExportControler.php
+++ b/core/class/ExportControler.php
@@ -360,7 +360,7 @@ class ExportFunctions
$db = new Database();
$collection = $this->collection;
- $query = 'SELECT t.tag_label FROM tags t LEFT JOIN tag_res tr ON t.tag_id = tr.tag_id WHERE t.coll_id = ? AND tr.res_id = ?';
+ $query = 'SELECT t.tag_label FROM tags t LEFT JOIN resources_tags tr ON t.tag_id = tr.tag_id WHERE t.coll_id = ? AND tr.res_id = ?';
$stmt = $db->query($query, array($collection, $res_id));
$arr_tags = [];
diff --git a/migration/20.03/2003-postScript.sql b/migration/20.03/2003-postScript.sql
index 95dcd618b8290e22a1d4b84a4e4c499922943be1..46d7a5ecaa2b4ac66cf3b71dd097e2890027a57e 100644
--- a/migration/20.03/2003-postScript.sql
+++ b/migration/20.03/2003-postScript.sql
@@ -85,6 +85,8 @@ DROP TABLE IF EXISTS thesaurus;
DROP TABLE IF EXISTS thesaurus_res;
DROP SEQUENCE IF EXISTS thesaurus_id_seq;
+SELECT setval('tags_id_seq', (SELECT max(id)+1 FROM tags), false);
+
ALTER TABLE res_letterbox DROP COLUMN IF EXISTS custom_t1;
ALTER TABLE res_letterbox DROP COLUMN IF EXISTS custom_t2;
ALTER TABLE res_letterbox DROP COLUMN IF EXISTS custom_t3;
diff --git a/migration/20.03/2003.sql b/migration/20.03/2003.sql
index f0caade2c2721e342bf4be5c80df19693423f8f7..7f34695c3f2e70f303ac2c86dbc8ec929546b135 100644
--- a/migration/20.03/2003.sql
+++ b/migration/20.03/2003.sql
@@ -254,8 +254,8 @@ SELECT setval('tags_id_seq', (SELECT MAX(id) from tags));
DROP TABLE IF EXISTS tags_entities;
DROP TABLE IF EXISTS resources_tags;
-ALTER TABLE tag_res RENAME TO resources_tags;
ALTER TABLE tag_res ADD COLUMN id serial NOT NULL;
+ALTER TABLE tag_res RENAME TO resources_tags;
/* DOCTYPES */
DO $$ BEGIN
@@ -626,13 +626,13 @@ FROM usergroups_services WHERE group_id IN (
WHERE service_id = 'admin_users'
);
INSERT INTO usergroups_services (group_id, service_id)
-SELECT distinct(group_id), 'admin_tags'
+SELECT distinct(group_id), 'admin_tag'
FROM usergroups_services WHERE group_id IN (
SELECT group_id FROM usergroups_services
WHERE service_id = 'admin_thesaurus'
) AND group_id NOT IN (
SELECT group_id FROM usergroups_services
- WHERE service_id = 'admin_tags'
+ WHERE service_id = 'admin_tag'
);
DELETE FROM usergroups_services WHERE service_id = 'admin_thesaurus';
diff --git a/modules/life_cycle/batch/extract_data.php b/modules/life_cycle/batch/extract_data.php
index 9cacf76d7af1a26a8d8aeb1fd758e1c7d35438da..544cb4d16a113e6cda1ea35164258fccc79f8655 100755
--- a/modules/life_cycle/batch/extract_data.php
+++ b/modules/life_cycle/batch/extract_data.php
@@ -148,7 +148,7 @@ try {
#### TAGS ####
$stmt2 = Bt_doQuery(
$GLOBALS['db'],
- "SELECT tags.label FROM tags, tag_res WHERE tags.id = tag_res.tag_id and tag_res.res_id = ?", array($selectedFile->res_id)
+ "SELECT tags.label FROM tags, resources_tags WHERE tags.id = resources_tags.tag_id and resources_tags.res_id = ?", array($selectedFile->res_id)
);
$labelTags = "";
diff --git a/modules/tags/class/TagControler_Abstract.php b/modules/tags/class/TagControler_Abstract.php
index 1f053f59a2009a13c43b82cb98b37ab793d3ed69..c3a164b345bca47cb7f0370a0cb9834846bb259c 100755
--- a/modules/tags/class/TagControler_Abstract.php
+++ b/modules/tags/class/TagControler_Abstract.php
@@ -249,9 +249,9 @@ abstract class tag_controler_Abstract extends ObjectControler
$db = new Database();
$stmt = $db->query(
- "SELECT tag_res.tag_id FROM tag_res"
- . " INNER JOIN tags ON tag_res.tag_id = tags.id"
- . " WHERE tag_res.res_id = ?",
+ "SELECT resources_tags.tag_id FROM resources_tags"
+ . " INNER JOIN tags ON resources_tags.tag_id = tags.id"
+ . " WHERE resources_tags.res_id = ?",
array($res_id)
);
//$db->show();
@@ -315,7 +315,7 @@ abstract class tag_controler_Abstract extends ObjectControler
$db = new Database();
$stmt = $db->query(
- "SELECT count(res_id) AS bump FROM tag_res"
+ "SELECT count(res_id) AS bump FROM resources_tags"
. " WHERE tag_id = ?"
. " AND res_id <> 0",
array($tag_id)
@@ -341,7 +341,7 @@ abstract class tag_controler_Abstract extends ObjectControler
$result = array();
$db = new Database();
$stmt = $db->query(
- "SELECT res_id FROM tag_res"
+ "SELECT res_id FROM resources_tags"
. " WHERE tag_id = ?",
array($tag_id)
);
@@ -408,7 +408,7 @@ abstract class tag_controler_Abstract extends ObjectControler
}
$stmt = $db->query(
- "DELETE FROM tag_res"
+ "DELETE FROM resources_tags"
. " WHERE res_id = ?"
. $where,
array($res_id)
@@ -435,7 +435,7 @@ abstract class tag_controler_Abstract extends ObjectControler
array($tag_id)
);
$stmt = $db->query(
- "DELETE FROM tag_res"
+ "DELETE FROM resources_tags"
. " WHERE tag_id = ?",
array($tag_id)
);
@@ -625,7 +625,7 @@ abstract class tag_controler_Abstract extends ObjectControler
$db = new Database();
$stmt = $db->query(
- "INSERT INTO tag_res"
+ "INSERT INTO resources_tags"
. " (tag_id, res_id)"
. " VALUES (?,?) ",
array($tag_id, $res_id)
diff --git a/sql/delete_all_ressources.sql b/sql/delete_all_ressources.sql
index 312dd7a812ba829a5561771ef7cd2f175181183e..f324a01073603f75078d5f566ba1c7a68d44147f 100755
--- a/sql/delete_all_ressources.sql
+++ b/sql/delete_all_ressources.sql
@@ -41,7 +41,7 @@ TRUNCATE TABLE lc_stack;
TRUNCATE TABLE tags;
ALTER SEQUENCE tags_id_seq restart WITH 1;
-TRUNCATE TABLE tag_res;
+TRUNCATE TABLE resources_tags;
TRUNCATE TABLE emails;