Merge pull request #210 from melven/importElement_invalidateXPathCache

Invalidate XPath cache in tixiImportElementFromString
DLR-SC · Apr 7, 2022 · b7e4e0c · b7e4e0c
2 parents b722874 + 87e42ee
commit b7e4e0c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/tixiImpl.c b/src/tixiImpl.c
@@ -3204,6 +3204,10 @@ DLL_EXPORT ReturnCode tixiImportElementFromString (const TixiDocumentHandle hand
     parseErrors = xmlParseInNodeContext(parentElement, xmlImportString, strlen(xmlImportString), 0, &newElement);
 
     if (!parseErrors) {
+
+      // structure change!, we have to empty the xpath cache
+      XPathClearCache(document->xpathCache);
+
       xmlAddChild(parentElement, newElement);
     }
     else {

diff --git a/tests/import_element_check.cpp b/tests/import_element_check.cpp
@@ -83,3 +83,20 @@ TEST_F(ImportElementsCheck, notWellFormed)
     ASSERT_EQ(NOT_WELL_FORMED, tixiImportElementFromString(handle, "/root/a", "sdaf<||/sdfasf>"));
 }
 
+TEST_F(ImportElementsCheck, invalidateXPathCache)
+{
+    char* text = NULL;
+    int num = 0;
+    char* path = NULL;
+
+    ASSERT_TRUE( tixiSetCacheEnabled(handle, true) == SUCCESS );
+
+    ASSERT_TRUE( tixiXPathEvaluateNodeNumber(handle, "//*", &num) == SUCCESS );
+    ASSERT_EQ(3, num);
+
+    ASSERT_EQ(SUCCESS, tixiImportElementFromString(handle, "/root", "<a attr=\"hello\"><x/></a>"));
+
+    ASSERT_TRUE( tixiXPathEvaluateNodeNumber(handle, "//*", &num) == SUCCESS );
+    ASSERT_EQ(5, num);
+}
+