[asterisk-commits] oej: branch oej/codename-appleraisin-trunk r176934 - /team/oej/codename-apple...

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Feb 18 03:33:59 2009
New Revision: 176934

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=176934
Log:
Note to myself: Don't code after bedtime, at least not without the two important C's : coke and cookies.

Modified:
    team/oej/codename-appleraisin-trunk/main/db.c

Modified: team/oej/codename-appleraisin-trunk/main/db.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/codename-appleraisin-trunk/main/db.c?view=diff&rev=176934&r1=176933&r2=176934
==============================================================================
--- team/oej/codename-appleraisin-trunk/main/db.c (original)
+++ team/oej/codename-appleraisin-trunk/main/db.c Wed Feb 18 03:33:59 2009
@@ -95,9 +95,9 @@
 
 	if (ast_strlen_zero(key)) {
 		/* Load all entries in the astdb */
-		resultset = ast_load_realtime(db_rt_sysnamelabel, db_rt_sysname, SENTINEL);
-	} else {
-		resultset = ast_load_realtime(db_rt_sysnamelabel, db_rt_sysname, db_rt_name, key, SENTINEL);
+		resultset = ast_load_realtime(db_rt_family, db_rt_sysnamelabel, db_rt_sysname, SENTINEL);
+	} else {
+		resultset = ast_load_realtime(db_rt_family, db_rt_sysnamelabel, db_rt_sysname, db_rt_name, key, SENTINEL);
 	}
 	return resultset;
 }
@@ -197,10 +197,10 @@
 		/* Now, the question here is if we're overwriting or adding 
 			First, let's try updating it.
 		*/
-		res = ast_update_realtime(db_rt_sysnamelabel, db_rt_sysname, db_rt_name, fullkey, db_rt_value, value, SENTINEL);
+		res = ast_update_realtime(db_rt_family, db_rt_sysnamelabel, db_rt_sysname, db_rt_name, fullkey, db_rt_value, value, SENTINEL);
 		if (!res) {
 			/* Update failed, let's try adding a new record */
-			res = ast_store_realtime(db_rt_sysnamelabel, db_rt_sysname, db_rt_name, fullkey, db_rt_value, value, SENTINEL);
+			res = ast_store_realtime(db_rt_family, db_rt_sysnamelabel, db_rt_sysname, db_rt_name, fullkey, db_rt_value, value, SENTINEL);
 		}
 	} else {
 		memset(&key, 0, sizeof(key));
@@ -238,7 +238,7 @@
 	if (db_rt) {
 		struct ast_variable *var;
 
-		var = ast_load_realtime(db_rt_sysnamelabel, db_rt_sysname, db_rt_family, db_rt_name, fullkey, SENTINEL);
+		var = ast_load_realtime(db_rt_family, db_rt_sysnamelabel, db_rt_sysname, db_rt_family, db_rt_name, fullkey, SENTINEL);
 		if (!var) {
 			res = 0;
 		} else {
@@ -296,7 +296,7 @@
 	
 	fullkeylen = snprintf(fullkey, sizeof(fullkey), "/%s/%s", family, keys);
 	if (db_rt) {
-		res = ast_destroy_realtime(db_rt_sysnamelabel, db_rt_sysname, db_rt_family, db_rt_name, fullkey, SENTINEL);
+		res = ast_destroy_realtime(db_rt_family, db_rt_sysnamelabel, db_rt_sysname, db_rt_name, fullkey, SENTINEL);
 	} else {
 		memset(&key, 0, sizeof(key));
 		key.data = fullkey;