Merge branch 'pr/4972' into tip

axoflow · May 17, 2024 · 74cdb6c · 74cdb6c
2 parents 7ac8a3c + 0b82872
commit 74cdb6c
Show file tree

Hide file tree

Showing 10 changed files with 923 additions and 5 deletions.
diff --git a/modules/csvparser/CMakeLists.txt b/modules/csvparser/CMakeLists.txt
@@ -4,6 +4,8 @@ set(CSVPARSER_SOURCES
     csvparser-parser.c
     csvparser-parser.h
     csvparser-plugin.c
+    filterx-func-parse-csv.h
+    filterx-func-parse-csv.c
 )
 
 add_module(

diff --git a/modules/csvparser/Makefile.am b/modules/csvparser/Makefile.am
@@ -5,7 +5,9 @@ modules_csvparser_libcsvparser_la_SOURCES	=	\
 	modules/csvparser/csvparser-grammar.y		\
 	modules/csvparser/csvparser-parser.c		\
 	modules/csvparser/csvparser-parser.h		\
-	modules/csvparser/csvparser-plugin.c
+	modules/csvparser/csvparser-plugin.c		\
+	modules/csvparser/filterx-func-parse-csv.h  \
+	modules/csvparser/filterx-func-parse-csv.c
 
 modules_csvparser_libcsvparser_la_CPPFLAGS	=	\
 	$(AM_CPPFLAGS)					\

diff --git a/modules/csvparser/csvparser-plugin.c b/modules/csvparser/csvparser-plugin.c
@@ -25,6 +25,7 @@
 #include "csvparser.h"
 #include "plugin.h"
 #include "plugin-types.h"
+#include "filterx-func-parse-csv.h"
 
 extern CfgParser csvparser_parser;
 
@@ -35,6 +36,11 @@ static Plugin csvparser_plugins[] =
     .name = "csv-parser",
     .parser = &csvparser_parser,
   },
+  {
+    .type =  LL_CONTEXT_FILTERX_FUNC,
+    .name = "parse_csv",
+    .construct = filterx_function_construct_parse_csv,
+  },
 };
 
 gboolean