48k.eu-mirror
/
ogserver
mirror of https://git.48k.eu/ogserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rest: allow creation of folder with same name in different nodes 

Check the parent node along with the folder name to identify if
the folder already exists.

Fix error when using a folder name defined in any other folder.
master
Alejandro Sirgo Rica 2024-11-21 17:07:28 +01:00
parent 0ea0394709
commit aebf2281bf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rest.c
View File

@ -2357,8 +2357,9 @@ static int add_room_folder(struct og_dbi *dbi, struct og_folder *folder)
const char *msglog; const char *msglog;
result = dbi_conn_queryf(dbi->conn, result = dbi_conn_queryf(dbi->conn,
"SELECT nombregrupo FROM grupos WHERE nombregrupo='%s'", "SELECT nombregrupo FROM grupos WHERE "
folder->name); "nombregrupo='%s' AND idcentro=%u",
folder->name, folder->center);
if (!result) { if (!result) {
dbi_conn_error(dbi->conn, &msglog); dbi_conn_error(dbi->conn, &msglog);
@ -2400,9 +2401,9 @@ static int add_computer_folder(struct og_dbi *dbi, struct og_folder *folder)
const char *msglog; const char *msglog;
result = dbi_conn_queryf(dbi->conn, result = dbi_conn_queryf(dbi->conn,
"SELECT nombregrupoordenador FROM gruposordenadores WHERE nombregrupoordenador='%s'", "SELECT nombregrupoordenador FROM gruposordenadores WHERE "
folder->name); "nombregrupoordenador='%s' AND idaula=%u",
folder->name, folder->room);
if (!result) { if (!result) {
dbi_conn_error(dbi->conn, &msglog); dbi_conn_error(dbi->conn, &msglog);
syslog(LOG_ERR, "failed to query database (%s:%d) %s\n", syslog(LOG_ERR, "failed to query database (%s:%d) %s\n",