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

Version20.15.2

Browse Source
This commit is contained in:
acanas 2021-02-08 22:56:05 +01:00
parent 1ae73c0b4a
commit 8cd7f380f0
2 changed files with 87 additions and 61 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:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 20.15.1 (2021-02-08)"
#define Log_PLATFORM_VERSION "SWAD 20.15.2 (2021-02-08)"
#define CSS_FILE "swad20.8.css"
#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.
Version 20.15.2: Feb 08, 2021 Code refactoring in timeline. (305151 lines)
Version 20.15.1: Feb 08, 2021 Code refactoring in timeline. (305128 lines)
Version 20.15: Feb 08, 2021 Code refactoring in timeline. (305118 lines)
Version 20.14.4: Feb 08, 2021 Code refactoring in timeline. (305096 lines)

145
swad_timeline.c
View File

@ -136,6 +136,12 @@
*/
struct TL_RangePubsToGet
{
long Top;
long Bottom;
};
/*****************************************************************************/
/************** External global variables from others modules ****************/
/*****************************************************************************/
@ -181,6 +187,12 @@ static void TL_CreateSubQueryPublishers (const struct TL_Timeline *Timeline,
char SubQueryPublishers[TL_MAX_BYTES_SUBQUERY + 1]);
static void TL_CreateSubQueryAlreadyExists (const struct TL_Timeline *Timeline,
char SubQueryAlreadyExists[TL_MAX_BYTES_SUBQUERY + 1]);
static void TL_CreateSubQueryRangeBottom (const struct TL_Timeline *Timeline,
const struct TL_RangePubsToGet *RangePubsToGet,
char SubQueryRangeBottom[TL_MAX_BYTES_SUBQUERY + 1]);
static void TL_CreateSubQueryRangeTop (const struct TL_Timeline *Timeline,
const struct TL_RangePubsToGet *RangePubsToGet,
char SubQueryRangeTop[TL_MAX_BYTES_SUBQUERY + 1]);
static void TL_ShowTimeline (struct TL_Timeline *Timeline,
char *Query,
@ -597,11 +609,7 @@ static void TL_BuildQueryToGetTimeline (struct TL_Timeline *Timeline,
char SubQueryRangeBottom[TL_MAX_BYTES_SUBQUERY + 1];
char SubQueryRangeTop[TL_MAX_BYTES_SUBQUERY + 1];
char SubQueryAlreadyExists[TL_MAX_BYTES_SUBQUERY + 1];
struct
{
long Top;
long Bottom;
} RangePubsToGet;
struct TL_RangePubsToGet RangePubsToGet;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned MaxPubsToGet = TL_GetMaxPubsToGet (Timeline);
@ -686,61 +694,8 @@ static void TL_BuildQueryToGetTimeline (struct TL_Timeline *Timeline,
NumPub++)
{
/* Create subqueries with range of publications to get from tl_pubs */
if (RangePubsToGet.Bottom > 0)
switch (Timeline->UsrOrGbl)
{
case TL_TIMELINE_USR: // Show the timeline of a user
sprintf (SubQueryRangeBottom,"PubCod>%ld AND ",
RangePubsToGet.Bottom);
break;
case TL_TIMELINE_GBL: // Show the global timeline
switch (Timeline->Who)
{
case Usr_WHO_ME: // Show my timeline
case Usr_WHO_ALL: // Show the timeline of all users
sprintf (SubQueryRangeBottom,"PubCod>%ld AND ",
RangePubsToGet.Bottom);
break;
case Usr_WHO_FOLLOWED:// Show the timeline of the users I follow
sprintf (SubQueryRangeBottom,"tl_pubs.PubCod>%ld AND ",
RangePubsToGet.Bottom);
break;
default:
Lay_WrongWhoExit ();
break;
}
break;
}
else
SubQueryRangeBottom[0] = '\0';
if (RangePubsToGet.Top > 0)
switch (Timeline->UsrOrGbl)
{
case TL_TIMELINE_USR: // Show the timeline of a user
sprintf (SubQueryRangeTop,"PubCod<%ld AND ",
RangePubsToGet.Top);
break;
case TL_TIMELINE_GBL: // Show the global timeline
switch (Timeline->Who)
{
case Usr_WHO_ME: // Show my timeline
case Usr_WHO_ALL: // Show the timeline of all users
sprintf (SubQueryRangeTop,"PubCod<%ld AND ",
RangePubsToGet.Top);
break;
case Usr_WHO_FOLLOWED:// Show the timeline of the users I follow
sprintf (SubQueryRangeTop,"tl_pubs.PubCod<%ld AND ",
RangePubsToGet.Top);
break;
default:
Lay_WrongWhoExit ();
break;
}
break;
}
else
SubQueryRangeTop[0] = '\0';
TL_CreateSubQueryRangeBottom (Timeline,&RangePubsToGet,SubQueryRangeBottom);
TL_CreateSubQueryRangeTop (Timeline,&RangePubsToGet,SubQueryRangeTop);
/* Select the most recent publication from tl_pubs */
NumPubs = 0; // Initialized to avoid warning
@ -1090,6 +1045,76 @@ static void TL_CreateSubQueryAlreadyExists (const struct TL_Timeline *Timeline,
}
}
/*****************************************************************************/
/***** Create subqueries with range of publications to get from tl_pubs ******/
/*****************************************************************************/
static void TL_CreateSubQueryRangeBottom (const struct TL_Timeline *Timeline,
const struct TL_RangePubsToGet *RangePubsToGet,
char SubQueryRangeBottom[TL_MAX_BYTES_SUBQUERY + 1])
{
if (RangePubsToGet->Bottom > 0)
switch (Timeline->UsrOrGbl)
{
case TL_TIMELINE_USR: // Show the timeline of a user
sprintf (SubQueryRangeBottom,"PubCod>%ld AND ",
RangePubsToGet->Bottom);
break;
case TL_TIMELINE_GBL: // Show the global timeline
switch (Timeline->Who)
{
case Usr_WHO_ME: // Show my timeline
case Usr_WHO_ALL: // Show the timeline of all users
sprintf (SubQueryRangeBottom,"PubCod>%ld AND ",
RangePubsToGet->Bottom);
break;
case Usr_WHO_FOLLOWED:// Show the timeline of the users I follow
sprintf (SubQueryRangeBottom,"tl_pubs.PubCod>%ld AND ",
RangePubsToGet->Bottom);
break;
default:
Lay_WrongWhoExit ();
break;
}
break;
}
else
SubQueryRangeBottom[0] = '\0';
}
static void TL_CreateSubQueryRangeTop (const struct TL_Timeline *Timeline,
const struct TL_RangePubsToGet *RangePubsToGet,
char SubQueryRangeTop[TL_MAX_BYTES_SUBQUERY + 1])
{
if (RangePubsToGet->Top > 0)
switch (Timeline->UsrOrGbl)
{
case TL_TIMELINE_USR: // Show the timeline of a user
sprintf (SubQueryRangeTop,"PubCod<%ld AND ",
RangePubsToGet->Top);
break;
case TL_TIMELINE_GBL: // Show the global timeline
switch (Timeline->Who)
{
case Usr_WHO_ME: // Show my timeline
case Usr_WHO_ALL: // Show the timeline of all users
sprintf (SubQueryRangeTop,"PubCod<%ld AND ",
RangePubsToGet->Top);
break;
case Usr_WHO_FOLLOWED:// Show the timeline of the users I follow
sprintf (SubQueryRangeTop,"tl_pubs.PubCod<%ld AND ",
RangePubsToGet->Top);
break;
default:
Lay_WrongWhoExit ();
break;
}
break;
}
else
SubQueryRangeTop[0] = '\0';
}
/*****************************************************************************/
/******************************* Show timeline *******************************/
/*****************************************************************************/