--- mqtt/src/pubmqtt.c	2012/02/01 15:44:40	1.2.2.2
+++ mqtt/src/pubmqtt.c	2012/05/08 13:04:02	1.2.2.7
@@ -20,7 +20,8 @@ mqtt_rtlm_log(const char *fmt, ...)
 	vsyslog(LOG_ERR, fmt, lst);
 	va_end(lst);
 }
-#define MQTT_RTLM_LOG(_sql)	(assert((_sql)), mqtt_rtlm_log("Error:: SQL #%d - %s", \
+#define MQTT_RTLM_LOG(_sql)	(assert((_sql)), mqtt_rtlm_log("Error:: %s(%d) SQL #%d - %s", \
+					__func__, __LINE__, \
 					sqlite3_errcode((_sql)), sqlite3_errmsg((_sql))))
 
 
@@ -31,7 +32,7 @@ mqtt_rtlm_log(const char *fmt, ...)
  * return: NULL error or SQL handle
  */
 sqlite3 *
-mqtt_rtlm_open(sl_config *cfg)
+mqtt_rtlm_open(cfg_root_t *cfg)
 {
 	sqlite3 *sql = NULL;
 	const char *str = NULL;
@@ -39,12 +40,7 @@ mqtt_rtlm_open(sl_config *cfg)
 	if (!cfg)
 		return NULL;
 
-	/*
-	if (!sqlite3_threadsafe() || sqlite3_config(SQLITE_CONFIG_SERIALIZED))
-		return NULL;
-		*/
-
-	str = (const char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("name"));
+	str = cfg_getAttribute(cfg, "mqtt_pub", "name");
 	if (!str) {
 		mqtt_rtlm_log("Error:: Unknown database name ...\n");
 		return NULL;
@@ -89,7 +85,7 @@ mqtt_rtlm_close(sqlite3 *sql)
  * return: -1 error, 0 session already appears or >0 row changed
  */
 int
-mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, const char *connid, const char *user, 
+mqtt_rtlm_init_session(cfg_root_t *cfg, sqlite3 *sql, const char *connid, const char *user, 
 		const char *host, char will, ...)
 {
 	va_list lst;
@@ -100,7 +96,7 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
 	if (!cfg || !sql)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_online"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_online");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found online table name");
 		return -1;
@@ -145,7 +141,7 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
  * return: -1 error, 0 session already appears or >0 row changed
  */
 int
-mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, const char *connid, const char *user, const char *host)
+mqtt_rtlm_fini_session(cfg_root_t *cfg, sqlite3 *sql, const char *connid, const char *user, const char *host)
 {
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -154,7 +150,7 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
 	if (!cfg || !sql)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_online"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_online");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found online table name");
 		return -1;
@@ -189,7 +185,7 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
  * return: -1 error, 0 not logged or >0 logged found rows
  */
 int
-mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, const char *connid, const char *user, const char *host)
+mqtt_rtlm_chk_session(cfg_root_t *cfg, sqlite3 *sql, const char *connid, const char *user, const char *host)
 {
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -198,7 +194,7 @@ mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, co
 	if (!cfg || !sql)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_online"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_online");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found online table name");
 		return -1;
@@ -234,7 +230,7 @@ mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, co
  * return: -1 error, 0 no publish or >0 published ok
  */
 int
-mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, const char *txt, 
+mqtt_rtlm_write_topic(cfg_root_t *cfg, sqlite3 *sql, u_short msgid, const char *topic, const char *txt, 
 		const char *user, const char *host, char retain)
 {
 	int ret = 0;
@@ -244,7 +240,7 @@ mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, u_
 	if (!cfg || !sql || !topic)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_topics"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_topics");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return -1;
@@ -283,7 +279,7 @@ mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, u_
  * return: -1 error, 0 no changes or >0 deleted rows
  */
 int
-mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, 
+mqtt_rtlm_delete_topic(cfg_root_t *cfg, sqlite3 *sql, u_short msgid, const char *topic, 
 		const char *user, const char *host, char retain)
 {
 	int ret = 0;
@@ -293,7 +289,7 @@ mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, u
 	if (!cfg || !sql || !topic)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_topics"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_topics");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return -1;
@@ -340,7 +336,7 @@ mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, u
  * return: NULL error or not found and !=NULL allocated subscribe topics
  */
 mqtt_subscr_t *
-mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, char retain)
+mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, u_short msgid, const char *topic, char retain)
 {
 	int rowz = 0;
 	char *str, szStr[STRSIZ], szStmt[BUFSIZ] = { 0 };
@@ -363,7 +359,7 @@ mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, u_s
 			break;
 	}
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_topics"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_topics");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return NULL;
@@ -414,7 +410,7 @@ end:
  * return: -1 error, 0 no publish or >0 published ok
  */
 int
-mqtt_rtlm_write_subscribe(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, 
+mqtt_rtlm_write_subscribe(cfg_root_t *cfg, sqlite3 *sql, u_short msgid, const char *topic, 
 		const char *user, const char *host, char qos)
 {
 	int ret = 0;
@@ -424,7 +420,7 @@ mqtt_rtlm_write_subscribe(sl_config *cfg, sqlite3 *sql
 	if (!cfg || !sql || !topic)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_subscribes"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_subscribes");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found subscribes table name");
 		return -1;
@@ -458,30 +454,27 @@ mqtt_rtlm_write_subscribe(sl_config *cfg, sqlite3 *sql
  * @topic = topic
  * @user = username
  * @host = hostname
- * @qos = Subscribe QoS if -1 no matter
  * return: -1 error, 0 no changes or >0 deleted rows
  */
 int
-mqtt_rtlm_delete_subscribe(sl_config *cfg, sqlite3 *sql, const char *topic, 
-		const char *user, const char *host, char qos)
+mqtt_rtlm_delete_subscribe(cfg_root_t *cfg, sqlite3 *sql, const char *topic, 
+		const char *user, const char *host)
 {
 	int ret = 0;
-	char *str, szStr[STRSIZ] = { 0 }, szStmt[BUFSIZ] = { 0 };
+	char *str, szStmt[BUFSIZ] = { 0 };
 	sqlite3_stmt *stmt;
 
 	if (!cfg || !sql || !topic)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_subscribes"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_subscribes");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found subscribes table name");
 		return -1;
 	}
-	if (qos > -1 && qos < 3)
-		snprintf(szStr, sizeof szStr, "AND QoS = %d", qos);
 	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE Topic LIKE '%s' AND "
-			"PubUser LIKE '%s' AND PubHost LIKE '%s' %s;", str, 
-			topic, user, host, szStr);
+			"PubUser LIKE '%s' AND PubHost LIKE '%s';", str, 
+			topic, user, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -508,7 +501,7 @@ mqtt_rtlm_delete_subscribe(sl_config *cfg, sqlite3 *sq
  * return: NULL error or not found and !=NULL allocated subscribe topics
  */
 mqtt_subscr_t *
-mqtt_rtlm_read_subscribe(sl_config *cfg, sqlite3 *sql, const char *topic)
+mqtt_rtlm_read_subscribe(cfg_root_t *cfg, sqlite3 *sql, const char *topic)
 {
 	int rowz = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -519,7 +512,7 @@ mqtt_rtlm_read_subscribe(sl_config *cfg, sqlite3 *sql,
 	if (!cfg || !sql || !topic)
 		return NULL;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_subscribes"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_subscribes");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found subscribes table name");
 		return NULL;