diff --git a/swad_HTML.c b/swad_HTML.c index 620abd0b..0355bbc1 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -1410,7 +1410,7 @@ void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disable HTM_Unsigned (*((unsigned *) ValuePtr)); break; case HTM_Type_LONG: - fprintf (Gbl.F.Out,"%ld",*((long *) ValuePtr)); + HTM_Long (*((long *) ValuePtr)); break; case HTM_Type_STRING: HTM_Txt ((char *) ValuePtr); @@ -1524,3 +1524,8 @@ void HTM_Unsigned (unsigned Num) { fprintf (Gbl.F.Out,"%u",Num); } + +void HTM_Long (long Num) + { + fprintf (Gbl.F.Out,"%ld",Num); + } diff --git a/swad_HTML.h b/swad_HTML.h index faa95678..89cfca18 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -152,5 +152,6 @@ void HTM_BR (void); void HTM_Txt (const char *Txt); void HTM_TxtColon (const char *Txt); void HTM_Unsigned (unsigned Num); +void HTM_Long (long Num); #endif diff --git a/swad_banner.c b/swad_banner.c index 2301c537..f1edacba 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -437,7 +437,7 @@ static void Ban_ListBannersForEdition (void) Ban->Hidden ? "DAT_LIGHT" : "DAT"); HTM_ARTICLE_Begin (Anchor); - fprintf (Gbl.F.Out,"%ld",Ban->BanCod); + HTM_Long (Ban->BanCod); HTM_ARTICLE_End (); HTM_TD_End (); diff --git a/swad_centre.c b/swad_centre.c index 331f0384..161e5708 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -1495,7 +1495,7 @@ static void Ctr_ListCentresForEdition (void) /* Centre code */ HTM_TD_Begin ("class=\"DAT CODE\""); - fprintf (Gbl.F.Out,"%ld",Ctr->CtrCod); + HTM_Long (Ctr->CtrCod); HTM_TD_End (); /* Centre logo */ diff --git a/swad_changelog.h b/swad_changelog.h index 21b400a6..bb8c50bf 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.61.2 (2019-11-10)" +#define Log_PLATFORM_VERSION "SWAD 19.61.3 (2019-11-10)" #define CSS_FILE "swad19.47.css" #define JS_FILE "swad19.39.js" /* @@ -495,7 +495,8 @@ ps2pdf source.ps destination.pdf // TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia) - Version 19.61.2: Nov 10, 2019 Code refactoring in HTML text printing. (? lines) + Version 19.61.3: Nov 10, 2019 Code refactoring in HTML long printing. (246297 lines) + Version 19.61.2: Nov 10, 2019 Code refactoring in HTML unsigned printing. (246291 lines) Version 19.61.1: Nov 10, 2019 Code refactoring in HTML text printing. (246291 lines) Version 19.61: Nov 10, 2019 Code refactoring in HTML text printing. (246298 lines) Version 19.60.3: Nov 09, 2019 Code refactoring in HTML select options. (246311 lines) diff --git a/swad_classroom.c b/swad_classroom.c index 648db32e..b5fbae2c 100644 --- a/swad_classroom.c +++ b/swad_classroom.c @@ -494,7 +494,7 @@ static void Cla_ListClassroomsForEdition (void) /* Classroom code */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%ld",Cla->ClaCod); + HTM_Long (Cla->ClaCod); HTM_TD_End (); /* Classroom short name */ diff --git a/swad_course.c b/swad_course.c index 6645aacb..096a81b6 100644 --- a/swad_course.c +++ b/swad_course.c @@ -395,7 +395,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%ld",Gbl.Hierarchy.Crs.CrsCod); + HTM_Long (Gbl.Hierarchy.Crs.CrsCod); HTM_TD_End (); HTM_TR_End (); @@ -1438,7 +1438,7 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) /* Course code */ HTM_TD_Begin ("class=\"DAT CODE\""); - fprintf (Gbl.F.Out,"%ld",Crs->CrsCod); + HTM_Long (Crs->CrsCod); HTM_TD_End (); /* Institutional code of the course */ diff --git a/swad_degree.c b/swad_degree.c index 1518dc9b..b99dbcf2 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -720,7 +720,7 @@ static void Deg_ListDegreesForEdition (void) /* Degree code */ HTM_TD_Begin ("class=\"DAT CODE\""); - fprintf (Gbl.F.Out,"%ld",Deg->DegCod); + HTM_Long (Deg->DegCod); HTM_TD_End (); /* Degree logo */ diff --git a/swad_degree_type.c b/swad_degree_type.c index c2ca4681..bac2b177 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -407,7 +407,7 @@ static void DT_ListDegreeTypesForEdition (void) /* Degree type code */ HTM_TD_Begin ("class=\"DAT CODE\""); - fprintf (Gbl.F.Out,"%ld",Gbl.DegTypes.Lst[NumDegTyp].DegTypCod); + HTM_Long (Gbl.DegTypes.Lst[NumDegTyp].DegTypCod); HTM_TD_End (); /* Name of degree type */ diff --git a/swad_institution.c b/swad_institution.c index 1cf1f384..4e8ef227 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -1470,7 +1470,7 @@ static void Ins_ListInstitutionsForEdition (void) /* Institution code */ HTM_TD_Begin ("class=\"DAT CODE\""); - fprintf (Gbl.F.Out,"%ld",Ins->InsCod); + HTM_Long (Ins->InsCod); HTM_TD_End (); /* Institution logo */ diff --git a/swad_link.c b/swad_link.c index a530b8d8..2a455cc2 100644 --- a/swad_link.c +++ b/swad_link.c @@ -433,7 +433,7 @@ static void Lnk_ListLinksForEdition (void) /* Link code */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%ld",Lnk->LnkCod); + HTM_Long (Lnk->LnkCod); HTM_TD_End (); /* Link short name */ diff --git a/swad_mail.c b/swad_mail.c index d4197a61..19fd94fe 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -499,7 +499,7 @@ static void Mai_ListMailDomainsForEdition (void) /* Mail code */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%ld",Mai->MaiCod); + HTM_Long (Mai->MaiCod); HTM_TD_End (); /* Mail domain */ diff --git a/swad_place.c b/swad_place.c index af8b3cbe..8397f5d2 100644 --- a/swad_place.c +++ b/swad_place.c @@ -545,7 +545,7 @@ static void Plc_ListPlacesForEdition (void) /* Place code */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%ld",Plc->PlcCod); + HTM_Long (Plc->PlcCod); HTM_TD_End (); /* Place short name */ diff --git a/swad_plugin.c b/swad_plugin.c index d3c92c6c..ff58946f 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -408,7 +408,7 @@ static void Plg_ListPluginsForEdition (void) /* Plugin code */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%ld",Plg->PlgCod); + HTM_Long (Plg->PlgCod); HTM_TD_End (); /* Plugin logo */ diff --git a/swad_profile.c b/swad_profile.c index 6197a020..b889f7a5 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -1561,7 +1561,7 @@ void Prf_ShowRankingFigure (MYSQL_RES **mysql_res,unsigned NumUsrs) Prf_ShowUsrInRanking (&UsrDat,Rank); HTM_TD_Begin ("class=\"RM COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%ld",Figure); + HTM_Long (Figure); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_test.c b/swad_test.c index fbbd9969..c1bc1afb 100644 --- a/swad_test.c +++ b/swad_test.c @@ -4497,7 +4497,7 @@ static void Tst_WriteIntAnsAssessTest (struct UsrData *UsrDat, (IntAnswerUsr == IntAnswerCorr ? "ANS_OK" : "ANS_BAD") : "ANS_0"); - fprintf (Gbl.F.Out,"%ld",IntAnswerUsr); + HTM_Long (IntAnswerUsr); HTM_TD_End (); } else @@ -4515,9 +4515,9 @@ static void Tst_WriteIntAnsAssessTest (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"ANS_0 CM\""); if (Gbl.Test.Config.Feedback == Tst_FEEDBACK_EACH_GOOD_BAD || Gbl.Test.Config.Feedback == Tst_FEEDBACK_FULL_FEEDBACK) - fprintf (Gbl.F.Out,"%ld",IntAnswerCorr); + HTM_Long (IntAnswerCorr); else - fprintf (Gbl.F.Out,"?"); + HTM_Txt ("?"); HTM_TD_End (); HTM_TR_End ();