From 88d58c558304288d48a64e582094e5964caba4f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Wed, 27 Jan 2016 17:41:43 +0100
Subject: [PATCH] Version 15.131.4

---
 swad_changelog.h | 21 +++++++++++++++++++--
 swad_follow.c    | 10 +++++-----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/swad_changelog.h b/swad_changelog.h
index 1e5ecc051..fc8b60668 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -116,19 +116,36 @@
 // TODO: Enable chat for guests?
 // TODO: Go to forum post (or at least to forum thread) from social timeline and notifications?
 // TODO: Width of column for data in notifications is too short
-// TODO: Recommendations about users to follow
 
+// TODO: Recommendations about users to follow
+/* The query can be something like this:
+
+SELECT DISTINCT usr_follow.FollowedCod,usr_data.Surname1,usr_data.Surname2,usr_data.FirstName,usr_nicknames.Nickname
+ FROM usr_follow,usr_data,usr_nicknames
+ WHERE usr_follow.FollowerCod IN (SELECT FollowedCod FROM usr_follow WHERE FollowerCod='1346')
+ AND usr_follow.FollowedCod NOT IN (SELECT FollowedCod FROM usr_follow WHERE FollowerCod='1346')
+ AND usr_follow.FollowedCod<>'1346'
+ AND usr_follow.FollowedCod=usr_data.UsrCod
+ AND (usr_data.ProfileVisibility IN ('system','world')
+      OR (usr_data.ProfileVisibility='course'
+          AND usr_data.UsrCod IN
+          (SELECT UsrCod FROM crs_usr WHERE CrsCod IN
+           (SELECT CrsCod FROM crs_usr WHERE UsrCod='1346'))))
+ AND usr_follow.FollowedCod=usr_nicknames.UsrCod ORDER BY RAND() LIMIT 3;
+
+ */
 /*****************************************************************************/
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.131.3 (2016-01-27)"
+#define Log_PLATFORM_VERSION	"SWAD 15.131.4 (2016-01-27)"
 #define CSS_FILE		"swad15.131.2.css"
 #define JS_FILE			"swad15.131.3.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.131.4: Jan 27, 2016	Fixed bug in ranking of followed. (195030 lines)
         Version 15.131.3: Jan 27, 2016	Animated link to view old timeline. (195015 lines)
         Version 15.131.2: Jan 26, 2016	Change in default color of links. (194998 lines)
         Version 15.131.1: Jan 26, 2016	Optimization in the function that insert links in text. (194993 lines)
diff --git a/swad_follow.c b/swad_follow.c
index 951c40abd..d738f5995 100644
--- a/swad_follow.c
+++ b/swad_follow.c
@@ -614,7 +614,7 @@ void Fol_GetAndShowRankingFollowers (void)
 			" ORDER BY N DESC,FollowedCod LIMIT 100");
          break;
       case Sco_SCOPE_CTY:
-         sprintf (Query,"SELECT DISTINCTROW usr_follow.FollowedCod,COUNT(usr_follow.FollowerCod) AS N"
+         sprintf (Query,"SELECT usr_follow.FollowedCod,COUNT(DISTINCT usr_follow.FollowerCod) AS N"
                         " FROM institutions,centres,degrees,courses,crs_usr,usr_follow"
                         " WHERE institutions.CtyCod='%ld'"
                         " AND institutions.InsCod=centres.InsCod"
@@ -627,7 +627,7 @@ void Fol_GetAndShowRankingFollowers (void)
                   Gbl.CurrentCty.Cty.CtyCod);
          break;
       case Sco_SCOPE_INS:
-         sprintf (Query,"SELECT DISTINCTROW usr_follow.FollowedCod,COUNT(usr_follow.FollowerCod) AS N"
+         sprintf (Query,"SELECT usr_follow.FollowedCod,COUNT(DISTINCT usr_follow.FollowerCod) AS N"
                         " FROM centres,degrees,courses,crs_usr,usr_follow"
                         " WHERE centres.InsCod='%ld'"
                         " AND centres.CtrCod=degrees.CtrCod"
@@ -639,7 +639,7 @@ void Fol_GetAndShowRankingFollowers (void)
                   Gbl.CurrentIns.Ins.InsCod);
          break;
       case Sco_SCOPE_CTR:
-         sprintf (Query,"SELECT DISTINCTROW usr_follow.FollowedCod,COUNT(usr_follow.FollowerCod) AS N"
+         sprintf (Query,"SELECT usr_follow.FollowedCod,COUNT(DISTINCT usr_follow.FollowerCod) AS N"
                         " FROM degrees,courses,crs_usr,usr_follow"
                         " WHERE degrees.CtrCod='%ld'"
                         " AND degrees.DegCod=courses.DegCod"
@@ -650,7 +650,7 @@ void Fol_GetAndShowRankingFollowers (void)
                   Gbl.CurrentCtr.Ctr.CtrCod);
          break;
       case Sco_SCOPE_DEG:
-         sprintf (Query,"SELECT DISTINCTROW usr_follow.FollowedCod,COUNT(usr_follow.FollowerCod) AS N"
+         sprintf (Query,"SELECT usr_follow.FollowedCod,COUNT(DISTINCT usr_follow.FollowerCod) AS N"
                         " FROM courses,crs_usr,usr_follow"
                         " WHERE courses.DegCod='%ld'"
                         " AND courses.CrsCod=crs_usr.CrsCod"
@@ -660,7 +660,7 @@ void Fol_GetAndShowRankingFollowers (void)
                   Gbl.CurrentDeg.Deg.DegCod);
          break;
       case Sco_SCOPE_CRS:
-         sprintf (Query,"SELECT DISTINCTROW usr_follow.FollowedCod,COUNT(usr_follow.FollowerCod) AS N"
+         sprintf (Query,"SELECT usr_follow.FollowedCod,COUNT(DISTINCT usr_follow.FollowerCod) AS N"
                         " FROM crs_usr,usr_follow"
                         " WHERE crs_usr.CrsCod='%ld'"
                         " AND crs_usr.UsrCod=usr_follow.FollowedCod"