Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-28 20:43:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 20.51.8: Mar 18, 2021 File views database table renamed.

Browse Source
This commit is contained in:
acanas 2021-03-18 13:23:19 +01:00
parent 307c5c08da
commit 6f5e476d7e
4 changed files with 69 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/swad.sql
View File

@ -172,9 +172,9 @@ CREATE TABLE IF NOT EXISTS brw_file_caches (
TmpPubDir TEXT COLLATE latin1_bin NOT NULL, TmpPubDir TEXT COLLATE latin1_bin NOT NULL,
INDEX(SessionId)); INDEX(SessionId));
-- --
-- Table file_view: stores the number of times each user has seen each file -- Table brw_file_views: stores the number of times each user has seen each file
-- --
CREATE TABLE IF NOT EXISTS file_view ( CREATE TABLE IF NOT EXISTS brw_file_views (
FilCod INT NOT NULL, FilCod INT NOT NULL,
UsrCod INT NOT NULL, UsrCod INT NOT NULL,
NumViews INT NOT NULL DEFAULT 0, NumViews INT NOT NULL DEFAULT 0,

8
swad_changelog.h
View File

@ -600,14 +600,18 @@ 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. 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.7 (2021-03-18)" #define Log_PLATFORM_VERSION "SWAD 20.51.8 (2021-03-18)"
#define CSS_FILE "swad20.45.css" #define CSS_FILE "swad20.45.css"
#define JS_FILE "swad20.6.2.js" #define JS_FILE "swad20.6.2.js"
/* /*
TODO: Rename CENTRE to CENTER in help wiki. TODO: Rename CENTRE to CENTER in help wiki.
TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams
Version 20.51.7: Mar 18, 2021 Files database table renamed. (307704 lines) Version 20.51.8: Mar 18, 2021 File views database table renamed. (307717 lines)
1 change necessary in database:
RENAME TABLE file_view TO brw_file_views;
Version 20.51.7: Mar 18, 2021 File caches database table renamed. (307704 lines)
1 change necessary in database: 1 change necessary in database:
RENAME TABLE file_cache TO brw_file_caches; RENAME TABLE file_cache TO brw_file_caches;

6
swad_database.c
View File

@ -453,9 +453,9 @@ mysql> DESCRIBE brw_file_caches;
"TmpPubDir VARCHAR(4096) COLLATE latin1_bin NOT NULL," // PATH_MAX "TmpPubDir VARCHAR(4096) COLLATE latin1_bin NOT NULL," // PATH_MAX
"UNIQUE INDEX(SessionId))"); "UNIQUE INDEX(SessionId))");
/***** Table file_view *****/ /***** Table brw_file_views *****/
/* /*
mysql> DESCRIBE file_view; mysql> DESCRIBE brw_file_views;
+----------+---------+------+-----+---------+-------+ +----------+---------+------+-----+---------+-------+
| Field | Type | Null | Key | Default | Extra | | Field | Type | Null | Key | Default | Extra |
+----------+---------+------+-----+---------+-------+ +----------+---------+------+-----+---------+-------+
@ -465,7 +465,7 @@ mysql> DESCRIBE file_view;
+----------+---------+------+-----+---------+-------+ +----------+---------+------+-----+---------+-------+
3 rows in set (0.00 sec) 3 rows in set (0.00 sec)
*/ */
DB_CreateTable ("CREATE TABLE IF NOT EXISTS file_view (" DB_CreateTable ("CREATE TABLE IF NOT EXISTS brw_file_views ("
"FilCod INT NOT NULL," "FilCod INT NOT NULL,"
"UsrCod INT NOT NULL," "UsrCod INT NOT NULL,"
"NumViews INT NOT NULL DEFAULT 0," "NumViews INT NOT NULL DEFAULT 0,"

106
swad_file_browser.c
View File

@ -4173,12 +4173,12 @@ void Brw_RemoveInsFilesFromDB (long InsCod)
{ {
/***** Remove from database the entries that store the file views *****/ /***** Remove from database the entries that store the file views *****/
DB_QueryDELETE ("can not remove file views to files of an institution", DB_QueryDELETE ("can not remove file views to files of an institution",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser IN (%u,%u)" " WHERE brw_files.FileBrowser IN (%u,%u)"
" AND brw_files.Cod=%ld" " AND brw_files.Cod=%ld"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) Brw_ADMI_DOC_INS, (unsigned) Brw_ADMI_DOC_INS,
(unsigned) Brw_ADMI_SHR_INS, (unsigned) Brw_ADMI_SHR_INS,
InsCod); InsCod);
@ -4241,12 +4241,12 @@ void Brw_RemoveCtrFilesFromDB (long CtrCod)
{ {
/***** Remove from database the entries that store the file views *****/ /***** Remove from database the entries that store the file views *****/
DB_QueryDELETE ("can not remove file views to files of a center", DB_QueryDELETE ("can not remove file views to files of a center",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser IN (%u,%u)" " WHERE brw_files.FileBrowser IN (%u,%u)"
" AND brw_files.Cod=%ld" " AND brw_files.Cod=%ld"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) Brw_ADMI_DOC_CTR, (unsigned) Brw_ADMI_DOC_CTR,
(unsigned) Brw_ADMI_SHR_CTR, (unsigned) Brw_ADMI_SHR_CTR,
CtrCod); CtrCod);
@ -4305,12 +4305,12 @@ void Brw_RemoveDegFilesFromDB (long DegCod)
{ {
/***** Remove from database the entries that store the file views *****/ /***** Remove from database the entries that store the file views *****/
DB_QueryDELETE ("can not remove file views to files of a degree", DB_QueryDELETE ("can not remove file views to files of a degree",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser IN (%u,%u)" " WHERE brw_files.FileBrowser IN (%u,%u)"
" AND brw_files.Cod=%ld" " AND brw_files.Cod=%ld"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) Brw_ADMI_DOC_DEG, (unsigned) Brw_ADMI_DOC_DEG,
(unsigned) Brw_ADMI_SHR_DEG, (unsigned) Brw_ADMI_SHR_DEG,
DegCod); DegCod);
@ -4400,12 +4400,12 @@ void Brw_RemoveCrsFilesFromDB (long CrsCod)
/***** Remove from database the entries that store the file views *****/ /***** Remove from database the entries that store the file views *****/
/* Remove from course file zones */ /* Remove from course file zones */
DB_QueryDELETE ("can not remove file views to files of a course", DB_QueryDELETE ("can not remove file views to files of a course",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser IN (%u,%u,%u,%u,%u,%u)" " WHERE brw_files.FileBrowser IN (%u,%u,%u,%u,%u,%u)"
" AND brw_files.Cod=%ld" " AND brw_files.Cod=%ld"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) Brw_ADMI_DOC_CRS, (unsigned) Brw_ADMI_DOC_CRS,
(unsigned) Brw_ADMI_TCH_CRS, (unsigned) Brw_ADMI_TCH_CRS,
(unsigned) Brw_ADMI_SHR_CRS, (unsigned) Brw_ADMI_SHR_CRS,
@ -4416,12 +4416,12 @@ void Brw_RemoveCrsFilesFromDB (long CrsCod)
/* Remove from group file zones */ /* Remove from group file zones */
DB_QueryDELETE ("can not remove file views to files of a course", DB_QueryDELETE ("can not remove file views to files of a course",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser IN (%u,%u,%u,%u)" " WHERE brw_files.FileBrowser IN (%u,%u,%u,%u)"
" AND brw_files.Cod IN %s" " AND brw_files.Cod IN %s"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) Brw_ADMI_DOC_GRP, (unsigned) Brw_ADMI_DOC_GRP,
(unsigned) Brw_ADMI_TCH_GRP, (unsigned) Brw_ADMI_TCH_GRP,
(unsigned) Brw_ADMI_SHR_GRP, (unsigned) Brw_ADMI_SHR_GRP,
@ -4430,12 +4430,12 @@ void Brw_RemoveCrsFilesFromDB (long CrsCod)
/* Remove from project file zones */ /* Remove from project file zones */
DB_QueryDELETE ("can not remove file views to files of a course", DB_QueryDELETE ("can not remove file views to files of a course",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser IN (%u,%u)" " WHERE brw_files.FileBrowser IN (%u,%u)"
" AND brw_files.Cod IN %s" " AND brw_files.Cod IN %s"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) Brw_ADMI_DOC_PRJ, (unsigned) Brw_ADMI_DOC_PRJ,
(unsigned) Brw_ADMI_ASS_PRJ, (unsigned) Brw_ADMI_ASS_PRJ,
SubqueryPrj); SubqueryPrj);
@ -4636,12 +4636,12 @@ void Brw_RemoveGrpFilesFromDB (long GrpCod)
/***** Remove from database the entries that store the file views *****/ /***** Remove from database the entries that store the file views *****/
DB_QueryDELETE ("can not remove file views to files of a group", DB_QueryDELETE ("can not remove file views to files of a group",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser IN (%u,%u,%u,%u)" " WHERE brw_files.FileBrowser IN (%u,%u,%u,%u)"
" AND brw_files.Cod=%ld" " AND brw_files.Cod=%ld"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) Brw_ADMI_DOC_GRP, (unsigned) Brw_ADMI_DOC_GRP,
(unsigned) Brw_ADMI_TCH_GRP, (unsigned) Brw_ADMI_TCH_GRP,
(unsigned) Brw_ADMI_SHR_GRP, (unsigned) Brw_ADMI_SHR_GRP,
@ -4712,12 +4712,12 @@ void Brw_RemovePrjFilesFromDB (long PrjCod)
{ {
/***** Remove from database the entries that store the file views *****/ /***** Remove from database the entries that store the file views *****/
DB_QueryDELETE ("can not remove file views to files of a project", DB_QueryDELETE ("can not remove file views to files of a project",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser IN (%u,%u)" " WHERE brw_files.FileBrowser IN (%u,%u)"
" AND brw_files.Cod=%ld" " AND brw_files.Cod=%ld"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) Brw_ADMI_DOC_PRJ, (unsigned) Brw_ADMI_DOC_PRJ,
(unsigned) Brw_ADMI_ASS_PRJ, (unsigned) Brw_ADMI_ASS_PRJ,
PrjCod); PrjCod);
@ -4879,13 +4879,13 @@ void Brw_RemoveWrkFilesFromDB (long CrsCod,long UsrCod)
{ {
/***** Remove from database the entries that store the file views *****/ /***** Remove from database the entries that store the file views *****/
DB_QueryDELETE ("can not remove file views", DB_QueryDELETE ("can not remove file views",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser IN (%u,%u)" " WHERE brw_files.FileBrowser IN (%u,%u)"
" AND brw_files.Cod=%ld" " AND brw_files.Cod=%ld"
" AND brw_files.ZoneUsrCod=%ld" " AND brw_files.ZoneUsrCod=%ld"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) Brw_ADMI_ASG_USR, (unsigned) Brw_ADMI_ASG_USR,
(unsigned) Brw_ADMI_WRK_USR, (unsigned) Brw_ADMI_WRK_USR,
CrsCod,UsrCod); CrsCod,UsrCod);
@ -4938,14 +4938,14 @@ void Brw_RemoveWrkFilesFromDB (long CrsCod,long UsrCod)
void Brw_RemoveUsrFilesFromDB (long UsrCod) void Brw_RemoveUsrFilesFromDB (long UsrCod)
{ {
/***** Remove from database the entries that store the file views *****/ /***** Remove from database the entries that store the file views *****/
// User is not removed from file_view table, // User is not removed from brw_file_views table,
// in order to take into account his/her views // in order to take into account his/her views
DB_QueryDELETE ("can not remove file views to files of a user", DB_QueryDELETE ("can not remove file views to files of a user",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.ZoneUsrCod=%ld" " WHERE brw_files.ZoneUsrCod=%ld"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
UsrCod); UsrCod);
/***** Remove from database expanded folders *****/ /***** Remove from database expanded folders *****/
@ -10773,7 +10773,9 @@ unsigned long Brw_GetNumFileViewsUsr (long UsrCod)
/***** Get number of filw views *****/ /***** Get number of filw views *****/
if (DB_QuerySELECT (&mysql_res,"can not get number of file views", if (DB_QuerySELECT (&mysql_res,"can not get number of file views",
"SELECT SUM(NumViews) FROM file_view WHERE UsrCod=%ld", "SELECT SUM(NumViews)" // row[0]
" FROM brw_file_views"
" WHERE UsrCod=%ld",
UsrCod)) UsrCod))
{ {
/* Get number of file views */ /* Get number of file views */
@ -10811,9 +10813,11 @@ static void Brw_GetFileViewsFromLoggedUsrs (struct FileMetadata *FileMetadata)
/***** Get number total of views from logged users *****/ /***** Get number total of views from logged users *****/
if (DB_QuerySELECT (&mysql_res,"can not get number of views of a file" if (DB_QuerySELECT (&mysql_res,"can not get number of views of a file"
" from logged users", " from logged users",
"SELECT COUNT(DISTINCT UsrCod),SUM(NumViews)" "SELECT COUNT(DISTINCT UsrCod)," // row[0]
" FROM file_view" "SUM(NumViews)" // row[1]
" WHERE FilCod=%ld AND UsrCod>0", " FROM brw_file_views"
" WHERE FilCod=%ld"
" AND UsrCod>0",
FileMetadata->FilCod)) FileMetadata->FilCod))
{ {
row = mysql_fetch_row (mysql_res); row = mysql_fetch_row (mysql_res);
@ -10853,8 +10857,10 @@ static void Brw_GetFileViewsFromNonLoggedUsrs (struct FileMetadata *FileMetadata
/***** Get number of public views *****/ /***** Get number of public views *****/
if (DB_QuerySELECT (&mysql_res,"can not get number of public views" if (DB_QuerySELECT (&mysql_res,"can not get number of public views"
" of a file", " of a file",
"SELECT SUM(NumViews) FROM file_view" "SELECT SUM(NumViews)" // row[0]
" WHERE FilCod=%ld AND UsrCod<=0", " FROM brw_file_views"
" WHERE FilCod=%ld"
" AND UsrCod<=0",
FileMetadata->FilCod)) FileMetadata->FilCod))
{ {
/* Get number of public views */ /* Get number of public views */
@ -10886,8 +10892,10 @@ static unsigned Brw_GetFileViewsFromMe (long FilCod)
/***** Get number of my views *****/ /***** Get number of my views *****/
if (DB_QuerySELECT (&mysql_res,"can not get your number of views of a file", if (DB_QuerySELECT (&mysql_res,"can not get your number of views of a file",
"SELECT NumViews FROM file_view" "SELECT NumViews" // row[0]
" WHERE FilCod=%ld AND UsrCod=%ld", " FROM brw_file_views"
" WHERE FilCod=%ld"
" AND UsrCod=%ld",
FilCod,Gbl.Usrs.Me.UsrDat.UsrCod)) FilCod,Gbl.Usrs.Me.UsrDat.UsrCod))
{ {
/* Get number of my views */ /* Get number of my views */
@ -10913,13 +10921,15 @@ static void Brw_UpdateFileViews (unsigned NumViews,long FilCod)
if (NumViews) if (NumViews)
/* Update number of views in database */ /* Update number of views in database */
DB_QueryUPDATE ("can not update number of views of a file", DB_QueryUPDATE ("can not update number of views of a file",
"UPDATE file_view SET NumViews=NumViews+1" "UPDATE brw_file_views"
" WHERE FilCod=%ld AND UsrCod=%ld", " SET NumViews=NumViews+1"
" WHERE FilCod=%ld"
" AND UsrCod=%ld",
FilCod,Gbl.Usrs.Me.UsrDat.UsrCod); FilCod,Gbl.Usrs.Me.UsrDat.UsrCod);
else // NumViews == 0 else // NumViews == 0
/* Insert number of views in database */ /* Insert number of views in database */
DB_QueryINSERT ("can not insert number of views of a file", DB_QueryINSERT ("can not insert number of views of a file",
"INSERT INTO file_view" "INSERT INTO brw_file_views"
" (FilCod,UsrCod,NumViews)" " (FilCod,UsrCod,NumViews)"
" VALUES" " VALUES"
" (%ld,%ld,1)", " (%ld,%ld,1)",
@ -11259,14 +11269,14 @@ static void Brw_RemoveOneFileOrFolderFromDB (const char Path[PATH_MAX + 1])
/***** Remove from database the entries that store the file views *****/ /***** Remove from database the entries that store the file views *****/
DB_QueryDELETE ("can not remove file views from database", DB_QueryDELETE ("can not remove file views from database",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser=%u" " WHERE brw_files.FileBrowser=%u"
" AND brw_files.Cod=%ld" " AND brw_files.Cod=%ld"
" AND brw_files.ZoneUsrCod=%ld" " AND brw_files.ZoneUsrCod=%ld"
" AND brw_files.Path='%s'" " AND brw_files.Path='%s'"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) FileBrowser,Cod,ZoneUsrCod,Path); (unsigned) FileBrowser,Cod,ZoneUsrCod,Path);
/***** Remove from database the entry that stores the data of a file *****/ /***** Remove from database the entry that stores the data of a file *****/
@ -11310,14 +11320,14 @@ static void Brw_RemoveChildrenOfFolderFromDB (const char Path[PATH_MAX + 1])
/***** Remove from database the entries that store the file views *****/ /***** Remove from database the entries that store the file views *****/
DB_QueryDELETE ("can not remove file views from database", DB_QueryDELETE ("can not remove file views from database",
"DELETE FROM file_view" "DELETE FROM brw_file_views"
" USING brw_files," " USING brw_files,"
"file_view" "brw_file_views"
" WHERE brw_files.FileBrowser=%u" " WHERE brw_files.FileBrowser=%u"
" AND brw_files.Cod=%ld" " AND brw_files.Cod=%ld"
" AND brw_files.ZoneUsrCod=%ld" " AND brw_files.ZoneUsrCod=%ld"
" AND brw_files.Path LIKE '%s/%%'" " AND brw_files.Path LIKE '%s/%%'"
" AND brw_files.FilCod=file_view.FilCod", " AND brw_files.FilCod=brw_file_views.FilCod",
(unsigned) FileBrowser,Cod,ZoneUsrCod,Path); (unsigned) FileBrowser,Cod,ZoneUsrCod,Path);
/***** Remove from database the entries that store the data of files *****/ /***** Remove from database the entries that store the data of files *****/