*** v4.3.3 - Added Sourceforge#12 by Alexander Goomenyuk (expose data source context to user).

    - Added search unitest.

Author: Matthieu Labas

CHANGELOG

@@ -1,3 +1,6 @@
+*** v4.3.3 - Added Sourceforge#12 by Alexander Goomenyuk (expose data source context to user).
+	- Added search unitest.
+
 *** v4.3.2 - Fixed GitHub#11 by Dami�n M. Gonz�lez (missing free() on XMLNode_set_text()).
 	- Doxygen documentation update.
 	- Correction of CHECK_NODE macro that returned false on valid nodes!

src/sxmlc.c

@@ -1693,6 +1693,8 @@ int XMLDoc_parse_file_SAX(const SXML_CHAR* filename, const SAX_Callbacks* sax, v
 
 	sd.name = (SXML_CHAR*)filename;
 	sd.user = user;
+	sd.type = DATA_SOURCE_FILE;
+	sd.src  = (void*)f;
 #ifdef SXMLC_UNICODE
 	bom = freadBOM(f, NULL, NULL); /* Skip BOM, if any */
 	/* In Unicode, re-open the file in text-mode if there is no BOM (or UTF-8) as we assume that
@@ -1723,6 +1725,8 @@ int XMLDoc_parse_buffer_SAX_len(const SXML_CHAR* buffer, int buffer_len, const S
 
 	sd.name = name;
 	sd.user = user;
+	sd.type = DATA_SOURCE_BUFFER;
+	sd.src  = (void*)buffer;
 	return _parse_data_SAX((void*)&dsb, DATA_SOURCE_BUFFER, sax, &sd);
 }
 

src/sxmlc.h

@@ -33,7 +33,7 @@
 /**
  * \brief Current SXMLC version, as a `const char[]`.
  */
-#define SXMLC_VERSION "4.3.2"
+#define SXMLC_VERSION "4.3.3"
 
 #ifdef __cplusplus
 extern "C" {
@@ -326,6 +326,8 @@ typedef struct _SAX_Data {
 	const SXML_CHAR* name;	/**< Document name (file name or buffer name). */
 	int line_num;			/**< Current line number being processed. */
 	void* user;				/**< User-given data. */
+	DataSourceType type;	/**< Data source type [DATA_SOURCE_FILE|DATA_SOURCE_BUFFER]. */
+	void* src;				/**< Data source [DataSourceFile|DataSourceBuffer]. Depends on type. */
 } SAX_Data;
 
 /**

src/unitest/unitest.c

@@ -409,7 +409,59 @@ static test_result test_move(char* msg)
 
 static test_result test_search(char* msg)
 {
-	return _test_not_implemented(msg); // TODO
+	static char buf_stylesxml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+			"<styleSheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" mc:Ignorable=\"x14ac\" xmlns:x14ac=\"http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac\">"
+				"<fonts count=\"1\" x14ac:knownFonts=\"1\">"
+					"<font>"
+						"<sz val=\"11\"/>"
+						"<color theme=\"1\"/>"
+						"<name val=\"Calibri\"/>"
+						"<family val=\"2\"/>"
+						"<scheme val=\"minor\"/>"
+					"</font>"
+				"</fonts>"
+				"<fills count=\"2\">"
+					"<fill><patternFill patternType=\"none\"/></fill>"
+					"<fill><patternFill patternType=\"gray125\"/></fill>"
+				"</fills>"
+				"<borders count=\"1\">"
+					"<border><left/><right/><top/><bottom/><diagonal/></border>"
+				"</borders>"
+				"<cellStyleXfs count=\"1\">"
+					"<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\"/>"
+				"</cellStyleXfs>"
+				"<cellXfs count=\"1\">"
+					"<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\"/>"
+				"</cellXfs>"
+				"<cellStyles count=\"1\">"
+					"<cellStyle name=\"Normal\" xfId=\"0\" builtinId=\"0\"/>"
+				"</cellStyles>"
+				"<dxfs count=\"0\"/>"
+				"<tableStyles count=\"0\" defaultTableStyle=\"TableStyleMedium2\" defaultPivotStyle=\"PivotStyleMedium9\"/>"
+				"<extLst>"
+					"<ext uri=\"{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}\" xmlns:x14=\"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main\">"
+						"<x14:slicerStyles defaultSlicerStyle=\"SlicerStyleLight1\"/>"
+					"</ext>"
+					"<ext uri=\"{9260A510-F301-46a8-8635-F512D64BE5F5}\" xmlns:x15=\"http://schemas.microsoft.com/office/spreadsheetml/2010/11/main\">"
+						"<x15:timelineStyles defaultTimelineStyle=\"TimeSlicerStyleLight1\"/>"
+					"</ext>"
+				"</extLst>"
+			"</styleSheet>";
+	XMLDoc styles_xml;
+	XMLDoc_init(&styles_xml);
+	XMLDoc_parse_buffer_DOM(buf_stylesxml, "styles.xml", &styles_xml);
+
+	// start the search for cellXfs
+	XMLSearch search_engine;
+	XMLSearch_init(&search_engine);
+	XMLSearch_search_set_tag(&search_engine, "cellXfs");
+	XMLNode *cell_xfs_node = XMLSearch_next(styles_xml.nodes[styles_xml.i_root], &search_engine);
+
+	assert_true(cell_xfs_node != NULL, TEST_ERROR, "Node cellXfs not found", NOP);
+
+	// TODO: More tests
+
+	return TEST_OK;
 }