Convert app_db to function variables (bug #4201)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5604 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
d29b05e5a7
commit
9eeaaa3915
|
@ -137,7 +137,13 @@ static int put_exec(struct ast_channel *chan, void *data)
|
|||
{
|
||||
int arglen;
|
||||
char *argv, *value, *family, *key;
|
||||
static int dep_warning = 0;
|
||||
|
||||
if (!dep_warning) {
|
||||
ast_log(LOG_WARNING, "This application has been deprecated, please use the ${DB(family/key)} function instead.\n");
|
||||
dep_warning = 1;
|
||||
}
|
||||
|
||||
arglen = strlen(data);
|
||||
argv = alloca(arglen + 1);
|
||||
if (!argv) { /* Why would this fail? */
|
||||
|
@ -172,7 +178,13 @@ static int get_exec(struct ast_channel *chan, void *data)
|
|||
int arglen;
|
||||
char *argv, *varname, *family, *key;
|
||||
char dbresult[256];
|
||||
static int dep_warning = 0;
|
||||
|
||||
if (!dep_warning) {
|
||||
ast_log(LOG_WARNING, "This application has been deprecated, please use the ${DB(family/key)} function instead.\n");
|
||||
dep_warning = 1;
|
||||
}
|
||||
|
||||
arglen = strlen(data);
|
||||
argv = alloca(arglen + 1);
|
||||
if (!argv) { /* Why would this fail? */
|
||||
|
|
|
@ -13,7 +13,8 @@
|
|||
|
||||
FUNCS=pbx_functions.so
|
||||
|
||||
BUILTINS=func_md5.o func_groupcount.o func_strings.o func_cdr.o func_logic.o func_env.o
|
||||
BUILTINS=func_md5.o func_groupcount.o func_strings.o func_cdr.o \
|
||||
func_logic.o func_env.o func_db.o
|
||||
|
||||
STANDALONE_FUNCS=$(filter-out $(BUILTINS),$(patsubst %.c,%.o,$(wildcard func*.c)))
|
||||
|
||||
|
|
|
@ -0,0 +1,104 @@
|
|||
/*
|
||||
* Asterisk -- A telephony toolkit for Linux.
|
||||
*
|
||||
* Functions for interaction with the Asterisk database
|
||||
*
|
||||
* Copyright (C) 2005, Russell Bryant <russelb@clemson.edu>
|
||||
*
|
||||
* func_db.c adapted from the old app_db.c, copyright by the following people
|
||||
* Copyright (C) 2005, Mark Spencer <markster@digium.com>
|
||||
* Copyright (C) 2003, Jefferson Noxon <jeff@debian.org>
|
||||
*
|
||||
* This program is free software, distributed under the terms of
|
||||
* the GNU General Public License
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <regex.h>
|
||||
|
||||
#include "asterisk/channel.h"
|
||||
#include "asterisk/pbx.h"
|
||||
#include "asterisk/logger.h"
|
||||
#include "asterisk/options.h"
|
||||
#include "asterisk/utils.h"
|
||||
#include "asterisk/app.h"
|
||||
#include "asterisk/astdb.h"
|
||||
|
||||
static char *function_db_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len)
|
||||
{
|
||||
int argc;
|
||||
char *args;
|
||||
char *argv[2];
|
||||
char *family;
|
||||
char *key;
|
||||
|
||||
if (!data || ast_strlen_zero(data)) {
|
||||
ast_log(LOG_WARNING, "DB requires an argument, DB(<family>/<key>)\n");
|
||||
return buf;
|
||||
}
|
||||
|
||||
args = ast_strdupa(data);
|
||||
argc = ast_separate_app_args(args, '/', argv, sizeof(argv) / sizeof(argv[0]));
|
||||
|
||||
if (argc > 1) {
|
||||
family = argv[0];
|
||||
key = argv[1];
|
||||
} else {
|
||||
ast_log(LOG_WARNING, "DB requires an argument, DB(<family>/<key>)\n");
|
||||
return buf;
|
||||
}
|
||||
|
||||
if (ast_db_get(family, key, buf, len-1)) {
|
||||
ast_log(LOG_WARNING, "DB: %s/%s not found in database.\n", family, key);
|
||||
}
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
static void function_db_write(struct ast_channel *chan, char *cmd, char *data, const char *value)
|
||||
{
|
||||
int argc;
|
||||
char *args;
|
||||
char *argv[2];
|
||||
char *family;
|
||||
char *key;
|
||||
|
||||
if (!data || ast_strlen_zero(data)) {
|
||||
ast_log(LOG_WARNING, "DB requires an argument, DB(<family>/<key>)=<value>\n");
|
||||
return;
|
||||
}
|
||||
|
||||
args = ast_strdupa(data);
|
||||
argc = ast_separate_app_args(args, '/', argv, sizeof(argv) / sizeof(argv[0]));
|
||||
|
||||
if (argc > 1) {
|
||||
family = argv[0];
|
||||
key = argv[1];
|
||||
} else {
|
||||
ast_log(LOG_WARNING, "DB requires an argument, DB(<family>/<key>)=value\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if (ast_db_put(family, key, (char*)value)) {
|
||||
ast_log(LOG_WARNING, "DB: Error writing value to database.\n");
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef BUILTIN_FUNC
|
||||
static
|
||||
#endif
|
||||
struct ast_custom_function db_function = {
|
||||
.name = "DB",
|
||||
.synopsis = "Read or Write from/to the Asterisk database",
|
||||
.syntax = "DB(<family>/<key>)",
|
||||
.desc = "This function will read or write a value from/to the Asterisk database."
|
||||
"DB(...) will read a value from the database, while DB(...)=value"
|
||||
"will write a value to the database. On a read, this function"
|
||||
"returns the value from the datase, or NULL if it does not exist."
|
||||
"On a write, this function will always return NULL.",
|
||||
.read = function_db_read,
|
||||
.write = function_db_write,
|
||||
};
|
||||
|
Reference in New Issue