Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-18 06:25:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version20.18

Browse Source
This commit is contained in:
acanas 2021-02-09 13:48:05 +01:00
parent c6d15bd487
commit 9b862fe64c
2 changed files with 27 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -553,7 +553,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 20.17 (2021-02-09)" #define Log_PLATFORM_VERSION "SWAD 20.18 (2021-02-09)"
#define CSS_FILE "swad20.8.css" #define CSS_FILE "swad20.8.css"
#define JS_FILE "swad20.6.2.js" #define JS_FILE "swad20.6.2.js"
/* /*
@ -600,6 +600,7 @@ TODO: DNI de un estudiante sale err
TODO: BUG: Cuando un tipo de grupo sólo tiene un grupo, inscribirse es voluntario, el estudiante sólo puede pertenecer a un grupo, y se inscribe en él, debería poder desapuntarse. Ahora no puede. TODO: BUG: Cuando un tipo de grupo sólo tiene un grupo, inscribirse es voluntario, el estudiante sólo puede pertenecer a un grupo, y se inscribe en él, debería poder desapuntarse. Ahora no puede.
Version 20.18: Feb 09, 2021 Removed temporary table not used in timeline. (305096 lines)
Version 20.17: Feb 09, 2021 Code refactoring in timeline. (305110 lines) Version 20.17: Feb 09, 2021 Code refactoring in timeline. (305110 lines)
Version 20.16.3: Feb 09, 2021 Time is not get from database in timeline publications. (305211 lines) Version 20.16.3: Feb 09, 2021 Time is not get from database in timeline publications. (305211 lines)
Version 20.16.2: Feb 09, 2021 Code refactoring in timeline. (305168 lines) Version 20.16.2: Feb 09, 2021 Code refactoring in timeline. (305168 lines)

67
swad_timeline.c
View File

@ -227,13 +227,11 @@ static void TL_UpdateLastPubCodIntoSession (void);
static void TL_UpdateFirstPubCodIntoSession (long FirstPubCod); static void TL_UpdateFirstPubCodIntoSession (long FirstPubCod);
static void TL_CreateTmpTablePubCodes (void); static void TL_CreateTmpTablePubCodes (void);
static void TL_CreateTmpTableNotCodes (void); static void TL_CreateTmpTableNotCodes (void);
static void TL_CreateTmpTableCurrentTimeline (void);
static void TL_CreateTmpTablePublishers (void); static void TL_CreateTmpTablePublishers (void);
static void TL_DropTmpTablesUsedToQueryTimeline (void); static void TL_DropTmpTablesUsedToQueryTimeline (void);
static void TL_CreateSubQueryPublishers (const struct TL_Timeline *Timeline, static void TL_CreateSubQueryPublishers (const struct TL_Timeline *Timeline,
struct TL_SubQueries *SubQueries); struct TL_SubQueries *SubQueries);
static void TL_CreateSubQueryAlreadyExists (const struct TL_Timeline *Timeline, static void TL_CreateSubQueryAlreadyExists (struct TL_SubQueries *SubQueries);
struct TL_SubQueries *SubQueries);
static void TL_CreateSubQueryRangeBottom (const struct TL_RangePubsToGet *RangePubsToGet, static void TL_CreateSubQueryRangeBottom (const struct TL_RangePubsToGet *RangePubsToGet,
struct TL_SubQueries *SubQueries); struct TL_SubQueries *SubQueries);
static void TL_CreateSubQueryRangeTop (const struct TL_RangePubsToGet *RangePubsToGet, static void TL_CreateSubQueryRangeTop (const struct TL_RangePubsToGet *RangePubsToGet,
@ -669,13 +667,12 @@ static void TL_BuildQueryToGetTimeline (struct TL_Timeline *Timeline,
/***** Create some temporary tables *****/ /***** Create some temporary tables *****/
TL_CreateTmpTablePubCodes (); TL_CreateTmpTablePubCodes ();
TL_CreateTmpTableNotCodes (); TL_CreateTmpTableNotCodes ();
TL_CreateTmpTableCurrentTimeline ();
/***** Create temporary table and subquery with potential publishers *****/ /***** Create temporary table and subquery with potential publishers *****/
TL_CreateSubQueryPublishers (Timeline,&SubQueries); TL_CreateSubQueryPublishers (Timeline,&SubQueries);
/***** Create subquery to get only notes not present in timeline *****/ /***** Create subquery to get only notes not present in timeline *****/
TL_CreateSubQueryAlreadyExists (Timeline,&SubQueries); TL_CreateSubQueryAlreadyExists (&SubQueries);
/***** Get the publications in timeline *****/ /***** Get the publications in timeline *****/
/* Initialize range of pubs: /* Initialize range of pubs:
@ -760,11 +757,6 @@ static void TL_BuildQueryToGetTimeline (struct TL_Timeline *Timeline,
DB_QueryINSERT ("can not store note code", DB_QueryINSERT ("can not store note code",
"INSERT INTO tl_tmp_not_codes SET NotCod=%ld", "INSERT INTO tl_tmp_not_codes SET NotCod=%ld",
NotCod); NotCod);
/* Insert note code in temporary table */
DB_QueryINSERT ("can not store note code",
"INSERT INTO tl_tmp_current_timeline SET NotCod=%ld",
NotCod);
} }
else // Nothing got ==> abort loop else // Nothing got ==> abort loop
break; // Last publication break; // Last publication
@ -894,19 +886,6 @@ static void TL_CreateTmpTableNotCodes (void)
" ENGINE=MEMORY"); " ENGINE=MEMORY");
} }
static void TL_CreateTmpTableCurrentTimeline (void)
{
/***** Create temporary table with notes
already present in timeline for this session *****/
DB_Query ("can not create temporary table",
"CREATE TEMPORARY TABLE tl_tmp_current_timeline "
"(NotCod BIGINT NOT NULL,"
"INDEX(NotCod))"
" ENGINE=MEMORY"
" SELECT NotCod FROM tl_timelines WHERE SessionId='%s'",
Gbl.Session.Id);
}
static void TL_CreateTmpTablePublishers (void) static void TL_CreateTmpTablePublishers (void)
{ {
/***** Create temporary table with me and the users I follow *****/ /***** Create temporary table with me and the users I follow *****/
@ -934,7 +913,6 @@ static void TL_DropTmpTablesUsedToQueryTimeline (void)
"DROP TEMPORARY TABLE IF EXISTS " "DROP TEMPORARY TABLE IF EXISTS "
"tl_tmp_pub_codes," "tl_tmp_pub_codes,"
"tl_tmp_not_codes," "tl_tmp_not_codes,"
"tl_tmp_current_timeline,"
"tl_tmp_publishers"); "tl_tmp_publishers");
} }
@ -985,25 +963,12 @@ static void TL_CreateSubQueryPublishers (const struct TL_Timeline *Timeline,
/********* Create subquery to get only notes not present in timeline *********/ /********* Create subquery to get only notes not present in timeline *********/
/*****************************************************************************/ /*****************************************************************************/
static void TL_CreateSubQueryAlreadyExists (const struct TL_Timeline *Timeline, static void TL_CreateSubQueryAlreadyExists (struct TL_SubQueries *SubQueries)
struct TL_SubQueries *SubQueries)
{ {
switch (Timeline->WhatToGet) Str_Copy (SubQueries->AlreadyExists,
{ " tl_pubs.NotCod NOT IN"
case TL_GET_ONLY_NEW_PUBS: " (SELECT NotCod FROM tl_tmp_not_codes)", // Avoid notes already got
case TL_GET_RECENT_TIMELINE: TL_MAX_BYTES_SUBQUERY);
Str_Copy (SubQueries->AlreadyExists,
" tl_pubs.NotCod NOT IN"
" (SELECT NotCod FROM tl_tmp_not_codes)", // Avoid notes already got
TL_MAX_BYTES_SUBQUERY);
break;
case TL_GET_ONLY_OLD_PUBS:
Str_Copy (SubQueries->AlreadyExists,
" tl_pubs.NotCod NOT IN"
" (SELECT NotCod FROM tl_tmp_current_timeline)",
TL_MAX_BYTES_SUBQUERY);
break;
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4456,6 +4421,24 @@ static void TL_ClearTimelineThisSession (void)
static void TL_AddNotesJustRetrievedToTimelineThisSession (void) static void TL_AddNotesJustRetrievedToTimelineThisSession (void)
{ {
/* tl_timelines contains the distinct notes in timeline of each open session:
mysql> SELECT SessionId,COUNT(*) FROM tl_timelines GROUP BY SessionId;
+---------------------------------------------+----------+
| SessionId | COUNT(*) |
+---------------------------------------------+----------+
| u-X-R3gKki7eKMXrNCP8bGhwOAZuVngRy7FNGZFMKzI | 52 | --> 52 distinct notes
| u1CoqL1YWl3_hR4wk4bI7vhnc-uRcCmIDyKYAgBB6kk | 10 |
| u8xqamzkorHfY4BvYRMXjNhzHvQyigZUZemO0YiMn48 | 10 |
| u_n2V_L3KrFjnd4SqZk0gxMFwZHRuWZ8_EIVTU9sdpI | 10 |
| V6pGe1kGGS_uO5i__waqXKnuDkPYaDZHNAYr-Zv-GJQ | 2 |
| vqDRz-iiM8v10Dl8ThwqIqmDRIklz8szJaqflwXZucs | 10 |
| w11juqKPx6lg-f_pL2ZBYqlagU1mEepSvvk9L3gDGac | 10 | --> 10 distinct notes
| wLg4e8KQljCcVuFWIkJjNeti89kAiwOZ3iyXdzm_eDk | 10 |
| wnU85YrwJHhZGWIZhd7LQfQTPrclIWHfMF3DcB-Rcgw | 4 |
| wRzRJFnHfzW61fZYnvMIaMRlkuWUeEyqXVQ6JeWA32k | 11 |
+---------------------------------------------+----------+
10 rows in set (0,01 sec)
*/
DB_QueryINSERT ("can not insert notes in timeline", DB_QueryINSERT ("can not insert notes in timeline",
"INSERT IGNORE INTO tl_timelines" "INSERT IGNORE INTO tl_timelines"
" (SessionId,NotCod)" " (SessionId,NotCod)"