Add a massive set of changes for converting to use the ast_debug() macro.
[asterisk/asterisk.git] / apps / app_db.c
index e633cbf..01e4408 100644 (file)
  *
  * \brief Database access functions
  *
+ * \author Mark Spencer <markster@digium.com>
+ * \author Jefferson Noxon <jeff@debian.org>
+ *
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/options.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -45,65 +48,38 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
 
-static char *tdesc = "Database Access Functions";
-
-static char *g_descrip =
-"  DBget(varname=family/key[|options]): This application will retrieve a value\n"
-"from the Asterisk database and store it in the given variable.\n"
-"  Options:\n"
-"    j - Jump to priority n+101 if the requested family/key isn't found.\n"
-"  This application sets the following channel variable upon completion:\n"
-"    DBGETSTATUS - This variable will contain the status of the attempt\n"
-"                  FOUND | NOTFOUND \n"
-"  This application has been deprecated in favor of the DB function.\n";
-
-static char *p_descrip =
-"  DBput(family/key=value): This application will store the given value in the\n"
-"specified location in the Asterisk database.\n"
-"  This application has been deprecated in favor of the DB function.\n";
-
+/*! \todo XXX Remove this application after 1.4 is relased */
 static char *d_descrip =
-"  DBdel(family/key): This applicaiton will delete a key from the Asterisk\n"
-"database.\n";
+"  DBdel(family/key): This application will delete a key from the Asterisk\n"
+"database.\n"
+"  This application has been DEPRECATED in favor of the DB_DELETE function.\n";
 
 static char *dt_descrip =
 "  DBdeltree(family[/keytree]): This application will delete a family or keytree\n"
 "from the Asterisk database\n";
 
-static char *g_app = "DBget";
-static char *p_app = "DBput";
 static char *d_app = "DBdel";
 static char *dt_app = "DBdeltree";
 
-static char *g_synopsis = "Retrieve a value from the database";
-static char *p_synopsis = "Store a value in the database";
 static char *d_synopsis = "Delete a key from the database";
 static char *dt_synopsis = "Delete a family or keytree from the database";
 
-STANDARD_LOCAL_USER;
-
-LOCAL_USER_DECL;
 
 static int deltree_exec(struct ast_channel *chan, void *data)
 {
        char *argv, *family, *keytree;
-       struct localuser *u;
+       struct ast_module_user *u;
 
-       LOCAL_USER_ADD(u);
+       u = ast_module_user_add(chan);
 
        argv = ast_strdupa(data);
-       if (!argv) {
-               ast_log(LOG_ERROR, "Memory allocation failed\n");
-               LOCAL_USER_REMOVE(u);
-               return 0;
-       }
 
        if (strchr(argv, '/')) {
                family = strsep(&argv, "/");
                keytree = strsep(&argv, "\0");
                        if (!family || !keytree) {
-                               ast_log(LOG_DEBUG, "Ignoring; Syntax error in argument\n");
-                               LOCAL_USER_REMOVE(u);
+                               ast_debug(1, "Ignoring; Syntax error in argument\n");
+                               ast_module_user_remove(u);
                                return 0;
                        }
                if (ast_strlen_zero(keytree))
@@ -125,7 +101,7 @@ static int deltree_exec(struct ast_channel *chan, void *data)
                        ast_verbose(VERBOSE_PREFIX_3 "DBdeltree: Error deleting key from database.\n");
        }
 
-       LOCAL_USER_REMOVE(u);
+       ast_module_user_remove(u);
 
        return 0;
 }
@@ -133,23 +109,24 @@ static int deltree_exec(struct ast_channel *chan, void *data)
 static int del_exec(struct ast_channel *chan, void *data)
 {
        char *argv, *family, *key;
-       struct localuser *u;
+       struct ast_module_user *u;
+       static int deprecation_warning = 0;
 
-       LOCAL_USER_ADD(u);
+       u = ast_module_user_add(chan);
 
-       argv = ast_strdupa(data);
-       if (!argv) {
-               ast_log (LOG_ERROR, "Memory allocation failed\n");
-               LOCAL_USER_REMOVE(u);
-               return 0;
+       if (!deprecation_warning) {
+               deprecation_warning = 1;
+               ast_log(LOG_WARNING, "The DBdel application has been deprecated in favor of the DB_DELETE dialplan function!\n");
        }
 
+       argv = ast_strdupa(data);
+
        if (strchr(argv, '/')) {
                family = strsep(&argv, "/");
                key = strsep(&argv, "\0");
                if (!family || !key) {
-                       ast_log(LOG_DEBUG, "Ignoring; Syntax error in argument\n");
-                       LOCAL_USER_REMOVE(u);
+                       ast_debug(1, "Ignoring; Syntax error in argument\n");
+                       ast_module_user_remove(u);
                        return 0;
                }
                if (option_verbose > 2)
@@ -159,165 +136,32 @@ static int del_exec(struct ast_channel *chan, void *data)
                                ast_verbose(VERBOSE_PREFIX_3 "DBdel: Error deleting key from database.\n");
                }
        } else {
-               ast_log(LOG_DEBUG, "Ignoring, no parameters\n");
-       }
-
-       LOCAL_USER_REMOVE(u);
-       
-       return 0;
-}
-
-static int put_exec(struct ast_channel *chan, void *data)
-{
-       char *argv, *value, *family, *key;
-       static int dep_warning = 0;
-       struct localuser *u;
-
-       LOCAL_USER_ADD(u);
-
-       if (!dep_warning) {
-               ast_log(LOG_WARNING, "This application has been deprecated, please use the ${DB(family/key)} function instead.\n");
-               dep_warning = 1;
-       }
-       
-       argv = ast_strdupa(data);
-       if (!argv) {
-               ast_log(LOG_ERROR, "Memory allocation failed\n");
-               LOCAL_USER_REMOVE(u);
-               return 0;
-       }
-
-       if (strchr(argv, '/') && strchr(argv, '=')) {
-               family = strsep(&argv, "/");
-               key = strsep(&argv, "=");
-               value = strsep(&argv, "\0");
-               if (!value || !family || !key) {
-                       ast_log(LOG_DEBUG, "Ignoring; Syntax error in argument\n");
-                       LOCAL_USER_REMOVE(u);
-                       return 0;
-               }
-               if (option_verbose > 2)
-                       ast_verbose(VERBOSE_PREFIX_3 "DBput: family=%s, key=%s, value=%s\n", family, key, value);
-               if (ast_db_put(family, key, value)) {
-                       if (option_verbose > 2)
-                               ast_verbose(VERBOSE_PREFIX_3 "DBput: Error writing value to database.\n");
-               }
-
-       } else  {
-               ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
+               ast_debug(1, "Ignoring, no parameters\n");
        }
 
-       LOCAL_USER_REMOVE(u);
-
-       return 0;
-}
-
-static int get_exec(struct ast_channel *chan, void *data)
-{
-       char *argv, *varname, *family, *key, *options = NULL;
-       char dbresult[256];
-       static int dep_warning = 0;
-       int priority_jump = 0;
-       struct localuser *u;
-
-       LOCAL_USER_ADD(u);
-
-       if (!dep_warning) {
-               ast_log(LOG_WARNING, "This application has been deprecated, please use the ${DB(family/key)} function instead.\n");
-               dep_warning = 1;
-       }
+       ast_module_user_remove(u);
        
-       argv = ast_strdupa(data);
-       if (!argv) {
-               ast_log(LOG_ERROR, "Memory allocation failed\n");
-               LOCAL_USER_REMOVE(u);
-               return 0;
-       }
-
-       if (strchr(argv, '=') && strchr(argv, '/')) {
-               varname = strsep(&argv, "=");
-               family = strsep(&argv, "/");
-               if (strchr((void *)&argv, '|')) {
-                       key = strsep(&argv, "|");
-                       options = strsep(&argv, "\0");
-               } else
-                       key = strsep(&argv, "\0");
-                       
-               if (!varname || !family || !key) {
-                       ast_log(LOG_DEBUG, "Ignoring; Syntax error in argument\n");
-                       LOCAL_USER_REMOVE(u);
-                       return 0;
-               }
-
-               if (options) {
-                       if (strchr(options, 'j'))
-                               priority_jump = 1;
-               }
-                       
-               if (option_verbose > 2)
-                       ast_verbose(VERBOSE_PREFIX_3 "DBget: varname=%s, family=%s, key=%s\n", varname, family, key);
-               if (!ast_db_get(family, key, dbresult, sizeof (dbresult) - 1)) {
-                       pbx_builtin_setvar_helper(chan, varname, dbresult);
-                       if (option_verbose > 2)
-                               ast_verbose(VERBOSE_PREFIX_3 "DBget: set variable %s to %s\n", varname, dbresult);
-                       pbx_builtin_setvar_helper(chan, "DBGETSTATUS", "FOUND");
-               } else {
-                       if (option_verbose > 2)
-                       ast_verbose(VERBOSE_PREFIX_3 "DBget: Value not found in database.\n");
-                       if (priority_jump || ast_opt_priority_jumping) {
-                               /* Send the call to n+101 priority, where n is the current priority */
-                               ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101);
-                       }
-                       pbx_builtin_setvar_helper(chan, "DBGETSTATUS", "NOTFOUND");
-               }
-       } else {
-               ast_log(LOG_DEBUG, "Ignoring, no parameters\n");
-       }
-
-       LOCAL_USER_REMOVE(u);
-
        return 0;
 }
 
-int unload_module(void)
+static int unload_module(void)
 {
        int retval;
 
        retval = ast_unregister_application(dt_app);
        retval |= ast_unregister_application(d_app);
-       retval |= ast_unregister_application(p_app);
-       retval |= ast_unregister_application(g_app);
-
-       STANDARD_HANGUP_LOCALUSERS;
 
        return retval;
 }
 
-int load_module(void)
+static int load_module(void)
 {
        int retval;
 
-       retval = ast_register_application(g_app, get_exec, g_synopsis, g_descrip);
-       retval |= ast_register_application(p_app, put_exec, p_synopsis, p_descrip);
-       retval |= ast_register_application(d_app, del_exec, d_synopsis, d_descrip);
+       retval = ast_register_application(d_app, del_exec, d_synopsis, d_descrip);
        retval |= ast_register_application(dt_app, deltree_exec, dt_synopsis, dt_descrip);
        
        return retval;
 }
 
-char *description(void)
-{
-       return tdesc;
-}
-
-int usecount(void)
-{
-       int res;
-       STANDARD_USECOUNT(res);
-       return res;
-}
-
-char *key()
-{
-       return ASTERISK_GPL_KEY;
-}
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Database Access Functions");