X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_nmem.c;h=4dd776929fe48496bf4cb17811feaf7c2b867620;hb=38b682e3f8a2c985098aa98c1d8c72fda65cf3ed;hp=cc34f277b4e83aea14c6f8635dc6635daea48071;hpb=cfb1b8ff4632b51bec4e5eab18137081efdfb02d;p=yaz-moved-to-github.git

diff --git a/test/test_nmem.c b/test/test_nmem.c
index cc34f27..4dd7769 100644
--- a/test/test_nmem.c
+++ b/test/test_nmem.c
@@ -93,19 +93,27 @@ void tst_nmem_strsplit(void)
     YAZ_CHECK(num == 4);
     YAZ_CHECK(num > 0 && !strcmp(array[0], ""));
     YAZ_CHECK(num > 1 && !strcmp(array[1], "a"));
-    YAZ_CHECK(num > 2 && !strcmp(array[2], "b\\,"));
+    YAZ_CHECK(num > 2 && !strcmp(array[2], "b,"));
     YAZ_CHECK(num > 3 && !strcmp(array[3], "cd"));
 
-    nmem_strsplit_escape(nmem, ",", "\\,a,b\\,,cd", &array, &num, 0, '\\');
+    nmem_strsplit_escape(nmem, ",", "\\,a,b\\,,c\\d", &array, &num, 0, '\\');
     YAZ_CHECK(num == 3);
-    YAZ_CHECK(num > 0 && !strcmp(array[0], "\\,a"));
-    YAZ_CHECK(num > 1 && !strcmp(array[1], "b\\,"));
+    YAZ_CHECK(num > 0 && !strcmp(array[0], ",a"));
+    YAZ_CHECK(num > 1 && !strcmp(array[1], "b,"));
     YAZ_CHECK(num > 2 && !strcmp(array[2], "cd"));
 
-    nmem_strsplit_escape(nmem, ",", "\\,a,b\\,\\,cd", &array, &num, 0, '\\');
+    nmem_strsplit_escape2(nmem, ",", "\\,a,b\\,\\,c\\\\\\|d",
+                          &array, &num, 0, '\\', 1);
+    YAZ_CHECK(num == 2);
+    YAZ_CHECK(num > 0 && !strcmp(array[0], ",a"));
+    YAZ_CHECK(num > 1 && !strcmp(array[1], "b,,c\\|d"));
+
+
+    nmem_strsplit_escape2(nmem, ",", "\\,a,b\\,\\,c\\\\\\|d",
+                          &array, &num, 0, '\\', 0);
     YAZ_CHECK(num == 2);
     YAZ_CHECK(num > 0 && !strcmp(array[0], "\\,a"));
-    YAZ_CHECK(num > 1 && !strcmp(array[1], "b\\,\\,cd"));
+    YAZ_CHECK(num > 1 && !strcmp(array[1], "b\\,\\,c\\\\\\|d"));
 
     nmem_destroy(nmem);
 }
@@ -113,6 +121,7 @@ void tst_nmem_strsplit(void)
 int main (int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
+    YAZ_CHECK_LOG();
     tst_nmem_malloc();
     tst_nmem_strsplit();
     YAZ_CHECK_TERM;