added a new dialplan function 'CSV_QUOTE' and changed the cdr_custom.sample.conf

(closes issue #15471)
Reported by: dkerr
Patches:
      csv_quote_14.txt uploaded by mnick (license )
Tested by: mnick

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@221157 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/cdr_custom.conf.sample b/configs/cdr_custom.conf.sample
index 8bc2cb34e68243cfa06e8f5baf6de5942f0063c8..04bd87f871f6a7965422130bcd153df672759c3c 100644 (file)
--- a/configs/cdr_custom.conf.sample
+++ b/configs/cdr_custom.conf.sample
@@ -6,5 +6,5 @@
 ; 
 ;
 ;[mappings]
-;Master.csv => "${CDR(clid)}","${CDR(src)}","${CDR(dst)}","${CDR(dcontext)}","${CDR(channel)}","${CDR(dstchannel)}","${CDR(lastapp)}","${CDR(lastdata)}","${CDR(start)}","${CDR(answer)}","${CDR(end)}","${CDR(duration)}","${CDR(billsec)}","${CDR(disposition)}","${CDR(amaflags)}","${CDR(accountcode)}","${CDR(uniqueid)}","${CDR(userfield)}"
+;Master.csv => ${CSV_QUOTE(${CDR(clid)})},${CSV_QUOTE(${CDR(src)})},${CSV_QUOTE(${CDR(dst)})},${CSV_QUOTE(${CDR(dcontext)})},${CSV_QUOTE(${CDR(channel)})},${CSV_QUOTE(${CDR(dstchannel)})},${CSV_QUOTE(${CDR(lastapp)})},${CSV_QUOTE(${CDR(lastdata)})},${CSV_QUOTE(${CDR(start)})},${CSV_QUOTE(${CDR(answer)})},${CSV_QUOTE(${CDR(end)})},${CSV_QUOTE(${CDR(duration)})},${CSV_QUOTE(${CDR(billsec)})},${CSV_QUOTE(${CDR(disposition)})},${CSV_QUOTE(${CDR(amaflags)})},${CSV_QUOTE(${CDR(accountcode)})},${CSV_QUOTE(${CDR(uniqueid)})},${CSV_QUOTE(${CDR(userfield)})}
 

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 3dcca56ee7d55700e30ef361026f6037aeb5c306..582691c9969c15fb0d7b5f197d09256dfa5ac165 100644 (file)
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -422,6 +422,43 @@ static struct ast_custom_function quote_function = {
        .read = quote,
 };
 
+static int csv_quote(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
+{
+       char *bufptr = buf, *dataptr = data;
+
+       if (len < 3){ /* at least two for quotes and one for binary zero */
+               ast_log(LOG_ERROR, "Not enough buffer");
+               return -1;
+       }
+
+       if (ast_strlen_zero(data)) {
+               ast_log(LOG_WARNING, "No argument specified!\n");
+               ast_copy_string(buf,"\"\"",len);
+               return 0;
+       }
+
+       *bufptr++ = '"';
+       for (; bufptr < buf + len - 3; dataptr++){
+               if (*dataptr == '"') {
+                       *bufptr++ = '"';
+                       *bufptr++ = '"';
+               } else if (*dataptr == '\0') {
+                       break;
+               } else {
+                       *bufptr++ = *dataptr;
+               }
+       }
+       *bufptr++ = '"';
+       *bufptr='\0';
+       return 0;
+}
+
+static struct ast_custom_function csv_quote_function = {
+       .name = "CSV_QUOTE",
+       .synopsis = "Quotes a given string for use in a CSV file, escaping embedded quotes as necessary",
+       .syntax = "CSV_QUOTE(<string>)",
+       .read = csv_quote,
+};
 
 static int len(struct ast_channel *chan, char *cmd, char *data, char *buf,
               size_t len)
@@ -616,6 +653,7 @@ static int unload_module(void)
        res |= ast_custom_function_unregister(&regex_function);
        res |= ast_custom_function_unregister(&array_function);
        res |= ast_custom_function_unregister(&quote_function);
+       res |= ast_custom_function_unregister(&csv_quote_function);
        res |= ast_custom_function_unregister(&len_function);
        res |= ast_custom_function_unregister(&strftime_function);
        res |= ast_custom_function_unregister(&strptime_function);
@@ -635,6 +673,7 @@ static int load_module(void)
        res |= ast_custom_function_register(&regex_function);
        res |= ast_custom_function_register(&array_function);
        res |= ast_custom_function_register(&quote_function);
+       res |= ast_custom_function_register(&csv_quote_function);
        res |= ast_custom_function_register(&len_function);
        res |= ast_custom_function_register(&strftime_function);
        res |= ast_custom_function_register(&strptime_function);