deleted file mode 100644

Binary files a/modules_k/presence_xml/doc/.presence_xml_user.sgml.swp and /dev/null differ

@@ -15,7 +15,7 @@

 	<title>Overview</title>

 	<para> 

 	The module does specific handling for notify-subscribe events using xml bodies.

-	It is used with the general event handling module, presence. It constructs and add

+	It is used with the general event handling module, presence. It constructs and adds

 	3 events to it: presence, presence.winfo, dialog;sla. 

 	</para>

 	<para>

@@ -871,14 +871,14 @@ str* build_off_nbody(str p_user, str p_domain, str* etag)

 	result_cols[body_col=n_result_cols++] = "body" ;

-	if (pa_dbf.use_table(pa_db, presentity_table) < 0) 

+	if (pxml_dbf.use_table(pxml_db, presentity_table) < 0) 

 	{

 		LOG(L_ERR, "PRESENCE: build_off_nbody: Error in use_table\n");

 		goto error;

 	}

 	DBG("PRESENCE: build_off_nbody: querying presentity\n");

-	if (pa_dbf.query (pa_db, query_cols, query_ops, query_vals,

+	if (pxml_dbf.query (pxml_db, query_cols, query_ops, query_vals,

 		 result_cols, n_query_cols, n_result_cols, 0,  &result) < 0) 

 	{

 		LOG(L_ERR, "PRESENCE: build_off_nbody: Error while querying"

@@ -989,7 +989,7 @@ str* build_off_nbody(str p_user, str p_domain, str* etag)

 	DBG("PRESENCE: build_off_nbody:new_body:\n%.*s\n",body->len, body->s);

 	if(result !=NULL)

-		pa_dbf.free_result(pa_db, result);

+		pxml_dbf.free_result(pxml_db, result);

     /*free the document */

     xmlFreeDoc(doc);

@@ -1018,7 +1018,7 @@ error:

 	if(new_doc)

 		xmlFreeDoc(new_doc);

 	if(result)

-		pa_dbf.free_result(pa_db, result);

+		pxml_dbf.free_result(pxml_db, result);

 	if(body)

 	{

 		if(body->s)

@@ -63,8 +63,8 @@ int force_active= 0;

 struct sl_binds slb;

 /* database connection */

-db_con_t *pa_db = NULL;

-db_func_t pa_dbf;

+db_con_t *pxml_db = NULL;

+db_func_t pxml_dbf;

 static cmd_export_t cmds[]=

@@ -113,21 +113,21 @@ static int mod_init(void)

 			db_url.s);

 	/* binding to mysql module  */

-	if (bind_dbmod(db_url.s, &pa_dbf))

+	if (bind_dbmod(db_url.s, &pxml_dbf))

 	{

 		DBG("presence_xml:mod_init: ERROR: Database module not found\n");

 		return -1;

 	}

-	if (!DB_CAPABILITY(pa_dbf, DB_CAP_ALL)) {

+	if (!DB_CAPABILITY(pxml_dbf, DB_CAP_ALL)) {

 		LOG(L_ERR,"presence_xml:mod_init: ERROR Database module does not implement "

 		    "all functions needed by the module\n");

 		return -1;

 	}

-	pa_db = pa_dbf.init(db_url.s);

-	if (!pa_db)

+	pxml_db = pxml_dbf.init(db_url.s);

+	if (!pxml_db)

 	{

 		LOG(L_ERR,"presence_xml:mod_init: Error while connecting database\n");

 		return -1;

@@ -135,7 +135,7 @@ static int mod_init(void)

 	_s.s = xcap_table;

 	_s.len = strlen(xcap_table);

-	 ver =  table_version(&pa_dbf, pa_db, &_s);

+	 ver =  table_version(&pxml_dbf, pxml_db, &_s);

 	if(ver!=S_TABLE_VERSION)

 	{

 		LOG(L_ERR,"presence_xml:mod_init: Wrong version v%d for table <%s>,"

@@ -172,6 +172,9 @@ static int mod_init(void)

 		LOG(L_ERR, "presence_xml:mod_init: ERROR while adding xml events\n");

 		return -1;		

 	}	

+	if(pxml_db)

+		pxml_dbf.close(pxml_db);

+	pxml_db = NULL;

 	return 0;

 }

@@ -179,12 +182,38 @@ static int mod_init(void)

 static int child_init(int rank)

 {

 	DBG("presence_xml: init_child [%d]  pid [%d]\n", rank, getpid());

+	

+	if (pxml_dbf.init==0)

+	{

+		LOG(L_CRIT, "BUG: PRESENCE_XML: child_init: database not bound\n");

+		return -1;

+	}

+	pxml_db = pxml_dbf.init(db_url.s);

+	if (!pxml_db)

+	{

+		LOG(L_ERR,"PRESENCE_XML: child %d: Error while connecting database\n",

+				rank);

+		return -1;

+	}

+	else

+	{

+		if (pxml_dbf.use_table(pxml_db, xcap_table) < 0)  

+		{

+			LOG(L_ERR, "PRESENCE_XML: child %d: Error in use_table\n", rank);

+			return -1;

+		}

+		

+		DBG("PRESENCE_XML: child %d: Database connection opened successfully\n", rank);

+	}

+

 	return 0;

 }	

 static void destroy(void)

 {	

 	DBG("presence_xml: destroying module ...\n");

+	if(pxml_db && pxml_dbf.close)

+		pxml_dbf.close(pxml_db);

 	return ;

 }

@@ -33,8 +33,8 @@

 extern char *xcap_table;  

 extern add_event_t pres_add_event;

-extern db_con_t *pa_db = NULL;

-extern db_func_t pa_dbf;

+extern db_con_t *pxml_db = NULL;

+extern db_func_t pxml_dbf;

 extern int force_active;

 /* SL bind */

 extern struct sl_binds slb;

@@ -29,12 +29,14 @@

 #include "../../str.h"

 #include "../../dprint.h"

 #include "../presence/utils_func.h"

+#include "presence_xml.h"

 #include "xcap_auth.h"

 #include "pidf.h"

-#include "presence_xml.h"

 extern char* xcap_table;

 extern int force_active;

+extern db_func_t pxml_dbf;

+extern db_con_t *pxml_db;

 int is_watcher_allowed( subs_t* subs, xmlDocPtr xcap_tree );

@@ -331,13 +333,13 @@ xmlDocPtr get_xcap_tree(str user, str domain)

 	result_cols[0] = "xcap";

-	if (pa_dbf.use_table(pa_db, xcap_table) < 0) 

+	if (pxml_dbf.use_table(pxml_db, xcap_table) < 0) 

 	{

 		LOG(L_ERR, "PRESENCE_XML:get_xcap_tree: Error in use_table\n");

 		return NULL;

 	}

-	if( pa_dbf.query(pa_db, query_cols, 0 , query_vals, result_cols, 

+	if( pxml_dbf.query(pxml_db, query_cols, 0 , query_vals, result_cols, 

 				n_query_cols, 1, 0, &result)<0)

 	{

 		LOG(L_ERR, "PRESENCE_XML:get_xcap_tree:Error while querying table xcap for"

@@ -385,13 +387,13 @@ xmlDocPtr get_xcap_tree(str user, str domain)

 	}

 	if(result!=NULL)

-		pa_dbf.free_result(pa_db, result);

+		pxml_dbf.free_result(pxml_db, result);

 	return xcap_tree;

 error:

 	if(result!=NULL)

-		pa_dbf.free_result(pa_db, result);

+		pxml_dbf.free_result(pxml_db, result);

 	return NULL;

 }