diff --git a/sql/swad.sql b/sql/swad.sql index 10837de75..70bda939c 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -173,9 +173,9 @@ CREATE TABLE IF NOT EXISTS brw_last ( LastClick DATETIME NOT NULL, UNIQUE INDEX(UsrCod,FileBrowser,Cod)); -- --- Table file_browser_size: stores the sizes of the file zones +-- Table brw_sizes: stores the sizes of the file zones -- -CREATE TABLE IF NOT EXISTS file_browser_size ( +CREATE TABLE IF NOT EXISTS brw_sizes ( FileBrowser TINYINT NOT NULL, Cod INT NOT NULL DEFAULT -1, ZoneUsrCod INT NOT NULL DEFAULT -1, diff --git a/swad_changelog.h b/swad_changelog.h index d05f5fed7..4814e14b5 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -600,13 +600,17 @@ TODO: Salvador Romero Cort TODO: FIX BUG, URGENT! En las fechas como parámetro Dat_WriteParamsIniEndDates(), por ejemplo al cambiar el color de la gráfica de accesos por día y hora, no se respeta la zona horaria. */ -#define Log_PLATFORM_VERSION "SWAD 20.51.4 (2021-03-18)" +#define Log_PLATFORM_VERSION "SWAD 20.51.5 (2021-03-18)" #define CSS_FILE "swad20.45.css" #define JS_FILE "swad20.6.2.js" /* TODO: Rename CENTRE to CENTER in help wiki. TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams + Version 20.51.5: Mar 18, 2021 File-browser-size database table renamed. (307563 lines) + 1 change necessary in database: +RENAME TABLE file_browser_size TO brw_sizes; + Version 20.51.4: Mar 18, 2021 File-browser-last database table renamed. (307563 lines) 1 change necessary in database: RENAME TABLE file_browser_last TO brw_last; diff --git a/swad_database.c b/swad_database.c index 8c479f3e2..ac2707edc 100644 --- a/swad_database.c +++ b/swad_database.c @@ -455,9 +455,9 @@ mysql> DESCRIBE brw_last; "LastClick DATETIME NOT NULL," "UNIQUE INDEX(UsrCod,FileBrowser,Cod))"); - /***** Table file_browser_size *****/ + /***** Table brw_sizes *****/ /* -mysql> DESCRIBE file_browser_size; +mysql> DESCRIBE brw_sizes; +-------------+------------+------+-----+---------+-------+ | Field | Type | Null | Key | Default | Extra | +-------------+------------+------+-----+---------+-------+ @@ -471,7 +471,7 @@ mysql> DESCRIBE file_browser_size; +-------------+------------+------+-----+---------+-------+ 7 rows in set (0.00 sec) */ - DB_CreateTable ("CREATE TABLE IF NOT EXISTS file_browser_size (" + DB_CreateTable ("CREATE TABLE IF NOT EXISTS brw_sizes (" "FileBrowser TINYINT NOT NULL," "Cod INT NOT NULL DEFAULT -1," "ZoneUsrCod INT NOT NULL DEFAULT -1," diff --git a/swad_figure.c b/swad_figure.c index d1d98cba8..c694f2a9d 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -1685,14 +1685,14 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, { case Brw_UNKNOWN: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT CrsCod)," - "COUNT(DISTINCT GrpCod)-1," - "-1," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM " + "SELECT COUNT(DISTINCT CrsCod)," // row[0] + "COUNT(DISTINCT GrpCod)-1," // row[1] + "-1," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM " "(" "SELECT Cod AS CrsCod," "-1 AS GrpCod," @@ -1700,21 +1700,21 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, "NumFolders," "NumFiles," "TotalSize" - " FROM file_browser_size" + " FROM brw_sizes" " WHERE FileBrowser IN (%u,%u,%u,%u,%u,%u)" " UNION " "SELECT crs_grp_types.CrsCod," - "file_browser_size.Cod AS GrpCod," - "file_browser_size.NumLevels," - "file_browser_size.NumFolders," - "file_browser_size.NumFiles," - "file_browser_size.TotalSize" - " FROM crs_grp_types," - "crs_grp," - "file_browser_size" + "brw_sizes.Cod AS GrpCod," + "brw_sizes.NumLevels," + "brw_sizes.NumFolders," + "brw_sizes.NumFiles," + "brw_sizes.TotalSize" + " FROM crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser IN (%u,%u,%u,%u)" ") AS sizes", (unsigned) Brw_ADMI_DOC_CRS, (unsigned) Brw_ADMI_TCH_CRS, @@ -1732,14 +1732,14 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, case Brw_ADMI_SHR_CRS: case Brw_ADMI_MRK_CRS: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT Cod)," - "-1," - "-1," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM file_browser_size" + "SELECT COUNT(DISTINCT Cod)," // row[0] + "-1," // row[1] + "-1," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM brw_sizes" " WHERE FileBrowser=%u", (unsigned) FileBrowser); break; @@ -1748,45 +1748,45 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, case Brw_ADMI_SHR_GRP: case Brw_ADMI_MRK_GRP: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," - "COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM crs_grp_types," - "crs_grp," - "file_browser_size" + "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," // row[0] + "COUNT(DISTINCT brw_sizes.Cod)," // row[1] + "-1," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", (unsigned) FileBrowser); break; case Brw_ADMI_ASG_USR: case Brw_ADMI_WRK_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT Cod)," - "-1," - "COUNT(DISTINCT ZoneUsrCod)," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM file_browser_size" + "SELECT COUNT(DISTINCT Cod)," // row[0] + "-1," // row[1] + "COUNT(DISTINCT ZoneUsrCod)," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM brw_sizes" " WHERE FileBrowser=%u", (unsigned) FileBrowser); break; case Brw_ADMI_BRF_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT -1," - "-1," - "COUNT(DISTINCT ZoneUsrCod)," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM file_browser_size" + "SELECT -1," // row[0] + "-1," // row[1] + "COUNT(DISTINCT ZoneUsrCod)," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM brw_sizes" " WHERE FileBrowser=%u", (unsigned) FileBrowser); break; @@ -1801,54 +1801,54 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, { case Brw_UNKNOWN: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT CrsCod)," - "COUNT(DISTINCT GrpCod)-1," - "-1," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM " + "SELECT COUNT(DISTINCT CrsCod)," // row[0] + "COUNT(DISTINCT GrpCod)-1," // row[1] + "-1," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM " "(" - "SELECT file_browser_size.Cod AS CrsCod," - "-1 AS GrpCod," // Course zones - "file_browser_size.NumLevels," - "file_browser_size.NumFolders," - "file_browser_size.NumFiles," - "file_browser_size.TotalSize" - " FROM ins_instits," - "ctr_centers," - "deg_degrees," - "crs_courses," - "file_browser_size" + "SELECT brw_sizes.Cod AS CrsCod," + "-1 AS GrpCod," // Course zones + "brw_sizes.NumLevels," + "brw_sizes.NumFolders," + "brw_sizes.NumFiles," + "brw_sizes.TotalSize" + " FROM ins_instits," + "ctr_centers," + "deg_degrees," + "crs_courses," + "brw_sizes" " WHERE ins_instits.CtyCod=%ld" - " AND ins_instits.InsCod=ctr_centers.InsCod" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser IN (%u,%u,%u,%u,%u,%u)" + " AND ins_instits.InsCod=ctr_centers.InsCod" + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser IN (%u,%u,%u,%u,%u,%u)" " UNION " "SELECT crs_grp_types.CrsCod," - "file_browser_size.Cod AS GrpCod," // Group zones - "file_browser_size.NumLevels," - "file_browser_size.NumFolders," - "file_browser_size.NumFiles," - "file_browser_size.TotalSize" - " FROM ins_instits," - "ctr_centers," - "deg_degrees," - "crs_courses," - "crs_grp_types," - "crs_grp," - "file_browser_size" + "brw_sizes.Cod AS GrpCod," // Group zones + "brw_sizes.NumLevels," + "brw_sizes.NumFolders," + "brw_sizes.NumFiles," + "brw_sizes.TotalSize" + " FROM ins_instits," + "ctr_centers," + "deg_degrees," + "crs_courses," + "crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE ins_instits.CtyCod=%ld" - " AND ins_instits.InsCod=ctr_centers.InsCod" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=crs_grp_types.CrsCod" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)" + " AND ins_instits.InsCod=ctr_centers.InsCod" + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=crs_grp_types.CrsCod" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser IN (%u,%u,%u,%u)" ") AS sizes", Gbl.Hierarchy.Cty.CtyCod, (unsigned) Brw_ADMI_DOC_CRS, @@ -1868,101 +1868,105 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, case Brw_ADMI_SHR_CRS: case Brw_ADMI_MRK_CRS: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "-1," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM ins_instits," - "ctr_centers," - "deg_degrees," - "crs_courses," - "file_browser_size" + "SELECT COUNT(DISTINCT brw_sizes.Cod)," // row[0] + "-1," // row[1] + "-1," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM ins_instits," + "ctr_centers," + "deg_degrees," + "crs_courses," + "brw_sizes" " WHERE ins_instits.CtyCod=%ld" - " AND ins_instits.InsCod=ctr_centers.InsCod" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " and file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Cty.CtyCod,(unsigned) FileBrowser); + " AND ins_instits.InsCod=ctr_centers.InsCod" + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Cty.CtyCod, + (unsigned) FileBrowser); break; case Brw_ADMI_DOC_GRP: case Brw_ADMI_TCH_GRP: case Brw_ADMI_SHR_GRP: case Brw_ADMI_MRK_GRP: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," - "COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM ins_instits," - "ctr_centers," - "deg_degrees," - "crs_courses," - "crs_grp_types," - "crs_grp," - "file_browser_size" + "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," // row[0] + "COUNT(DISTINCT brw_sizes.Cod)," // row[1] + "-1," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM ins_instits," + "ctr_centers," + "deg_degrees," + "crs_courses," + "crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE ins_instits.CtyCod=%ld" - " AND ins_instits.InsCod=ctr_centers.InsCod" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=crs_grp_types.CrsCod" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Cty.CtyCod,(unsigned) FileBrowser); + " AND ins_instits.InsCod=ctr_centers.InsCod" + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=crs_grp_types.CrsCod" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Cty.CtyCod, + (unsigned) FileBrowser); break; case Brw_ADMI_ASG_USR: case Brw_ADMI_WRK_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "COUNT(DISTINCT file_browser_size.ZoneUsrCod)," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM ins_instits," - "ctr_centers," - "deg_degrees," - "crs_courses," - "file_browser_size" + "SELECT COUNT(DISTINCT brw_sizes.Cod)," // row[0] + "-1," // row[1] + "COUNT(DISTINCT brw_sizes.ZoneUsrCod)," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM ins_instits," + "ctr_centers," + "deg_degrees," + "crs_courses," + "brw_sizes" " WHERE ins_instits.CtyCod=%ld" - " AND ins_instits.InsCod=ctr_centers.InsCod" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Cty.CtyCod,(unsigned) FileBrowser); + " AND ins_instits.InsCod=ctr_centers.InsCod" + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Cty.CtyCod, + (unsigned) FileBrowser); break; case Brw_ADMI_BRF_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT -1," - "-1," - "COUNT(DISTINCT file_browser_size.ZoneUsrCod)," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM ins_instits," - "ctr_centers," - "deg_degrees," - "crs_courses," - "crs_usr," - "file_browser_size" + "SELECT -1," // row[0] + "-1," // row[1] + "COUNT(DISTINCT brw_sizes.ZoneUsrCod)," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM ins_instits," + "ctr_centers," + "deg_degrees," + "crs_courses," + "crs_usr," + "brw_sizes" " WHERE ins_instits.CtyCod=%ld" - " AND ins_instits.InsCod=ctr_centers.InsCod" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=crs_usr.CrsCod" - " AND crs_usr.UsrCod=file_browser_size.ZoneUsrCod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Cty.CtyCod,(unsigned) FileBrowser); + " AND ins_instits.InsCod=ctr_centers.InsCod" + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=crs_usr.CrsCod" + " AND crs_usr.UsrCod=brw_sizes.ZoneUsrCod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Cty.CtyCod, + (unsigned) FileBrowser); break; default: Lay_ShowErrorAndExit ("Wrong file browser."); @@ -1975,50 +1979,50 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, { case Brw_UNKNOWN: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT CrsCod)," - "COUNT(DISTINCT GrpCod)-1," - "-1," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM " + "SELECT COUNT(DISTINCT CrsCod)," // row[0] + "COUNT(DISTINCT GrpCod)-1," // row[1] + "-1," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM " "(" - "SELECT file_browser_size.Cod AS CrsCod," - "-1 AS GrpCod," // Course zones - "file_browser_size.NumLevels," - "file_browser_size.NumFolders," - "file_browser_size.NumFiles," - "file_browser_size.TotalSize" - " FROM ctr_centers," - "deg_degrees," - "crs_courses," - "file_browser_size" + "SELECT brw_sizes.Cod AS CrsCod," + "-1 AS GrpCod," // Course zones + "brw_sizes.NumLevels," + "brw_sizes.NumFolders," + "brw_sizes.NumFiles," + "brw_sizes.TotalSize" + " FROM ctr_centers," + "deg_degrees," + "crs_courses," + "brw_sizes" " WHERE ctr_centers.InsCod=%ld" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser IN (%u,%u,%u,%u,%u,%u)" + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser IN (%u,%u,%u,%u,%u,%u)" " UNION " "SELECT crs_grp_types.CrsCod," - "file_browser_size.Cod AS GrpCod," // Group zones - "file_browser_size.NumLevels," - "file_browser_size.NumFolders," - "file_browser_size.NumFiles," - "file_browser_size.TotalSize" - " FROM ctr_centers," - "deg_degrees," - "crs_courses," - "crs_grp_types," - "crs_grp," - "file_browser_size" + "brw_sizes.Cod AS GrpCod," // Group zones + "brw_sizes.NumLevels," + "brw_sizes.NumFolders," + "brw_sizes.NumFiles," + "brw_sizes.TotalSize" + " FROM ctr_centers," + "deg_degrees," + "crs_courses," + "crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE ctr_centers.InsCod=%ld" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=crs_grp_types.CrsCod" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)" + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=crs_grp_types.CrsCod" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser IN (%u,%u,%u,%u)" ") AS sizes", Gbl.Hierarchy.Ins.InsCod, (unsigned) Brw_ADMI_DOC_CRS, @@ -2038,93 +2042,97 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, case Brw_ADMI_SHR_CRS: case Brw_ADMI_MRK_CRS: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "-1," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM ctr_centers," - "deg_degrees," - "crs_courses," - "file_browser_size" + "SELECT COUNT(DISTINCT brw_sizes.Cod)," // row[0] + "-1," // row[1] + "-1," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM ctr_centers," + "deg_degrees," + "crs_courses," + "brw_sizes" " WHERE ctr_centers.InsCod=%ld" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " and file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Ins.InsCod,(unsigned) FileBrowser); + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Ins.InsCod, + (unsigned) FileBrowser); break; case Brw_ADMI_DOC_GRP: case Brw_ADMI_TCH_GRP: case Brw_ADMI_SHR_GRP: case Brw_ADMI_MRK_GRP: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," - "COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM ctr_centers," - "deg_degrees," - "crs_courses," - "crs_grp_types," - "crs_grp," - "file_browser_size" + "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," // row[0] + "COUNT(DISTINCT brw_sizes.Cod)," // row[1] + "-1," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM ctr_centers," + "deg_degrees," + "crs_courses," + "crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE ctr_centers.InsCod=%ld" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=crs_grp_types.CrsCod" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Ins.InsCod,(unsigned) FileBrowser); + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=crs_grp_types.CrsCod" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Ins.InsCod, + (unsigned) FileBrowser); break; case Brw_ADMI_ASG_USR: case Brw_ADMI_WRK_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "COUNT(DISTINCT file_browser_size.ZoneUsrCod)," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM ctr_centers," - "deg_degrees," - "crs_courses," - "file_browser_size" + "SELECT COUNT(DISTINCT brw_sizes.Cod)," // row[0] + "-1," // row[1] + "COUNT(DISTINCT brw_sizes.ZoneUsrCod)," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM ctr_centers," + "deg_degrees," + "crs_courses," + "brw_sizes" " WHERE ctr_centers.InsCod=%ld" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Ins.InsCod,(unsigned) FileBrowser); + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Ins.InsCod, + (unsigned) FileBrowser); break; case Brw_ADMI_BRF_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT -1," - "-1," - "COUNT(DISTINCT file_browser_size.ZoneUsrCod)," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM ctr_centers," - "deg_degrees," - "crs_courses," - "crs_usr," - "file_browser_size" + "SELECT -1," // row[0] + "-1," // row[1] + "COUNT(DISTINCT brw_sizes.ZoneUsrCod)," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM ctr_centers," + "deg_degrees," + "crs_courses," + "crs_usr," + "brw_sizes" " WHERE ctr_centers.InsCod=%ld" - " AND ctr_centers.CtrCod=deg_degrees.CtrCod" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=crs_usr.CrsCod" - " AND crs_usr.UsrCod=file_browser_size.ZoneUsrCod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Ins.InsCod,(unsigned) FileBrowser); + " AND ctr_centers.CtrCod=deg_degrees.CtrCod" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=crs_usr.CrsCod" + " AND crs_usr.UsrCod=brw_sizes.ZoneUsrCod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Ins.InsCod, + (unsigned) FileBrowser); break; default: Lay_ShowErrorAndExit ("Wrong file browser."); @@ -2137,46 +2145,46 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, { case Brw_UNKNOWN: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT CrsCod)," - "COUNT(DISTINCT GrpCod)-1," - "-1," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM " + "SELECT COUNT(DISTINCT CrsCod)," // row[0] + "COUNT(DISTINCT GrpCod)-1," // row[1] + "-1," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM " "(" - "SELECT file_browser_size.Cod AS CrsCod," - "-1 AS GrpCod," // Course zones - "file_browser_size.NumLevels," - "file_browser_size.NumFolders," - "file_browser_size.NumFiles," - "file_browser_size.TotalSize" - " FROM deg_degrees," - "crs_courses," - "file_browser_size" + "SELECT brw_sizes.Cod AS CrsCod," + "-1 AS GrpCod," // Course zones + "brw_sizes.NumLevels," + "brw_sizes.NumFolders," + "brw_sizes.NumFiles," + "brw_sizes.TotalSize" + " FROM deg_degrees," + "crs_courses," + "brw_sizes" " WHERE deg_degrees.CtrCod=%ld" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser IN (%u,%u,%u,%u,%u,%u)" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser IN (%u,%u,%u,%u,%u,%u)" " UNION " "SELECT crs_grp_types.CrsCod," - "file_browser_size.Cod AS GrpCod," // Group zones - "file_browser_size.NumLevels," - "file_browser_size.NumFolders," - "file_browser_size.NumFiles," - "file_browser_size.TotalSize" - " FROM deg_degrees," - "crs_courses," - "crs_grp_types," - "crs_grp," - "file_browser_size" + "brw_sizes.Cod AS GrpCod," // Group zones + "brw_sizes.NumLevels," + "brw_sizes.NumFolders," + "brw_sizes.NumFiles," + "brw_sizes.TotalSize" + " FROM deg_degrees," + "crs_courses," + "crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE deg_degrees.CtrCod=%ld" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=crs_grp_types.CrsCod" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)" + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=crs_grp_types.CrsCod" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser IN (%u,%u,%u,%u)" ") AS sizes", Gbl.Hierarchy.Ctr.CtrCod, (unsigned) Brw_ADMI_DOC_CRS, @@ -2196,21 +2204,22 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, case Brw_ADMI_SHR_CRS: case Brw_ADMI_MRK_CRS: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "-1," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM deg_degrees," - "crs_courses," - "file_browser_size" + "SELECT COUNT(DISTINCT brw_sizes.Cod)," // row[0] + "-1," // row[1] + "-1," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM deg_degrees," + "crs_courses," + "brw_sizes" " WHERE deg_degrees.CtrCod=%ld" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Ctr.CtrCod,(unsigned) FileBrowser); + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Ctr.CtrCod, + (unsigned) FileBrowser); break; case Brw_ADMI_DOC_GRP: case Brw_ADMI_TCH_GRP: @@ -2218,63 +2227,66 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, case Brw_ADMI_MRK_GRP: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," - "COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM deg_degrees," - "crs_courses," - "crs_grp_types," - "crs_grp," - "file_browser_size" + "COUNT(DISTINCT brw_sizes.Cod)," // row[0] + "-1," // row[1] + "MAX(brw_sizes.NumLevels)," // row[2] + "SUM(brw_sizes.NumFolders)," // row[3] + "SUM(brw_sizes.NumFiles)," // row[4] + "SUM(brw_sizes.TotalSize)" // row[5] + " FROM deg_degrees," + "crs_courses," + "crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE deg_degrees.CtrCod=%ld" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=crs_grp_types.CrsCod" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Ctr.CtrCod,(unsigned) FileBrowser); + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=crs_grp_types.CrsCod" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Ctr.CtrCod, + (unsigned) FileBrowser); break; case Brw_ADMI_ASG_USR: case Brw_ADMI_WRK_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "COUNT(DISTINCT file_browser_size.ZoneUsrCod)," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM deg_degrees," - "crs_courses," - "file_browser_size" + "SELECT COUNT(DISTINCT brw_sizes.Cod)," // row[0] + "-1," // row[1] + "COUNT(DISTINCT brw_sizes.ZoneUsrCod)," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM deg_degrees," + "crs_courses," + "brw_sizes" " WHERE deg_degrees.CtrCod=%ld" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Ctr.CtrCod,(unsigned) FileBrowser); + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Ctr.CtrCod, + (unsigned) FileBrowser); break; case Brw_ADMI_BRF_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT -1," - "-1," - "COUNT(DISTINCT file_browser_size.ZoneUsrCod)," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM deg_degrees," - "crs_courses," - "crs_usr," - "file_browser_size" + "SELECT -1," // row[0] + "-1," // row[1] + "COUNT(DISTINCT brw_sizes.ZoneUsrCod)," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM deg_degrees," + "crs_courses," + "crs_usr," + "brw_sizes" " WHERE deg_degrees.CtrCod=%ld" - " AND deg_degrees.DegCod=crs_courses.DegCod" - " AND crs_courses.CrsCod=crs_usr.CrsCod" - " AND crs_usr.UsrCod=file_browser_size.ZoneUsrCod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Ctr.CtrCod,(unsigned) FileBrowser); + " AND deg_degrees.DegCod=crs_courses.DegCod" + " AND crs_courses.CrsCod=crs_usr.CrsCod" + " AND crs_usr.UsrCod=brw_sizes.ZoneUsrCod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Ctr.CtrCod, + (unsigned) FileBrowser); break; default: Lay_ShowErrorAndExit ("Wrong file browser."); @@ -2287,42 +2299,42 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, { case Brw_UNKNOWN: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT CrsCod)," - "COUNT(DISTINCT GrpCod)-1," - "-1," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM " + "SELECT COUNT(DISTINCT CrsCod)," // row[0] + "COUNT(DISTINCT GrpCod)-1," // row[1] + "-1," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM " "(" - "SELECT file_browser_size.Cod AS CrsCod," - "-1 AS GrpCod," // Course zones - "file_browser_size.NumLevels," - "file_browser_size.NumFolders," - "file_browser_size.NumFiles," - "file_browser_size.TotalSize" - " FROM crs_courses," - "file_browser_size" + "SELECT brw_sizes.Cod AS CrsCod," + "-1 AS GrpCod," // Course zones + "brw_sizes.NumLevels," + "brw_sizes.NumFolders," + "brw_sizes.NumFiles," + "brw_sizes.TotalSize" + " FROM crs_courses," + "brw_sizes" " WHERE crs_courses.DegCod=%ld" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser IN (%u,%u,%u,%u,%u,%u)" + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser IN (%u,%u,%u,%u,%u,%u)" " UNION " "SELECT crs_grp_types.CrsCod," - "file_browser_size.Cod AS GrpCod," // Group zones - "file_browser_size.NumLevels," - "file_browser_size.NumFolders," - "file_browser_size.NumFiles," - "file_browser_size.TotalSize" - " FROM crs_courses," - "crs_grp_types," - "crs_grp," - "file_browser_size" + "brw_sizes.Cod AS GrpCod," // Group zones + "brw_sizes.NumLevels," + "brw_sizes.NumFolders," + "brw_sizes.NumFiles," + "brw_sizes.TotalSize" + " FROM crs_courses," + "crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE crs_courses.DegCod=%ld" - " AND crs_courses.CrsCod=crs_grp_types.CrsCod" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)" + " AND crs_courses.CrsCod=crs_grp_types.CrsCod" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser IN (%u,%u,%u,%u)" ") AS sizes", Gbl.Hierarchy.Deg.DegCod, (unsigned) Brw_ADMI_DOC_CRS, @@ -2342,77 +2354,81 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, case Brw_ADMI_SHR_CRS: case Brw_ADMI_MRK_CRS: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "-1," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM crs_courses," - "file_browser_size" + "SELECT COUNT(DISTINCT brw_sizes.Cod)," // row[0] + "-1," // row[1] + "-1," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM crs_courses," + "brw_sizes" " WHERE crs_courses.DegCod=%ld" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Deg.DegCod,(unsigned) FileBrowser); + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Deg.DegCod, + (unsigned) FileBrowser); break; case Brw_ADMI_DOC_GRP: case Brw_ADMI_TCH_GRP: case Brw_ADMI_SHR_GRP: case Brw_ADMI_MRK_GRP: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," - "COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM crs_courses," - "crs_grp_types," - "crs_grp," - "file_browser_size" + "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," // row[0] + "COUNT(DISTINCT brw_sizes.Cod)," // row[1] + "-1," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM crs_courses," + "crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE crs_courses.DegCod=%ld" - " AND crs_courses.CrsCod=crs_grp_types.CrsCod" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Deg.DegCod,(unsigned) FileBrowser); + " AND crs_courses.CrsCod=crs_grp_types.CrsCod" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Deg.DegCod, + (unsigned) FileBrowser); break; case Brw_ADMI_ASG_USR: case Brw_ADMI_WRK_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "COUNT(DISTINCT file_browser_size.ZoneUsrCod)," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM crs_courses," - "file_browser_size" + "SELECT COUNT(DISTINCT brw_sizes.Cod)," // row[0] + "-1," // row[1] + "COUNT(DISTINCT brw_sizes.ZoneUsrCod)," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM crs_courses," + "brw_sizes" " WHERE crs_courses.DegCod=%ld" - " AND crs_courses.CrsCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Deg.DegCod,(unsigned) FileBrowser); + " AND crs_courses.CrsCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Deg.DegCod, + (unsigned) FileBrowser); break; case Brw_ADMI_BRF_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT -1," - "-1," - "COUNT(DISTINCT file_browser_size.ZoneUsrCod)," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM crs_courses," - "crs_usr," - "file_browser_size" + "SELECT -1," // row[0] + "-1," // row[1] + "COUNT(DISTINCT brw_sizes.ZoneUsrCod)," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM crs_courses," + "crs_usr," + "brw_sizes" " WHERE crs_courses.DegCod=%ld" - " AND crs_courses.CrsCod=crs_usr.CrsCod" - " AND crs_usr.UsrCod=file_browser_size.ZoneUsrCod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Deg.DegCod,(unsigned) FileBrowser); + " AND crs_courses.CrsCod=crs_usr.CrsCod" + " AND crs_usr.UsrCod=brw_sizes.ZoneUsrCod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Deg.DegCod, + (unsigned) FileBrowser); break; default: Lay_ShowErrorAndExit ("Wrong file browser."); @@ -2425,38 +2441,38 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, { case Brw_UNKNOWN: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT CrsCod)," - "COUNT(DISTINCT GrpCod)-1," - "-1," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM " + "SELECT COUNT(DISTINCT CrsCod)," // row[0] + "COUNT(DISTINCT GrpCod)-1," // row[1] + "-1," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM " "(" "SELECT Cod AS CrsCod," - "-1 AS GrpCod," // Course zones + "-1 AS GrpCod," // Course zones "NumLevels," "NumFolders," "NumFiles," "TotalSize" - " FROM file_browser_size" + " FROM brw_sizes" " WHERE Cod=%ld" - " AND FileBrowser IN (%u,%u,%u,%u,%u,%u)" + " AND FileBrowser IN (%u,%u,%u,%u,%u,%u)" " UNION " "SELECT crs_grp_types.CrsCod," - "file_browser_size.Cod AS GrpCod," // Group zones - "file_browser_size.NumLevels," - "file_browser_size.NumFolders," - "file_browser_size.NumFiles," - "file_browser_size.TotalSize" - " FROM crs_grp_types," - "crs_grp," - "file_browser_size" + "brw_sizes.Cod AS GrpCod," // Group zones + "brw_sizes.NumLevels," + "brw_sizes.NumFolders," + "brw_sizes.NumFiles," + "brw_sizes.TotalSize" + " FROM crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE crs_grp_types.CrsCod=%ld" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser IN (%u,%u,%u,%u)" ") AS sizes", Gbl.Hierarchy.Crs.CrsCod, (unsigned) Brw_ADMI_DOC_CRS, @@ -2476,67 +2492,73 @@ static void Fig_GetSizeOfFileZoneFromDB (Hie_Lvl_Level_t Scope, case Brw_ADMI_SHR_CRS: case Brw_ADMI_MRK_CRS: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT 1," - "-1," - "-1," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM file_browser_size" - " WHERE Cod=%ld AND FileBrowser=%u", - Gbl.Hierarchy.Crs.CrsCod,(unsigned) FileBrowser); + "SELECT 1," // row[0] + "-1," // row[1] + "-1," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM brw_sizes" + " WHERE Cod=%ld" + " AND FileBrowser=%u", + Gbl.Hierarchy.Crs.CrsCod, + (unsigned) FileBrowser); break; case Brw_ADMI_DOC_GRP: case Brw_ADMI_TCH_GRP: case Brw_ADMI_SHR_GRP: case Brw_ADMI_MRK_GRP: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," - "COUNT(DISTINCT file_browser_size.Cod)," - "-1," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM crs_grp_types," - "crs_grp," - "file_browser_size" + "SELECT COUNT(DISTINCT crs_grp_types.CrsCod)," // row[0] + "COUNT(DISTINCT brw_sizes.Cod)," // row[1] + "-1," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM crs_grp_types," + "crs_grp," + "brw_sizes" " WHERE crs_grp_types.CrsCod=%ld" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND crs_grp.GrpCod=file_browser_size.Cod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Crs.CrsCod,(unsigned) FileBrowser); + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND crs_grp.GrpCod=brw_sizes.Cod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Crs.CrsCod, + (unsigned) FileBrowser); break; case Brw_ADMI_ASG_USR: case Brw_ADMI_WRK_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT 1," - "-1," - "COUNT(DISTINCT ZoneUsrCod)," - "MAX(NumLevels)," - "SUM(NumFolders)," - "SUM(NumFiles)," - "SUM(TotalSize)" - " FROM file_browser_size" - " WHERE Cod=%ld AND FileBrowser=%u", - Gbl.Hierarchy.Crs.CrsCod,(unsigned) FileBrowser); + "SELECT 1," // row[0] + "-1," // row[1] + "COUNT(DISTINCT ZoneUsrCod)," // row[2] + "MAX(NumLevels)," // row[3] + "SUM(NumFolders)," // row[4] + "SUM(NumFiles)," // row[5] + "SUM(TotalSize)" // row[6] + " FROM brw_sizes" + " WHERE Cod=%ld" + " AND FileBrowser=%u", + Gbl.Hierarchy.Crs.CrsCod, + (unsigned) FileBrowser); break; case Brw_ADMI_BRF_USR: DB_QuerySELECT (&mysql_res,"can not get size of a file browser", - "SELECT -1," - "-1," - "COUNT(DISTINCT file_browser_size.ZoneUsrCod)," - "MAX(file_browser_size.NumLevels)," - "SUM(file_browser_size.NumFolders)," - "SUM(file_browser_size.NumFiles)," - "SUM(file_browser_size.TotalSize)" - " FROM crs_usr," - "file_browser_size" + "SELECT -1," // row[0] + "-1," // row[1] + "COUNT(DISTINCT brw_sizes.ZoneUsrCod)," // row[2] + "MAX(brw_sizes.NumLevels)," // row[3] + "SUM(brw_sizes.NumFolders)," // row[4] + "SUM(brw_sizes.NumFiles)," // row[5] + "SUM(brw_sizes.TotalSize)" // row[6] + " FROM crs_usr," + "brw_sizes" " WHERE crs_usr.CrsCod=%ld" - " AND crs_usr.UsrCod=file_browser_size.ZoneUsrCod" - " AND file_browser_size.FileBrowser=%u", - Gbl.Hierarchy.Crs.CrsCod,(unsigned) FileBrowser); + " AND crs_usr.UsrCod=brw_sizes.ZoneUsrCod" + " AND brw_sizes.FileBrowser=%u", + Gbl.Hierarchy.Crs.CrsCod, + (unsigned) FileBrowser); break; default: Lay_ShowErrorAndExit ("Wrong file browser."); diff --git a/swad_file_browser.c b/swad_file_browser.c index ef8d8c3fe..3196c1115 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -91,7 +91,7 @@ struct Brw_NumObjects /***************************** Public constants ******************************/ /*****************************************************************************/ -// Browsers types for database "files" and "file_browser_size" tables +// Browsers types for database "files" and "brw_sizes" tables const Brw_FileBrowser_t Brw_FileBrowserForDB_files[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = Brw_UNKNOWN, @@ -4151,7 +4151,7 @@ static void Brw_StoreSizeOfFileTreeInDB (void) /***** Update size of the file browser in database *****/ DB_QueryREPLACE ("can not store the size of a file browser", - "REPLACE INTO file_browser_size" + "REPLACE INTO brw_sizes" " (FileBrowser,Cod,ZoneUsrCod," "NumLevels,NumFolders,NumFiles,TotalSize)" " VALUES" @@ -4216,7 +4216,7 @@ void Brw_RemoveInsFilesFromDB (long InsCod) /***** Remove from database the entries that store the sizes of the file zones *****/ DB_QueryDELETE ("can not remove sizes of file zones of an institution", - "DELETE FROM file_browser_size" + "DELETE FROM brw_sizes" " WHERE FileBrowser IN (%u,%u)" " AND Cod=%ld", (unsigned) Brw_ADMI_DOC_INS, @@ -4280,7 +4280,7 @@ void Brw_RemoveCtrFilesFromDB (long CtrCod) /***** Remove from database the entries that store the sizes of the file zones *****/ DB_QueryDELETE ("can not remove sizes of file zones of a center", - "DELETE FROM file_browser_size" + "DELETE FROM brw_sizes" " WHERE FileBrowser IN (%u,%u)" " AND Cod=%ld", (unsigned) Brw_ADMI_DOC_CTR, @@ -4343,7 +4343,7 @@ void Brw_RemoveDegFilesFromDB (long DegCod) /***** Remove from database the entries that store the sizes of the file zones *****/ DB_QueryDELETE ("can not remove sizes of file zones of a degree", - "DELETE FROM file_browser_size" + "DELETE FROM brw_sizes" " WHERE FileBrowser IN (%u,%u)" " AND Cod=%ld", (unsigned) Brw_ADMI_DOC_DEG, @@ -4549,7 +4549,7 @@ void Brw_RemoveCrsFilesFromDB (long CrsCod) /***** Remove from database the entries that store the sizes of the file zones *****/ /* Remove from course file zones */ DB_QueryDELETE ("can not remove sizes of file zones of a course", - "DELETE FROM file_browser_size" + "DELETE FROM brw_sizes" " WHERE FileBrowser IN (%u,%u,%u,%u,%u,%u)" " AND Cod=%ld", (unsigned) Brw_ADMI_DOC_CRS, @@ -4562,7 +4562,7 @@ void Brw_RemoveCrsFilesFromDB (long CrsCod) /* Remove from group file zones */ DB_QueryDELETE ("can not remove sizes of file zones of a course", - "DELETE FROM file_browser_size" + "DELETE FROM brw_sizes" " WHERE FileBrowser IN (%u,%u,%u,%u)" " AND Cod IN %s", (unsigned) Brw_ADMI_DOC_GRP, @@ -4573,7 +4573,7 @@ void Brw_RemoveCrsFilesFromDB (long CrsCod) /* Remove from project file zones */ DB_QueryDELETE ("can not remove sizes of file zones of a course", - "DELETE FROM file_browser_size" + "DELETE FROM brw_sizes" " WHERE FileBrowser IN (%u,%u)" " AND Cod IN %s", (unsigned) Brw_ADMI_DOC_PRJ, @@ -4680,7 +4680,7 @@ void Brw_RemoveGrpFilesFromDB (long GrpCod) /***** Remove from database the entries that store the sizes of the file zones *****/ DB_QueryDELETE ("can not remove sizes of file zones of a group", - "DELETE FROM file_browser_size" + "DELETE FROM brw_sizes" " WHERE FileBrowser IN (%u,%u,%u,%u)" " AND Cod=%ld", (unsigned) Brw_ADMI_DOC_GRP, @@ -4748,7 +4748,7 @@ void Brw_RemovePrjFilesFromDB (long PrjCod) /***** Remove from database the entries that store the sizes of the file zones *****/ DB_QueryDELETE ("can not remove sizes of file zones of a project", - "DELETE FROM file_browser_size" + "DELETE FROM brw_sizes" " WHERE FileBrowser IN (%u,%u)" " AND Cod=%ld", (unsigned) Brw_ADMI_DOC_PRJ, @@ -4909,7 +4909,7 @@ void Brw_RemoveWrkFilesFromDB (long CrsCod,long UsrCod) /***** Remove from database the entries that store the sizes of the file zones *****/ DB_QueryDELETE ("can not remove file browser sizes", - "DELETE FROM file_browser_size" + "DELETE FROM brw_sizes" " WHERE FileBrowser IN (%u,%u)" " AND Cod=%ld" " AND ZoneUsrCod=%ld", @@ -4965,7 +4965,7 @@ void Brw_RemoveUsrFilesFromDB (long UsrCod) /***** Remove from database the entries that store the sizes of the file zones *****/ DB_QueryDELETE ("can not remove sizes of user's file zones", - "DELETE FROM file_browser_size" + "DELETE FROM brw_sizes" " WHERE ZoneUsrCod=%ld", UsrCod); diff --git a/swad_indicator.c b/swad_indicator.c index 030f73fe2..dfe312178 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -1491,14 +1491,16 @@ static unsigned long Ind_GetNumFilesInDocumZonesOfCrsFromDB (long CrsCod) DB_QuerySELECT (&mysql_res,"can not get the number of files", "SELECT" " (SELECT COALESCE(SUM(NumFiles),0)" - " FROM file_browser_size" - " WHERE FileBrowser=%u AND Cod=%ld) +" - " (SELECT COALESCE(SUM(file_browser_size.NumFiles),0)" - " FROM crs_grp_types,crs_grp,file_browser_size" - " WHERE crs_grp_types.CrsCod=%ld" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND file_browser_size.FileBrowser=%u" - " AND file_browser_size.Cod=crs_grp.GrpCod)", + " FROM brw_sizes" + " WHERE FileBrowser=%u AND Cod=%ld) +" + " (SELECT COALESCE(SUM(brw_sizes.NumFiles),0)" + " FROM crs_grp_types," + "crs_grp," + "brw_sizes" + " WHERE crs_grp_types.CrsCod=%ld" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND brw_sizes.FileBrowser=%u" + " AND brw_sizes.Cod=crs_grp.GrpCod)", (unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_DOC_CRS], CrsCod, CrsCod, @@ -1532,14 +1534,16 @@ static unsigned long Ind_GetNumFilesInShareZonesOfCrsFromDB (long CrsCod) DB_QuerySELECT (&mysql_res,"can not get the number of files", "SELECT" " (SELECT COALESCE(SUM(NumFiles),0)" - " FROM file_browser_size" - " WHERE FileBrowser=%u AND Cod=%ld) +" - " (SELECT COALESCE(SUM(file_browser_size.NumFiles),0)" - " FROM crs_grp_types,crs_grp,file_browser_size" - " WHERE crs_grp_types.CrsCod=%ld" - " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" - " AND file_browser_size.FileBrowser=%u" - " AND file_browser_size.Cod=crs_grp.GrpCod)", + " FROM brw_sizes" + " WHERE FileBrowser=%u AND Cod=%ld) +" + " (SELECT COALESCE(SUM(brw_sizes.NumFiles),0)" + " FROM crs_grp_types," + "crs_grp," + "brw_sizes" + " WHERE crs_grp_types.CrsCod=%ld" + " AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod" + " AND brw_sizes.FileBrowser=%u" + " AND brw_sizes.Cod=crs_grp.GrpCod)", (unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_SHR_CRS], CrsCod, CrsCod, @@ -1572,8 +1576,9 @@ static unsigned long Ind_GetNumFilesInAssigZonesOfCrsFromDB (long CrsCod) /***** Get number of files in document zones of a course from database *****/ DB_QuerySELECT (&mysql_res,"can not get the number of files", "SELECT COALESCE(SUM(NumFiles),0)" - " FROM file_browser_size" - " WHERE FileBrowser=%u AND Cod=%ld", + " FROM brw_sizes" + " WHERE FileBrowser=%u" + " AND Cod=%ld", (unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_ASG_USR], CrsCod); @@ -1604,8 +1609,9 @@ static unsigned long Ind_GetNumFilesInWorksZonesOfCrsFromDB (long CrsCod) /***** Get number of files in document zones of a course from database *****/ DB_QuerySELECT (&mysql_res,"can not get the number of files", "SELECT COALESCE(SUM(NumFiles),0)" - " FROM file_browser_size" - " WHERE FileBrowser=%u AND Cod=%ld", + " FROM brw_sizes" + " WHERE FileBrowser=%u" + " AND Cod=%ld", (unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_WRK_USR], CrsCod);