From af9d4bb1fd2ac2cb00793a7a08f2a03cf7f83ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 30 Sep 2019 09:37:50 +0200 Subject: [PATCH] Version19.25.2 --- swad_changelog.h | 3 ++- swad_config.h | 4 ++-- swad_game.c | 2 +- swad_match_result.c | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index a77d84249..221d6ce75 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -474,10 +474,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.25.1 (2019-09-30)" +#define Log_PLATFORM_VERSION "SWAD 19.25.2 (2019-09-30)" #define CSS_FILE "swad19.15.css" #define JS_FILE "swad19.15.js" /* + Version 19.25.2: Sep 30, 2019 Fixed bug in match results. (246744 lines) Version 19.25.1: Sep 30, 2019 Fixed bug in match results. (246743 lines) Version 19.25: Sep 30, 2019 Code refactoring in match results. (246743 lines) Version 19.24.2: Sep 30, 2019 Code refactoring in games and matches. (246742 lines) diff --git a/swad_config.h b/swad_config.h index 2220b54e3..1a4407d0f 100644 --- a/swad_config.h +++ b/swad_config.h @@ -28,8 +28,8 @@ /** Uncomment one of the following installations of SWAD or create your own **/ /*****************************************************************************/ -//#define LOCALHOST_UBUNTU // Comment this line if not applicable -#define OPENSWAD_ORG // Comment this line if not applicable +#define LOCALHOST_UBUNTU // Comment this line if not applicable +//#define OPENSWAD_ORG // Comment this line if not applicable //#define SWAD_UGR_ES // Comment this line if not applicable //#define SWADBERRY_UGR_ES // Comment this line if not applicable diff --git a/swad_game.c b/swad_game.c index 12dc2a177..32b585698 100644 --- a/swad_game.c +++ b/swad_game.c @@ -2135,7 +2135,7 @@ static void Gam_ExchangeQuestions (long GamCod, long QstCodTop; long QstCodBottom; - /***** Lock table to make the inscription atomic *****/ + /***** Lock table to make the move atomic *****/ DB_Query ("can not lock tables to move game question", "LOCK TABLES gam_questions WRITE"); Gbl.DB.LockedTables = true; diff --git a/swad_match_result.c b/swad_match_result.c index 3a395d98d..643c61a06 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -481,24 +481,24 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther) } /* Write number of questions */ - fprintf (Gbl.F.Out,"%u", - ClassDat,Gbl.RowEvenOdd,NumQstsInThisResult); + fprintf (Gbl.F.Out,"%u", + Gbl.RowEvenOdd,NumQstsInThisResult); /* Write number of questions not blank */ - fprintf (Gbl.F.Out,"%u", - ClassDat,Gbl.RowEvenOdd,NumQstsNotBlankInThisResult); + fprintf (Gbl.F.Out,"%u", + Gbl.RowEvenOdd,NumQstsNotBlankInThisResult); /* Write score */ - fprintf (Gbl.F.Out,"", - ClassDat,Gbl.RowEvenOdd); + fprintf (Gbl.F.Out,"", + Gbl.RowEvenOdd); if (ShowResultThisMatch) fprintf (Gbl.F.Out,"%.2lf", ScoreInThisResult); fprintf (Gbl.F.Out,""); /* Write average score per question */ - fprintf (Gbl.F.Out,"", - ClassDat,Gbl.RowEvenOdd); + fprintf (Gbl.F.Out,"", + Gbl.RowEvenOdd); if (ShowResultThisMatch) fprintf (Gbl.F.Out,"%.2lf", NumQstsInThisResult ? ScoreInThisResult / (double) NumQstsInThisResult : @@ -506,8 +506,8 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther) fprintf (Gbl.F.Out,""); /* Write score over Tst_SCORE_MAX */ - fprintf (Gbl.F.Out,"", - ClassDat,Gbl.RowEvenOdd); + fprintf (Gbl.F.Out,"", + Gbl.RowEvenOdd); if (ShowResultThisMatch) fprintf (Gbl.F.Out,"%.2lf", NumQstsInThisResult ? ScoreInThisResult * Tst_SCORE_MAX / (double) NumQstsInThisResult :