Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.110

This commit is contained in:
Antonio Cañas Vargas 2016-01-12 01:56:58 +01:00
parent c225bb75b5
commit 0ba4cfb429
5 changed files with 124 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/swad.sql
View File

@ -967,7 +967,7 @@ CREATE TABLE IF NOT EXISTS social_timeline (
PubType TINYINT NOT NULL,
TimePublish DATETIME NOT NULL,
UNIQUE INDEX(PubCod),
UNIQUE INDEX(NotCod,PublisherCod),
INDEX(NotCod,PublisherCod,PubType),
INDEX(PublisherCod),
INDEX(PubType),
INDEX(TimePublish));

8
swad_changelog.h
View File

@ -123,14 +123,18 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.109.1 (2016-01-11)"
#define Log_PLATFORM_VERSION "SWAD 15.110 (2016-01-12)"
#define CSS_FILE "swad15.107.2.css"
#define JS_FILE "swad15.107.2.js"
// 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
/*
Version 15.109.2: Jan 11, 2016 Comments are included in database table for timeline. (? lines)
Version 15.110: Jan 12, 2016 Comments are included in database table for timeline. (192352 lines)
2 changes necessary in database:
DROP INDEX NotCod ON social_timeline;
CREATE INDEX NotCod ON social_timeline (NotCod,PublisherCod,PubType);
Version 15.109.1: Jan 11, 2016 New field with the type of publishing in the database table for timeline. (192264 lines)
5 changes necessary in database:
ALTER TABLE social_timeline ADD COLUMN PubType TINYINT NOT NULL AFTER PublisherCod,ADD INDEX (PubType);

2
swad_database.c
View File

@ -2047,7 +2047,7 @@ mysql> DESCRIBE social_timeline;
"PubType TINYINT NOT NULL,"
"TimePublish DATETIME NOT NULL,"
"UNIQUE INDEX(PubCod),"
"UNIQUE INDEX(NotCod,PublisherCod),"
"INDEX(NotCod,PublisherCod,PubType),"
"INDEX(PublisherCod),"
"INDEX(PubType),"
"INDEX(TimePublish))");

144
swad_social.c
View File

@ -507,7 +507,7 @@ static void Soc_DropTemporaryTableWithPubCods (void)
static void Soc_ShowTimeline (const char *Query,const char *Title)
{
extern const char *Txt_No_public_activity;
// extern const char *Txt_No_public_activity;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumPubsGot;
@ -520,8 +520,8 @@ static void Soc_ShowTimeline (const char *Query,const char *Title)
NumPubsGot = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");
/***** List my timeline *****/
if (NumPubsGot) // Publishings found in timeline
{
// if (NumPubsGot) // Publishings found in timeline
// {
/***** Start frame *****/
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Title);
@ -571,9 +571,9 @@ static void Soc_ShowTimeline (const char *Query,const char *Title)
/***** End frame *****/
Lay_EndRoundFrame ();
}
else // No publishing found in timeline
Lay_ShowAlert (Lay_INFO,Txt_No_public_activity);
// }
// else // No publishing found in timeline
// Lay_ShowAlert (Lay_INFO,Txt_No_public_activity);
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
@ -1584,9 +1584,14 @@ static unsigned long Soc_GetNumCommentsInSocialNote (long NotCod)
{
char Query[128];
/*
sprintf (Query,"SELECT COUNT(*) FROM social_comments"
" WHERE NotCod='%ld'",
NotCod);
*/
sprintf (Query,"SELECT COUNT(*) FROM social_timeline"
" WHERE NotCod='%ld' AND PubType='%u'",
NotCod,(unsigned) Soc_PUB_COMMENT_TO_NOTE);
return DB_QueryCOUNT (Query,"can not get number of comments in a social note");
}
@ -1605,6 +1610,7 @@ static void Soc_WriteCommentsInSocialNote (long NotCod,
struct SocialComment SocCom;
/***** Get comments of this social note from database *****/
/*
sprintf (Query,"SELECT social_comments.ComCod,social_comments.UsrCod,"
"social_comments.NotCod,"
"UNIX_TIMESTAMP(social_comments.TimeComment),"
@ -1614,6 +1620,17 @@ static void Soc_WriteCommentsInSocialNote (long NotCod,
" AND social_comments.ComCod=social_comments_content.ComCod"
" ORDER BY social_comments.ComCod",
NotCod);
*/
sprintf (Query,"SELECT social_timeline.PubCod,social_timeline.PublisherCod,"
"social_timeline.NotCod,"
"UNIX_TIMESTAMP(social_timeline.TimePublish),"
"social_comments_content.Content"
" FROM social_timeline,social_comments_content"
" WHERE social_timeline.NotCod='%ld'"
" AND social_timeline.PubType='%u'"
" AND social_timeline.PubCod=social_comments_content.ComCod"
" ORDER BY social_timeline.PubCod",
NotCod,(unsigned) Soc_PUB_COMMENT_TO_NOTE);
NumComments = DB_QuerySELECT (Query,&mysql_res,"can not get social comments");
/***** List comments *****/
@ -1971,7 +1988,8 @@ static void Soc_ReceiveComment (void)
char Content[Cns_MAX_BYTES_LONG_TEXT+1];
char Query[128+Cns_MAX_BYTES_LONG_TEXT];
struct SocialNote SocNot;
long ComCod;
struct SocialPublishing SocPub;
// long ComCod;
/***** Get data of social note *****/
SocNot.NotCod = Soc_GetParamNotCod ();
@ -1989,16 +2007,26 @@ static void Soc_ReceiveComment (void)
if (Soc_CheckIfICanCommentNote (SocNot.NotCod))
{
/***** Publish *****/
/* Insert into publishings */
SocPub.NotCod = SocNot.NotCod;
SocPub.PublisherCod = Gbl.Usrs.Me.UsrDat.UsrCod;
SocPub.PubType = Soc_PUB_COMMENT_TO_NOTE;
Soc_PublishSocialNoteInTimeline (&SocPub); // Set SocPub.PubCod
/* Insert comment in the database */
/*
sprintf (Query,"INSERT INTO social_comments (NotCod,UsrCod,TimeComment)"
" VALUES ('%ld','%ld',NOW())",
SocNot.NotCod,Gbl.Usrs.Me.UsrDat.UsrCod);
ComCod = DB_QueryINSERTandReturnCode (Query,"can not create comment");
*/
/* Insert comment content in the database */
sprintf (Query,"INSERT INTO social_comments_content (ComCod,Content)"
" VALUES ('%ld','%s')",
ComCod,Content);
// ComCod,
SocPub.PubCod,
Content);
DB_QueryINSERT (Query,"can not store comment content");
/***** Message of success *****/
@ -2358,6 +2386,30 @@ static void Soc_RemoveASocialNoteFromDB (struct SocialNote *SocNot)
{
char Query[256];
/***** Remove content of the comments of this social note *****/
/*
sprintf (Query,"DELETE FROM social_comments_content"
" USING social_comments,social_comments_content"
" WHERE social_comments.NotCod='%ld'"
" AND social_comments.ComCod=social_comments_content.ComCod",
SocNot->NotCod);
*/
sprintf (Query,"DELETE FROM social_comments_content"
" USING social_timeline,social_comments_content"
" WHERE social_timeline.NotCod='%ld'"
" AND social_timeline.PubType='%u'"
" AND social_timeline.PubCod=social_comments_content.ComCod",
SocNot->NotCod,(unsigned) Soc_PUB_COMMENT_TO_NOTE);
DB_QueryDELETE (Query,"can not remove social comments");
/***** Remove comments of this social note *****/
/*
sprintf (Query,"DELETE FROM social_comments"
" WHERE NotCod='%ld'",
SocNot->NotCod);
DB_QueryDELETE (Query,"can not remove social comments");
*/
/***** Remove all the social publishings of this note *****/
sprintf (Query,"DELETE FROM social_timeline WHERE NotCod='%ld'",
SocNot->NotCod);
@ -2380,20 +2432,6 @@ static void Soc_RemoveASocialNoteFromDB (struct SocialNote *SocNot)
DB_QueryDELETE (Query,"can not remove a social post");
}
/***** Remove content of the comments of this social note *****/
sprintf (Query,"DELETE FROM social_comments_content"
" USING social_comments,social_comments_content"
" WHERE social_comments.NotCod='%ld'"
" AND social_comments.ComCod=social_comments_content.ComCod",
SocNot->NotCod);
DB_QueryDELETE (Query,"can not remove social comments");
/***** Remove comments of this social note *****/
sprintf (Query,"DELETE FROM social_comments"
" WHERE NotCod='%ld'",
SocNot->NotCod);
DB_QueryDELETE (Query,"can not remove social comments");
/***** Reset social note *****/
Soc_ResetSocialNote (SocNot);
}
@ -2551,11 +2589,20 @@ static void Soc_RemoveASocialCommentFromDB (struct SocialComment *SocCom)
DB_QueryDELETE (Query,"can not remove a social comment");
/***** Remove this social comment *****/
/*
sprintf (Query,"DELETE FROM social_comments"
" WHERE ComCod='%ld'"
" AND UsrCod='%ld'", // Extra check: I am the author
SocCom->ComCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
*/
sprintf (Query,"DELETE FROM social_timeline"
" WHERE PubCod='%ld'"
" AND PublisherCod='%ld'" // Extra check: I am the author
" AND PubType='%u'", // Extra check: it's a comment
SocCom->ComCod,
Gbl.Usrs.Me.UsrDat.UsrCod,
(unsigned) Soc_PUB_COMMENT_TO_NOTE);
DB_QueryDELETE (Query,"can not remove a social comment");
/***** Reset social comment *****/
@ -2572,34 +2619,60 @@ void Soc_RemoveUsrSocialContent (long UsrCod)
/***** Remove social comments *****/
/* Remove content of all the comments in all the social notes of the user */
/*
sprintf (Query,"DELETE FROM social_comments_content"
" USING social_comments,social_comments_content"
" WHERE social_comments.NotCod IN"
" (SELECT NotCod FROM social_notes WHERE UsrCod='%ld')"
" AND social_comments.ComCod=social_comments_content.ComCod",
UsrCod);
*/
sprintf (Query,"DELETE FROM social_comments_content"
" USING social_timeline,social_comments_content"
" WHERE social_timeline.NotCod IN"
" (SELECT NotCod FROM social_notes WHERE UsrCod='%ld')"
" AND social_timeline.PubType='%u'"
" AND social_timeline.PubCod=social_comments_content.ComCod",
UsrCod,(unsigned) Soc_PUB_COMMENT_TO_NOTE);
DB_QueryDELETE (Query,"can not remove social comments");
/* Remove all the comments in all the social notes of the user */
/* Remove all the comments from any user in any social note of the user */
/*
sprintf (Query,"DELETE FROM social_comments"
" WHERE NotCod IN"
" (SELECT NotCod FROM social_notes WHERE UsrCod='%ld')",
UsrCod);
*/
sprintf (Query,"DELETE FROM social_timeline"
" WHERE NotCod IN"
" (SELECT NotCod FROM social_notes WHERE UsrCod='%ld')"
" AND social_timeline.PubType='%u'",
UsrCod,(unsigned) Soc_PUB_COMMENT_TO_NOTE);
DB_QueryDELETE (Query,"can not remove social comments");
/* Remove content of all the comments of the user in any social note */
/*
sprintf (Query,"DELETE FROM social_comments_content"
" USING social_comments,social_comments_content"
" WHERE social_comments.UsrCod='%ld'"
" AND social_comments.ComCod=social_comments_content.ComCod",
UsrCod);
*/
sprintf (Query,"DELETE FROM social_comments_content"
" USING social_timeline,social_comments_content"
" WHERE social_timeline.PublisherCod='%ld'"
" AND social_timeline.PubType='%u'"
" AND social_timeline.PubCod=social_comments_content.ComCod",
UsrCod,(unsigned) Soc_PUB_COMMENT_TO_NOTE);
DB_QueryDELETE (Query,"can not remove social comments");
/* Remove all the comments of the user in any social note */
/*
sprintf (Query,"DELETE FROM social_comments"
" WHERE UsrCod='%ld'",
UsrCod);
DB_QueryDELETE (Query,"can not remove social comments");
*/
/***** Remove all the social posts of the user *****/
sprintf (Query,"DELETE FROM social_posts"
@ -2609,13 +2682,7 @@ void Soc_RemoveUsrSocialContent (long UsrCod)
UsrCod,(unsigned) Soc_NOTE_SOCIAL_POST);
DB_QueryDELETE (Query,"can not remove social posts");
/***** Remove all the social publishings of the user *****/
sprintf (Query,"DELETE FROM social_timeline"
" WHERE PublisherCod='%ld'",
UsrCod);
DB_QueryDELETE (Query,"can not remove social publishings");
/***** Remove all the social publishings authored by the user *****/
/***** Remove all the social publishings of any user authored by the user *****/
sprintf (Query,"DELETE FROM social_timeline"
" USING social_notes,social_timeline"
" WHERE social_notes.UsrCod='%ld'"
@ -2623,6 +2690,12 @@ void Soc_RemoveUsrSocialContent (long UsrCod)
UsrCod);
DB_QueryDELETE (Query,"can not remove social publishings");
/***** Remove all the social publishings of the user *****/
sprintf (Query,"DELETE FROM social_timeline"
" WHERE PublisherCod='%ld'",
UsrCod);
DB_QueryDELETE (Query,"can not remove social publishings");
/***** Remove all the social notes of the user *****/
sprintf (Query,"DELETE FROM social_notes"
" WHERE UsrCod='%ld'",
@ -2795,6 +2868,7 @@ static void Soc_GetDataOfSocialCommentByCod (struct SocialComment *SocCom)
if (SocCom->ComCod > 0)
{
/***** Get data of social comment from database *****/
/*
sprintf (Query,"SELECT social_comments.ComCod,social_comments.UsrCod,"
"social_comments.NotCod,"
"UNIX_TIMESTAMP(social_comments.TimeComment),"
@ -2803,6 +2877,16 @@ static void Soc_GetDataOfSocialCommentByCod (struct SocialComment *SocCom)
" WHERE social_comments.ComCod='%ld'"
" AND social_comments.ComCod=social_comments_content.ComCod",
SocCom->ComCod);
*/
sprintf (Query,"SELECT social_timeline.PubCod,social_timeline.PublisherCod,"
"social_timeline.NotCod,"
"UNIX_TIMESTAMP(social_timeline.TimePublish),"
"social_comments_content.Content"
" FROM social_timeline,social_comments_content"
" WHERE social_timeline.PubCod='%ld'"
" AND social_timeline.PubType='%u'"
" AND social_timeline.PubCod=social_comments_content.ComCod",
SocCom->ComCod,(unsigned) Soc_PUB_COMMENT_TO_NOTE);
if (DB_QuerySELECT (Query,&mysql_res,"can not get data of social comment"))
{
/***** Get data of social comment *****/

4
swad_text.c
View File

@ -23876,7 +23876,7 @@ const char *Txt_No_of_users_who_will_be_notified_by_e_mail =
#elif L==9
"Nº de utilizadores que serão notificados por e-mail";
#endif
/*
const char *Txt_No_public_activity =
#if L==1
"Cap activitat pública";
@ -23897,7 +23897,7 @@ const char *Txt_No_public_activity =
#elif L==9
"Sem atividade pública";
#endif
*/
const char *Txt_No_questions_found_matching_your_search_criteria =
#if L==1
"No hay preguntas con el criterio de búsqueda seleccionado."; // Necessita traduccio