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

Version 15.110.10

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-01-13 00:24:26 +01:00
parent ffe7bb906a
commit 2b4bf92a45
2 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -122,13 +122,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.110.9 (2016-01-12)" #define Log_PLATFORM_VERSION "SWAD 15.110.10 (2016-01-13)"
#define CSS_FILE "swad15.110.2.css" #define CSS_FILE "swad15.110.2.css"
#define JS_FILE "swad15.107.2.js" #define JS_FILE "swad15.107.2.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.110.10:Jan 13, 2016 New temporary tables used to optimize querying timeline. (192398 lines)
Version 15.110.9: Jan 12, 2016 Do not get social notes already present in timeline. (192388 lines) Version 15.110.9: Jan 12, 2016 Do not get social notes already present in timeline. (192388 lines)
Version 15.110.8: Jan 12, 2016 Insert social notes in current social timeline in database. Version 15.110.8: Jan 12, 2016 Insert social notes in current social timeline in database.
Show old social notes only if they are not already shown in timeline. (192354 lines) Show old social notes only if they are not already shown in timeline. (192354 lines)

87
swad_social.c
View File

@ -198,7 +198,7 @@ static void Soc_BuildQueryToGetTimelineGbl (Soc_WhatToGetFromTimeline_t WhatToGe
static long Soc_GetPubCodFromSession (const char *FieldName); static long Soc_GetPubCodFromSession (const char *FieldName);
static void Soc_UpdateLastPubCodIntoSession (void); static void Soc_UpdateLastPubCodIntoSession (void);
static void Soc_UpdateFirstPubCodIntoSession (long FirstPubCod); static void Soc_UpdateFirstPubCodIntoSession (long FirstPubCod);
static void Soc_DropTemporaryTableWithPubCods (void); static void Soc_DropTemporaryTablesUsedToQueryTimeline (void);
static void Soc_ShowTimeline (const char *Query,const char *Title); static void Soc_ShowTimeline (const char *Query,const char *Title);
static void Soc_ShowNewPubsInTimeline (const char *Query); static void Soc_ShowNewPubsInTimeline (const char *Query);
@ -321,8 +321,8 @@ void Soc_ShowTimelineGbl (void)
/***** Show timeline *****/ /***** Show timeline *****/
Soc_ShowTimeline (Query,Txt_Public_activity); Soc_ShowTimeline (Query,Txt_Public_activity);
/***** Drop temporary table with publishing codes *****/ /***** Drop temporary tables *****/
Soc_DropTemporaryTableWithPubCods (); Soc_DropTemporaryTablesUsedToQueryTimeline ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -339,8 +339,8 @@ void Soc_GetAndShowNewTimelineGbl (void)
/***** Show new timeline *****/ /***** Show new timeline *****/
Soc_ShowNewPubsInTimeline (Query); Soc_ShowNewPubsInTimeline (Query);
/***** Drop temporary table with publishing codes *****/ /***** Drop temporary tables *****/
Soc_DropTemporaryTableWithPubCods (); Soc_DropTemporaryTablesUsedToQueryTimeline ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -357,8 +357,8 @@ void Soc_GetAndShowOldTimelineGbl (void)
/***** Show old timeline *****/ /***** Show old timeline *****/
Soc_ShowOldPubsInTimeline (Query); Soc_ShowOldPubsInTimeline (Query);
/***** Drop temporary table with publishing codes *****/ /***** Drop temporary tables *****/
Soc_DropTemporaryTableWithPubCods (); Soc_DropTemporaryTablesUsedToQueryTimeline ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -373,10 +373,39 @@ static void Soc_BuildQueryToGetTimelineGbl (Soc_WhatToGetFromTimeline_t WhatToGe
long LastPubCod; long LastPubCod;
long FirstPubCod; long FirstPubCod;
/***** Remove temporary table with publishing codes *****/ /***** Drop temporary tables *****/
sprintf (Query,"DROP TEMPORARY TABLE IF EXISTS pub_cods"); Soc_DropTemporaryTablesUsedToQueryTimeline ();
/***** Create temporary table with potential publishers *****/
sprintf (Query,"CREATE TEMPORARY TABLE publishers "
"(UsrCod INT NOT NULL,"
"UNIQUE INDEX(UsrCod)) ENGINE=MEMORY"
" SELECT '%ld' AS UsrCod"
" UNION"
" SELECT FollowedCod AS UsrCod"
" FROM usr_follow WHERE FollowerCod='%ld'",
Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
if (mysql_query (&Gbl.mysql,Query)) if (mysql_query (&Gbl.mysql,Query))
DB_ExitOnMySQLError ("can not remove temporary tables"); DB_ExitOnMySQLError ("can not create temporary table");
/***** Create temporary table with notes already present in current timeline *****/
switch (WhatToGetFromTimeline)
{
case Soc_GET_ONLY_OLD_PUBS:
case Soc_GET_RECENT_TIMELINE:
sprintf (Query,"CREATE TEMPORARY TABLE current_timeline "
"(NotCod BIGINT NOT NULL,"
"UNIQUE INDEX(NotCod)) ENGINE=MEMORY"
" SELECT NotCod FROM social_timelines WHERE SessionId='%s'",
Gbl.Session.Id);
if (mysql_query (&Gbl.mysql,Query))
DB_ExitOnMySQLError ("can not create temporary table");
break;
case Soc_GET_ONLY_NEW_PUBS:
// Get publishings even if they are already present in current timeline
break;
}
/***** Create temporary table with publishing codes *****/ /***** Create temporary table with publishing codes *****/
// Get the maximum PubCod -more recent publishing (original, shared or commment)- // Get the maximum PubCod -more recent publishing (original, shared or commment)-
@ -390,17 +419,10 @@ static void Soc_BuildQueryToGetTimelineGbl (Soc_WhatToGetFromTimeline_t WhatToGe
"UNIQUE INDEX(NewestPubForNote)) ENGINE=MEMORY" "UNIQUE INDEX(NewestPubForNote)) ENGINE=MEMORY"
" SELECT MAX(PubCod) AS NewestPubForNote" " SELECT MAX(PubCod) AS NewestPubForNote"
" FROM social_pubs" " FROM social_pubs"
" WHERE PublisherCod IN" " WHERE PublisherCod IN (SELECT UsrCod FROM publishers)"
" (SELECT '%ld'" " AND NotCod NOT IN (SELECT NotCod FROM current_timeline)"
" UNION"
" SELECT FollowedCod FROM usr_follow WHERE FollowerCod='%ld')"
" AND NotCod NOT IN"
" (SELECT NotCod FROM social_timelines WHERE SessionId='%s')"
" GROUP BY NotCod" " GROUP BY NotCod"
" ORDER BY NewestPubForNote DESC LIMIT %u", " ORDER BY NewestPubForNote DESC LIMIT %u",
Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Session.Id,
Soc_MAX_RECENT_PUBS_TO_SHOW); Soc_MAX_RECENT_PUBS_TO_SHOW);
break; break;
case Soc_GET_ONLY_NEW_PUBS: case Soc_GET_ONLY_NEW_PUBS:
@ -415,15 +437,10 @@ static void Soc_BuildQueryToGetTimelineGbl (Soc_WhatToGetFromTimeline_t WhatToGe
"UNIQUE INDEX(NewestPubForNote)) ENGINE=MEMORY" "UNIQUE INDEX(NewestPubForNote)) ENGINE=MEMORY"
" SELECT MAX(PubCod) AS NewestPubForNote" " SELECT MAX(PubCod) AS NewestPubForNote"
" FROM social_pubs" " FROM social_pubs"
" WHERE %sPublisherCod IN" " WHERE %sPublisherCod IN (SELECT UsrCod FROM publishers)"
" (SELECT '%ld'"
" UNION"
" SELECT FollowedCod FROM usr_follow WHERE FollowerCod='%ld')"
" GROUP BY NotCod" " GROUP BY NotCod"
" ORDER BY NewestPubForNote DESC", " ORDER BY NewestPubForNote DESC",
SubQueryRangePubs, SubQueryRangePubs);
Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
break; break;
case Soc_GET_ONLY_OLD_PUBS: case Soc_GET_ONLY_OLD_PUBS:
// Get some limited publishings older than FirstPubCod // Get some limited publishings older than FirstPubCod
@ -437,18 +454,11 @@ static void Soc_BuildQueryToGetTimelineGbl (Soc_WhatToGetFromTimeline_t WhatToGe
"UNIQUE INDEX(NewestPubForNote)) ENGINE=MEMORY" "UNIQUE INDEX(NewestPubForNote)) ENGINE=MEMORY"
" SELECT MAX(PubCod) AS NewestPubForNote" " SELECT MAX(PubCod) AS NewestPubForNote"
" FROM social_pubs" " FROM social_pubs"
" WHERE %sPublisherCod IN" " WHERE %sPublisherCod IN (SELECT UsrCod FROM publishers)"
" (SELECT '%ld'" " AND NotCod NOT IN (SELECT NotCod FROM current_timeline)"
" UNION"
" SELECT FollowedCod FROM usr_follow WHERE FollowerCod='%ld')"
" AND NotCod NOT IN"
" (SELECT NotCod FROM social_timelines WHERE SessionId='%s')"
" GROUP BY NotCod" " GROUP BY NotCod"
" ORDER BY NewestPubForNote DESC LIMIT %u", " ORDER BY NewestPubForNote DESC LIMIT %u",
SubQueryRangePubs, SubQueryRangePubs,
Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Session.Id,
Soc_MAX_OLD_PUBS_TO_GET_AND_SHOW); Soc_MAX_OLD_PUBS_TO_GET_AND_SHOW);
break; break;
} }
@ -526,14 +536,15 @@ static void Soc_UpdateFirstPubCodIntoSession (long FirstPubCod)
} }
/*****************************************************************************/ /*****************************************************************************/
/**************** Drop temporary table with publishing codes *****************/ /*************** Drop temporary tables used to query timeline ****************/
/*****************************************************************************/ /*****************************************************************************/
static void Soc_DropTemporaryTableWithPubCods (void) static void Soc_DropTemporaryTablesUsedToQueryTimeline (void)
{ {
char Query[128]; char Query[128];
sprintf (Query,"DROP TEMPORARY TABLE IF EXISTS pub_cods"); sprintf (Query,"DROP TEMPORARY TABLE IF EXISTS"
" pub_cods,publishers,current_timeline");
if (mysql_query (&Gbl.mysql,Query)) if (mysql_query (&Gbl.mysql,Query))
DB_ExitOnMySQLError ("can not remove temporary tables"); DB_ExitOnMySQLError ("can not remove temporary tables");
} }