wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70 from schnurksel/add_codepage_to_xml_output

Browse Source 
add codepage to XML output
This commit is contained in:
Stefan Wahren 2015-04-11 11:55:41 +02:00
commit 576cefe80a
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mbus/mbus-protocol-aux.c
View File

@ -1373,6 +1373,8 @@ mbus_data_variable_xml_normalized(mbus_data_variable *data)
if (buff == NULL)
return NULL;
len += snprintf(&buff[len], buff_size - len, MBUS_XML_PROCESSING_INSTRUCTION);
len += snprintf(&buff[len], buff_size - len, "<MBusData>\n\n");
len += snprintf(&buff[len], buff_size - len, "%s", mbus_data_variable_header_xml(&(data->header)));

7
mbus/mbus-protocol.c
View File

@ -3779,6 +3779,8 @@ mbus_data_variable_xml(mbus_data_variable *data)
if (buff == NULL)
return NULL;
len += snprintf(&buff[len], buff_size - len, MBUS_XML_PROCESSING_INSTRUCTION);
len += snprintf(&buff[len], buff_size - len, "<MBusData>\n\n");
len += snprintf(&buff[len], buff_size - len, "%s",
@ -3829,6 +3831,8 @@ mbus_data_fixed_xml(mbus_data_fixed *data)
if (buff == NULL)
return NULL;
len += snprintf(&buff[len], buff_size - len, MBUS_XML_PROCESSING_INSTRUCTION);
len += snprintf(&buff[len], buff_size - len, "<MBusData>\n\n");
len += snprintf(&buff[len], buff_size - len, " <SlaveInformation>\n");
@ -3902,6 +3906,7 @@ mbus_data_error_xml(int error)
if (buff == NULL)
return NULL;
len += snprintf(&buff[len], buff_size - len, MBUS_XML_PROCESSING_INSTRUCTION);
len += snprintf(&buff[len], buff_size - len, "<MBusData>\n\n");
len += snprintf(&buff[len], buff_size - len, " <SlaveInformation>\n");
@ -4003,6 +4008,8 @@ mbus_frame_xml(mbus_frame *frame)
// is available (frame_cnt = -1 => not included in output)
frame_cnt = (frame->next == NULL) ? -1 : 0;
len += snprintf(&buff[len], buff_size - len, MBUS_XML_PROCESSING_INSTRUCTION);
len += snprintf(&buff[len], buff_size - len, "<MBusData>\n\n");
// only print the header info for the first frame (should be

4
mbus/mbus-protocol.h
View File

@ -498,6 +498,10 @@ typedef struct _mbus_data_secondary_address {
//
unsigned int mbus_manufacturer_id(char *manufacturer);
// Since libmbus writes some special characters (ASCII > 0x7F) into the XML output (e.g. °C for centigrade == ASCII 0xB0)
// it is useful to attach the appropriate code page for postprocessing.
#define MBUS_XML_PROCESSING_INSTRUCTION "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n"
//
// Event callback functions
//