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.184.5

This commit is contained in:
Antonio Cañas Vargas 2016-04-07 01:16:34 +02:00
parent b8dc2d2a11
commit 5434c74ff1
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -132,13 +132,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.184.4 (2016-04-06)"
#define Log_PLATFORM_VERSION "SWAD 15.184.5 (2016-04-07)"
#define CSS_FILE "swad15.178.2.css"
#define JS_FILE "swad15.178.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.184.5: Apr 07, 2016 Fixed bugs exporting/importing test questions. (198679 lines)
Version 15.184.4: Apr 06, 2016 Fixed minor bug in layout of test exam. (198676 lines)
Version 15.184.3: Apr 06, 2016 Fixed minor bug in layout of test exam. (198677 lines)
Version 15.184.2: Apr 06, 2016 Fixed minor bug in layout of test exam. (198679 lines)

1
swad_file.c
View File

@ -260,6 +260,7 @@ struct Param *Fil_StartReceptionOfFile (const char *ParamFile,
if (fread (MIMEType,sizeof (char),Param->ContentType.Length,Gbl.F.Tmp) !=
Param->ContentType.Length)
Lay_ShowErrorAndExit ("Error while getting content type.");
MIMEType[Param->ContentType.Length] = '\0';
return Param;
}

31
swad_test_import.c
View File

@ -193,16 +193,17 @@ void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
{
row = mysql_fetch_row (mysql_res);
/*
row[0] QstCod
row[1] UNIX_TIMESTAMP(EditTime)
row[2] AnsType
row[3] Shuffle
row[4] Stem
row[5] ImageName
row[6] Feedback
row[7] NumHits
row[8] NumHitsNotBlank
row[9] Score
row[ 0] QstCod
row[ 1] UNIX_TIMESTAMP(EditTime)
row[ 2] AnsType
row[ 3] Shuffle
row[ 4] Stem
row[ 5] Feedback
row[ 6] ImageName
row[ 7] ImageTitle
row[ 8] NumHits
row[ 9] NumHitsNotBlank
row[10] Score
*/
/* row[0] holds the code of the question */
if ((QstCod = Str_ConvertStrCodToLongCod (row[0])) < 0)
@ -222,11 +223,11 @@ void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
fprintf (Gbl.Test.XML.FileXML,"<stem>%s</stem>%s",
row[4],Txt_NEW_LINE);
/* Write the feedback (row[6]), that is in HTML format */
if (row[6])
if (row[6][0])
/* Write the feedback (row[5]), that is in HTML format */
if (row[5])
if (row[5][0])
fprintf (Gbl.Test.XML.FileXML,"<feedback>%s</feedback>%s",
row[6],Txt_NEW_LINE);
row[5],Txt_NEW_LINE);
/* Write the answers of this question.
Shuffle can be enabled or disabled (row[3]) */
@ -411,7 +412,7 @@ void TsI_ImportQstsFromXML (void)
Param = Fil_StartReceptionOfFile (Fil_NAME_OF_PARAM_FILENAME_ORG,
FileNameXMLSrc,MIMEType);
/* Check if the file type is image/jpeg or image/pjpeg or application/octet-stream */
/* Check if the file type is XML */
if (strcmp (MIMEType,"text/xml"))
if (strcmp (MIMEType,"application/xml"))
if (strcmp (MIMEType,"application/octet-stream"))