From b1414273de0f1fe44b6e6ad991b36ad2143a4e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 26 Jan 2015 14:30:45 +0100 Subject: [PATCH] Version 14.69.2 --- sql/cambios.sql | 15 ++++++ swad_changelog.h | 12 +++-- swad_main.c | 2 +- swad_statistic.c | 124 +++++++++++++++++++++++++++++++---------------- 4 files changed, 105 insertions(+), 48 deletions(-) diff --git a/sql/cambios.sql b/sql/cambios.sql index 4454ba101..b1352ea2e 100644 --- a/sql/cambios.sql +++ b/sql/cambios.sql @@ -10482,4 +10482,19 @@ CREATE TABLE IF NOT EXISTS file_browser_last (UsrCod INT NOT NULL,FileBrowser TI INSERT INTO file_browser_last (UsrCod,FileBrowser,Cod,LastClick) SELECT UsrCod,'9','-1',LastAccBriefcase FROM usr_last WHERE LastAccBriefcase>0; ALTER TABLE usr_last DROP COLUMN LastAccBriefcase; +----- 2015-01-26, swad14.69.1 + +CREATE TABLE files_backup LIKE files; +INSERT INTO files_backup SELECT * FROM files; + +CREATE TABLE file_browser_size_backup LIKE file_browser_size; +INSERT INTO file_browser_size_backup SELECT * FROM file_browser_size; + +CREATE TABLE expanded_folders_backup LIKE expanded_folders; +INSERT INTO expanded_folders_backup SELECT * FROM expanded_folders; + +CREATE TABLE clipboard_backup LIKE clipboard; +INSERT INTO clipboard_backup SELECT * FROM clipboard; + + diff --git a/swad_changelog.h b/swad_changelog.h index 84ada8a4a..d1fc94b94 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -39,11 +39,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.69.1 (2015/01/26)" +#define Log_PLATFORM_VERSION "SWAD 14.69.2 (2015/01/26)" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1 /* +TODO: Change the way of computing total sizes of file browsers. + Version 14.69.2: Jan 26, 2015 Fixed bugs in statistics about sizes of file browsers. (175864 lines) Version 14.69.1: Jan 26, 2015 Code refactoring related to file browsers. (175822 lines) Version 14.69: Jan 26, 2015 Changes in search of documents. (175818 lines) Version 14.68.2: Jan 25, 2015 Fixed bugs in search of documents. @@ -59,19 +61,20 @@ UPDATE expanded_folders SET FileBrowser='19' WHERE FileBrowser='18'; UPDATE expanded_folders SET FileBrowser='21' WHERE FileBrowser='20'; Version 14.68: Jan 25, 2015 Changes in file_browser_size table. (175606 lines) - 8 changes necessary in database: + 9 changes necessary in database: DROP INDEX FileBrowser ON file_browser_size; DROP INDEX UsrCod ON file_browser_size; ALTER TABLE file_browser_size CHANGE COLUMN UsrCod ZoneUsrCod INT NOT NULL DEFAULT -1,ADD INDEX (ZoneUsrCod); -ALTER TABLE file_browser_size ADD COLUMN Cod INT NOT NULL DEFAULT -1 AFTER FileBrowser, ADD UNIQUE INDEX (FileBrowser,Cod,ZoneUsrCod); +ALTER TABLE file_browser_size ADD COLUMN Cod INT NOT NULL DEFAULT -1 AFTER FileBrowser; UPDATE file_browser_size SET Cod=CrsCod WHERE CrsCod>'0' AND GrpCod<='0'; UPDATE file_browser_size SET Cod=GrpCod WHERE GrpCod>'0'; ALTER TABLE file_browser_size DROP COLUMN CrsCod; ALTER TABLE file_browser_size DROP COLUMN GrpCod; +CREATE UNIQUE INDEX FileBrowser ON file_browser_size (FileBrowser,Cod,ZoneUsrCod); Version 14.67.1: Jan 25, 2015 Fixed bugs in file browsers. (175395 lines) Version 14.67: Jan 25, 2015 Changes in files table. (175369 lines) - 16 changes necessary in database: + 17 changes necessary in database: ALTER TABLE files ADD COLUMN ZoneUsrCod2 INT NOT NULL DEFAULT -1 AFTER FileBrowser; UPDATE files SET ZoneUsrCod2=ZoneUsrCod; ALTER TABLE files DROP COLUMN ZoneUsrCod; @@ -88,6 +91,7 @@ ALTER TABLE files DROP COLUMN CtrCod; ALTER TABLE files DROP COLUMN DegCod; ALTER TABLE files DROP COLUMN CrsCod; ALTER TABLE files DROP COLUMN GrpCod; +DROP INDEX Location ON files; Version 14.66.1: Jan 24, 2015 Fixed bug in clipboard. (175404 lines) Version 14.66: Jan 24, 2015 Changes in clipboard table. (175401 lines) diff --git a/swad_main.c b/swad_main.c index 5cfe447dd..f929cb4b8 100644 --- a/swad_main.c +++ b/swad_main.c @@ -77,7 +77,7 @@ int main (int argc, char *argv[]) "" "%s" "



" - "

%s está parado por mantenimiento

" + "

%s está parado por mantenimiento durante pocos minutos

" "

Intente acceder más tarde, por favor.

" "" "", diff --git a/swad_statistic.c b/swad_statistic.c index 9f5314cc8..d1820efee 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -4583,10 +4583,10 @@ static void Sta_WriteRowStatsExpTrees (Brw_FileBrowser_t FileZone,const char *Na char StrNumFilesPerUsr[10+1]; struct Sta_SizeOfFileZones SizeOfFileZones; char *ClassData = (FileZone == Brw_UNKNOWN) ? "DAT_N" : - "DAT"; + "DAT"; char *StyleTableCell = (FileZone == Brw_UNKNOWN) ? " border-style:solid none none none;" - " border-width:1px;" : - ""; + " border-width:1px;" : + ""; Sta_GetSizeOfFileZoneFromDB (Gbl.Scope.Current,FileZone,&SizeOfFileZones); if (SizeOfFileZones.NumCrss == -1) @@ -4706,156 +4706,194 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil { case Sco_SCOPE_PLATFORM: if (FileBrowser == Brw_UNKNOWN) - sprintf (Query,"SELECT COUNT(DISTINCT CrsCod),'-1',MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" + sprintf (Query,"SELECT COUNT(DISTINCT Cod),'-1',MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" " FROM file_browser_size" - " WHERE FileBrowser<>'%u'", - (unsigned) Brw_ADMI_BRIEF_USR); + " WHERE FileBrowser IN ('%u','%u','%u','%u','%u','%u','%u')", + (unsigned) Brw_ADMI_DOCUM_CRS, + (unsigned) Brw_ADMI_SHARE_CRS, + (unsigned) Brw_ADMI_ASSIG_USR, + (unsigned) Brw_ADMI_ASSIG_CRS, + (unsigned) Brw_ADMI_WORKS_USR, + (unsigned) Brw_ADMI_WORKS_CRS, + (unsigned) Brw_ADMI_MARKS_CRS); else if (FileBrowser == Brw_ADMI_BRIEF_USR) - sprintf (Query,"SELECT '-1',COUNT(DISTINCT UsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" + sprintf (Query,"SELECT '-1',COUNT(DISTINCT ZoneUsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" " FROM file_browser_size" " WHERE FileBrowser='%u'", (unsigned) FileBrowser); else if (FileBrowser == Brw_ADMI_ASSIG_USR || FileBrowser == Brw_ADMI_WORKS_USR) - sprintf (Query,"SELECT COUNT(DISTINCT CrsCod),COUNT(DISTINCT UsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" + sprintf (Query,"SELECT COUNT(DISTINCT Cod),COUNT(DISTINCT ZoneUsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" " FROM file_browser_size" " WHERE FileBrowser='%u'", (unsigned) FileBrowser); else - sprintf (Query,"SELECT COUNT(DISTINCT CrsCod),'-1',MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" + sprintf (Query,"SELECT COUNT(DISTINCT Cod),'-1',MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" " FROM file_browser_size" " WHERE FileBrowser='%u'", (unsigned) FileBrowser); break; case Sco_SCOPE_INSTITUTION: if (FileBrowser == Brw_UNKNOWN) - sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT 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 centres,degrees,courses,file_browser_size" " WHERE centres.InsCod='%ld'" " AND centres.CtrCod=degrees.CtrCod" " AND degrees.DegCod=courses.DegCod" - " AND courses.CrsCod=file_browser_size.CrsCod", - Gbl.CurrentIns.Ins.InsCod); + " AND courses.CrsCod=file_browser_size.Cod" + " AND file_browser_size.FileBrowser IN ('%u','%u','%u','%u','%u','%u','%u')", + Gbl.CurrentIns.Ins.InsCod, + (unsigned) Brw_ADMI_DOCUM_CRS, + (unsigned) Brw_ADMI_SHARE_CRS, + (unsigned) Brw_ADMI_ASSIG_USR, + (unsigned) Brw_ADMI_ASSIG_CRS, + (unsigned) Brw_ADMI_WORKS_USR, + (unsigned) Brw_ADMI_WORKS_CRS, + (unsigned) Brw_ADMI_MARKS_CRS); else if (FileBrowser == Brw_ADMI_BRIEF_USR) - sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT '-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 file_browser_size,centres,degrees,courses,crs_usr" " WHERE file_browser_size.FileBrowser='%u'" " AND centres.InsCod='%ld'" " AND centres.CtrCod=degrees.CtrCod" " AND degrees.DegCod=courses.DegCod" " AND courses.CrsCod=crs_usr.CrsCod" - " AND file_browser_size.UsrCod=crs_usr.UsrCod", + " AND file_browser_size.ZoneUsrCod=crs_usr.UsrCod", (unsigned) FileBrowser,Gbl.CurrentIns.Ins.InsCod); else if (FileBrowser == Brw_ADMI_ASSIG_USR || FileBrowser == Brw_ADMI_WORKS_USR) - sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),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 file_browser_size,centres,degrees,courses" " WHERE file_browser_size.FileBrowser='%u'" " AND centres.InsCod='%ld'" " AND centres.CtrCod=degrees.CtrCod" " AND degrees.DegCod=courses.DegCod" - " AND courses.CrsCod=file_browser_size.CrsCod", + " AND courses.CrsCod=file_browser_size.Cod", (unsigned) FileBrowser,Gbl.CurrentIns.Ins.InsCod); else - sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT 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 file_browser_size,centres,degrees,courses" " WHERE file_browser_size.FileBrowser='%u'" " AND centres.InsCod='%ld'" " AND centres.CtrCod=degrees.CtrCod" " AND degrees.DegCod=courses.DegCod" - " AND courses.CrsCod=file_browser_size.CrsCod", + " AND courses.CrsCod=file_browser_size.Cod", (unsigned) FileBrowser,Gbl.CurrentIns.Ins.InsCod); break; case Sco_SCOPE_CENTRE: if (FileBrowser == Brw_UNKNOWN) - sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT 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 degrees,courses,file_browser_size" " WHERE degrees.CtrCod='%ld'" " AND degrees.DegCod=courses.DegCod" - " AND courses.CrsCod=file_browser_size.CrsCod", - Gbl.CurrentCtr.Ctr.CtrCod); + " AND courses.CrsCod=file_browser_size.Cod" + " AND file_browser_size.FileBrowser IN ('%u','%u','%u','%u','%u','%u','%u')", + Gbl.CurrentCtr.Ctr.CtrCod, + (unsigned) Brw_ADMI_DOCUM_CRS, + (unsigned) Brw_ADMI_SHARE_CRS, + (unsigned) Brw_ADMI_ASSIG_USR, + (unsigned) Brw_ADMI_ASSIG_CRS, + (unsigned) Brw_ADMI_WORKS_USR, + (unsigned) Brw_ADMI_WORKS_CRS, + (unsigned) Brw_ADMI_MARKS_CRS); else if (FileBrowser == Brw_ADMI_BRIEF_USR) - sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT '-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 file_browser_size,degrees,courses,crs_usr" " WHERE file_browser_size.FileBrowser='%u'" " AND degrees.CtrCod='%ld'" " AND degrees.DegCod=courses.DegCod" " AND courses.CrsCod=crs_usr.CrsCod" - " AND file_browser_size.UsrCod=crs_usr.UsrCod", + " AND file_browser_size.ZoneUsrCod=crs_usr.UsrCod", (unsigned) FileBrowser,Gbl.CurrentCtr.Ctr.CtrCod); else if (FileBrowser == Brw_ADMI_ASSIG_USR || FileBrowser == Brw_ADMI_WORKS_USR) - sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),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 file_browser_size,degrees,courses" " WHERE file_browser_size.FileBrowser='%u'" " AND degrees.CtrCod='%ld'" " AND degrees.DegCod=courses.DegCod" - " AND courses.CrsCod=file_browser_size.CrsCod", + " AND courses.CrsCod=file_browser_size.Cod", (unsigned) FileBrowser,Gbl.CurrentCtr.Ctr.CtrCod); else - sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT 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 file_browser_size,degrees,courses" " WHERE file_browser_size.FileBrowser='%u'" " AND degrees.CtrCod='%ld'" " AND degrees.DegCod=courses.DegCod" - " AND courses.CrsCod=file_browser_size.CrsCod", + " AND courses.CrsCod=file_browser_size.Cod", (unsigned) FileBrowser,Gbl.CurrentCtr.Ctr.CtrCod); break; case Sco_SCOPE_DEGREE: if (FileBrowser == Brw_UNKNOWN) - sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT 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 file_browser_size,courses" - " WHERE courses.DegCod='%ld' AND courses.CrsCod=file_browser_size.CrsCod", - Gbl.CurrentDeg.Deg.DegCod); + " WHERE courses.DegCod='%ld' AND courses.CrsCod=file_browser_size.Cod" + " AND file_browser_size.FileBrowser IN ('%u','%u','%u','%u','%u','%u','%u')", + Gbl.CurrentDeg.Deg.DegCod, + (unsigned) Brw_ADMI_DOCUM_CRS, + (unsigned) Brw_ADMI_SHARE_CRS, + (unsigned) Brw_ADMI_ASSIG_USR, + (unsigned) Brw_ADMI_ASSIG_CRS, + (unsigned) Brw_ADMI_WORKS_USR, + (unsigned) Brw_ADMI_WORKS_CRS, + (unsigned) Brw_ADMI_MARKS_CRS); else if (FileBrowser == Brw_ADMI_BRIEF_USR) - sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT '-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 file_browser_size,courses,crs_usr" " WHERE file_browser_size.FileBrowser='%u'" " AND courses.DegCod='%ld'" " AND courses.CrsCod=crs_usr.CrsCod" - " AND file_browser_size.UsrCod=crs_usr.UsrCod", + " AND file_browser_size.ZoneUsrCod=crs_usr.UsrCod", (unsigned) FileBrowser,Gbl.CurrentDeg.Deg.DegCod); else if (FileBrowser == Brw_ADMI_ASSIG_USR || FileBrowser == Brw_ADMI_WORKS_USR) - sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),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 file_browser_size,courses" " WHERE file_browser_size.FileBrowser='%u'" " AND courses.DegCod='%ld'" - " AND courses.CrsCod=file_browser_size.CrsCod", + " AND courses.CrsCod=file_browser_size.Cod", (unsigned) FileBrowser,Gbl.CurrentDeg.Deg.DegCod); else - sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT 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 file_browser_size,courses" " WHERE file_browser_size.FileBrowser='%u'" " AND courses.DegCod='%ld'" - " AND courses.CrsCod=file_browser_size.CrsCod", + " AND courses.CrsCod=file_browser_size.Cod", (unsigned) FileBrowser,Gbl.CurrentDeg.Deg.DegCod); break; case Sco_SCOPE_COURSE: if (FileBrowser == Brw_UNKNOWN) sprintf (Query,"SELECT '1','-1',MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" " FROM file_browser_size" - " WHERE CrsCod='%ld'", - Gbl.CurrentCrs.Crs.CrsCod); + " WHERE Cod='%ld'" + " AND file_browser_size.FileBrowser IN ('%u','%u','%u','%u','%u','%u','%u')", + Gbl.CurrentCrs.Crs.CrsCod, + (unsigned) Brw_ADMI_DOCUM_CRS, + (unsigned) Brw_ADMI_SHARE_CRS, + (unsigned) Brw_ADMI_ASSIG_USR, + (unsigned) Brw_ADMI_ASSIG_CRS, + (unsigned) Brw_ADMI_WORKS_USR, + (unsigned) Brw_ADMI_WORKS_CRS, + (unsigned) Brw_ADMI_MARKS_CRS); else if (FileBrowser == Brw_ADMI_BRIEF_USR) - sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" + sprintf (Query,"SELECT '-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 file_browser_size,crs_usr" " WHERE file_browser_size.FileBrowser='%u'" " AND crs_usr.CrsCod='%ld'" - " AND file_browser_size.UsrCod=crs_usr.UsrCod", + " AND file_browser_size.ZoneUsrCod=crs_usr.UsrCod", (unsigned) FileBrowser,Gbl.CurrentCrs.Crs.CrsCod); else if (FileBrowser == Brw_ADMI_ASSIG_USR || FileBrowser == Brw_ADMI_WORKS_USR) - sprintf (Query,"SELECT '1',COUNT(DISTINCT UsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" + sprintf (Query,"SELECT '1',COUNT(DISTINCT ZoneUsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" " FROM file_browser_size" " WHERE FileBrowser='%u'" - " AND CrsCod='%ld'", + " AND Cod='%ld'", (unsigned) FileBrowser,Gbl.CurrentCrs.Crs.CrsCod); else sprintf (Query,"SELECT '1','-1',MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" " FROM file_browser_size" " WHERE FileBrowser='%u'" - " AND CrsCod='%ld'", + " AND Cod='%ld'", (unsigned) FileBrowser,Gbl.CurrentCrs.Crs.CrsCod); break; default: