[Asterisk-cvs] asterisk/funcs func_db.c,1.2,1.3

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/funcs
In directory mongoose.digium.com:/tmp/cvs-serv14065/funcs

Modified Files:
	func_db.c 
Log Message:
Cache result from database function reads (conf call)


Index: func_db.c
===================================================================
RCS file: /usr/cvsroot/asterisk/funcs/func_db.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- func_db.c	18 May 2005 23:38:25 -0000	1.2
+++ func_db.c	19 May 2005 17:49:14 -0000	1.3
@@ -51,8 +51,10 @@
 	}
 
 	if (ast_db_get(family, key, buf, len-1)) {
-		ast_log(LOG_WARNING, "DB: %s/%s not found in database.\n", family, key);
-	}
+		ast_log(LOG_DEBUG, "DB: %s/%s not found in database.\n", family, key);
+	} else
+		pbx_builtin_setvar_helper(chan, "DB_RESULT", buf);
+
 	
 	return buf;
 }
@@ -93,11 +95,12 @@
 	.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.",
+	.desc = "This function will read or write a value from/to the Asterisk database.\n"
+		"DB(...) will read a value from the database, while DB(...)=value\n"
+		"will write a value to the database.  On a read, this function\n"
+		"returns the value from the datase, or NULL if it does not exist.\n"
+		"On a write, this function will always return NULL.  Reading a database value\n"
+		"will also set the global variable DB_RESULT.\n",
 	.read = function_db_read,
 	.write = function_db_write,
 };
@@ -128,8 +131,10 @@
 
 	if (ast_db_get(family, key, buf, len-1))
 		ast_copy_string(buf, "0", len);	
-	else
+	else {
+		pbx_builtin_setvar_helper(chan, "DB_RESULT", buf);
 		ast_copy_string(buf, "1", len);
+	}
 	
 	return buf;
 }
@@ -143,6 +148,7 @@
 	.syntax = "DB_EXISTS(<family>/<key>)",
 	.desc = "This function will check to see if a key exists in the Asterisk\n"
 		"database. If it exists, the function will return \"1\". If not,\n"
-		"it will return \"0\".",
+		"it will return \"0\".  Checking for existance of database value will\n"
+		"also set the global variable DB_RESULT to that value if it exists.\n",
 	.read = function_db_exists,
 };