@@ -44,7 +44,7 @@ typedef int (publ_handling_t)(struct sip_msg*);

 typedef int (subs_handling_t)(struct sip_msg*);

-typedef str* (agg_nbody_t)(str** body_array, int n, int off_index);

+typedef str* (agg_nbody_t)(str* pres_user, str* pres_domain, str** body_array, int n, int off_index);

 /* params for agg_body_t 

  *	body_array= an array with all the bodies stored for that resource

  *	n= the number of bodies

@@ -411,9 +411,11 @@ str* get_p_notify_body(str user, str host, ev_t* event, str* etag,

 	db_val_t *row_vals;

 	int n_result_cols = 0;

 	int n_query_cols = 0;

-	int i, n;

+	int i, n, len;

 	int build_off_n= -1; 

 	str etags;

+	str* body;

+	int size= 0;

 	query_cols[n_query_cols] = "domain";

 	query_vals[n_query_cols].type = DB_STR;

@@ -464,8 +466,17 @@ str* get_p_notify_body(str user, str host, ev_t* event, str* etag,

 		DBG("PRESENCE: get_p_notify_body: The query returned no"

 				" result\n[username]= %.*s\t[domain]= %.*s\t[event]= %.*s\n",

 				user.len, user.s, host.len, host.s, event->stored_name.len, event->stored_name.s);

-

+		

 		pa_dbf.free_result(pa_db, result);

+		result= NULL;

+

+		if(event->agg_nbody)

+		{

+			notify_body = event->agg_nbody(&user, &host, NULL, 0, -1);

+			if(notify_body)

+				goto done;

+		}	

+			

 		return NULL;

 	}

 	else

@@ -473,7 +484,6 @@ str* get_p_notify_body(str user, str host, ev_t* event, str* etag,

 		n= result->n;

 		if(event->agg_nbody== NULL )

 		{

-			int len;

 			DBG("PRESENCE:get_p_notify_body: Event does not require aggregation\n");

 			row = &result->rows[n-1];

 			row_vals = ROW_VALUES(row);

@@ -495,7 +505,7 @@ str* get_p_notify_body(str user, str host, ev_t* event, str* etag,

 				goto error;

 			}

 			memset(notify_body, 0, sizeof(str));

-			notify_body->s= (char*)malloc( len* sizeof(char));

+			notify_body->s= (char*)pkg_malloc( len* sizeof(char));

 			if(notify_body->s== NULL)

 			{

 				LOG(L_ERR, "PRESENCE:get_p_notify_body: ERROR while allocating memory\n");

@@ -504,12 +514,14 @@ str* get_p_notify_body(str user, str host, ev_t* event, str* etag,

 			}

 			memcpy(notify_body->s, row_vals[body_col].val.string_val, len);

 			notify_body->len= len;

-			goto done;

+			pa_dbf.free_result(pa_db, result);

+			

+			return notify_body;

 		}

 		DBG("PRESENCE:get_p_notify_body: Event requires aggregation\n");

-

-		body_array =(str**)pkg_malloc( (result->n)*sizeof(str*));

+		

+		body_array =(str**)pkg_malloc( (n+1) *sizeof(str*));

 		if(body_array == NULL)

 		{

 			LOG(L_ERR, "PRESENCE:get_p_notify_body:ERROR while allocating"

@@ -522,7 +534,7 @@ str* get_p_notify_body(str user, str host, ev_t* event, str* etag,

 			DBG("PRESENCE:get_p_notify_body:searched etag = %.*s len= %d\n", 

 					etag->len, etag->s, etag->len);

 			DBG( "PRESENCE:get_p_notify_body: etag not NULL\n");

-			for(i= 0; i<result->n; i++)

+			for(i= 0; i< n; i++)

 			{

 				row = &result->rows[i];

 				row_vals = ROW_VALUES(row);

@@ -536,28 +548,76 @@ str* get_p_notify_body(str user, str host, ev_t* event, str* etag,

 				{

 					DBG("PRESENCE:get_p_notify_body found etag  \n");

 					build_off_n= i;

-				}	

-				body_array[i] =&row_vals[body_col].val.str_val;

+				}

+				len= strlen(row_vals[body_col].val.string_val);

+				if(len== 0)

+				{

+					LOG(L_ERR, "PRESENCE:get_p_notify_body:ERROR Empty notify body record\n");

+					goto error;

+				}

+			

+				size= sizeof(str)+ len* sizeof(char);

+				body= (str*)pkg_malloc(size);

+				if(body== NULL)

+				{

+					LOG(L_ERR, "PRESENCE:get_p_notify_body: ERROR while allocating memory\n");

+					goto error;

+				}

+				memset(body, 0, size);

+				size= sizeof(str);

+				body->s= (char*)body+ size;

+				memcpy(body->s, row_vals[body_col].val.string_val, len);

+				body->len= len;

+

+				body_array[i]= body;

 			}

 		}	

 		else

 		{	

-			for(i=0;i<result->n;i++)

+			for(i=0; i< n; i++)

 			{

 				row = &result->rows[i];

 				row_vals = ROW_VALUES(row);

-				body_array[i] =&row_vals[body_col].val.str_val;

+				

+				len= strlen(row_vals[body_col].val.string_val);

+				if(len== 0)

+				{

+					LOG(L_ERR, "PRESENCE:get_p_notify_body:ERROR Empty notify body record\n");

+					goto error;

+				}

+				

+				size= sizeof(str)+ len* sizeof(char);

+				body= (str*)pkg_malloc(size);

+				if(body== NULL)

+				{

+					LOG(L_ERR, "PRESENCE:get_p_notify_body: ERROR while allocating memory\n");

+					goto error;

+				}

+				memset(body, 0, size);

+				size= sizeof(str);

+				body->s= (char*)body+ size;

+				memcpy(body->s, row_vals[body_col].val.string_val, len);

+				body->len= len;

+

+				body_array[i]= body;

 			}			

 		}

-	

-		notify_body = event->agg_nbody(body_array, result->n, build_off_n);

+		pa_dbf.free_result(pa_db, result);

+		result= NULL;

+

+		notify_body = event->agg_nbody(&user, &host, body_array, n, build_off_n);

 	}

 done:	

-	if(result!=NULL)

-		pa_dbf.free_result(pa_db, result);

 	if(body_array!=NULL)

+	{

+		for(i= 0; i< n; i++)

+		{

+			if(body_array[i])

+				pkg_free(body_array[i]);

+		}

 		pkg_free(body_array);

+	}

 	return notify_body;

 error:

@@ -565,7 +625,19 @@ error:

 		pa_dbf.free_result(pa_db, result);

 	if(body_array!=NULL)

+	{

+		for(i= 0; i< n; i++)

+		{

+			if(body_array[i])

+				pkg_free(body_array[i]);

+			else

+				break;

+

+		}

+	

 		pkg_free(body_array);

+	}

+

 	return NULL;

 }

@@ -340,7 +340,9 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body,

 		if (result->n > 0)

 		{

 			n_update_cols= 0;

-			

+			pa_dbf.free_result(pa_db, result);

+			result= NULL;

+

 			if(presentity->event->etag_not_new== 0)

 			{	

 				/* generate another etag */

@@ -410,7 +412,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body,

 							" updating presence information\n");

 					goto error;

 				}

-				pa_dbf.free_result(pa_db, result);

 				/* send 200ok */

 				if( publ_send200ok(msg, presentity->expires, cur_etag)< 0)

@@ -424,14 +425,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body,

 					pkg_free(etag.s);

 				return 0;

 			}

-/*

-			db_row_t *row = &result->rows[0];

-			db_val_t *row_vals = ROW_VALUES(row);

-			res_body.s = row_vals[body_col].val.str_val.s;	

-			res_body.len = row_vals[body_col].val.str_val.len;

-*/			

-			//	update_xml( &res_body, body);

-			/* write the new body*/

 			update_keys[n_update_cols] = "body";

 			update_vals[n_update_cols].type = DB_BLOB;

@@ -448,8 +441,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body,

 				goto error;

 			}

-			pa_dbf.free_result(pa_db, result);

-			result= NULL;

 			/* send 200OK */

 			if( publ_send200ok(msg, presentity->expires, cur_etag)< 0)

@@ -472,6 +463,8 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body,

 		}  

 		else  /* if there isn't no registration with those 3 values */

 		{

+			pa_dbf.free_result(pa_db, result);

+			result= NULL;

 			LOG(L_DBG, "PRESENCE:update_presentity: No E_Tag match\n");

 			if (slb.reply(msg, 412, &pu_412_rpl) == -1)

 			{

@@ -479,7 +472,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body,

 					"reply\n");

 				goto error;

 			}

-			pa_dbf.free_result(pa_db, result);

 		}

 	}

 	return 0;

@@ -487,10 +479,7 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body,

 error:

 	LOG(L_ERR, "PRESENCE:update_presentity: ERROR occured\n");

 	if(result)

-	{

 		pa_dbf.free_result(pa_db, result);

-		result= NULL;

-	}

 	if(etag.s)

 		pkg_free(etag.s);

@@ -27,8 +27,9 @@ Anca-Maria Vamanu

               1.3.2. xcap_table(str)

               1.3.3. force_active (int)

-        1.4. Exported Functions

-        1.5. Installation

+        1.4. pidf_manipulation (int)

+        1.5. Exported Functions

+        1.6. Installation

    2. Developer's Guide

@@ -40,7 +41,8 @@ Anca-Maria Vamanu

    1-1. Set db_url parameter

    1-2. Set xcap_table parameter

    1-3. Set force_active parameter

-   1-4. PRESECE_XML tables

+   1-4. Set pidf_manipulation parameter

+   1-5. PRESECE_XML tables

    2-1. libxml_api structure

      _________________________________________________________

@@ -50,7 +52,7 @@ Chapter 1. User's Guide

    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 3 events to it:

+   module, presence. It constructs and adds 3 events to it:

    presence, presence.winfo, dialog;sla.

    This module uses xcap_table with permission rules to deal with

@@ -122,17 +124,37 @@ modparam("presence_xml", "force_active", 1)

 ...

      _________________________________________________________

-1.4. Exported Functions

+1.4. pidf_manipulation (int)

+

+   Setting this parameter to 1 enables the features described in

+   RFC 4827. It gives the possiblity to have a permanent state

+   notified to the users even in the case in which the phone is

+   not online. The presence document is taken from the xcap

+   server and aggregated together with the other presence

+   information, if any exist, for each Notify that is sent to the

+   watchers. It is also possible to have information notified

+   even if not issuing any Publish (useful for services such as

+   email, SMS, MMS).

+

+   Default value is "0". 

+

+   Example 1-4. Set pidf_manipulation parameter

+...

+modparam("presence_xml", "pidf_manipulation", 1)

+...

+     _________________________________________________________

+

+1.5. Exported Functions

    None to be used in configuration file.

      _________________________________________________________

-1.5. Installation

+1.6. Installation

    The module requires 1 table in OpenSER database. Next SQL

    statements shows the syntax to create it.

-   Example 1-4. PRESECE_XML tables

+   Example 1-5. PRESECE_XML tables

 ...

 use openser;

@@ -132,6 +132,30 @@ modparam("presence_xml", "force_active", 1)

 		</example>

 	</section>

 </section>

+	<section>

+		<title><varname>pidf_manipulation</varname> (int)</title>

+		<para>

+		Setting this parameter to 1 enables the features described in RFC 4827.

+		It gives the possiblity to have a permanent state notified to the users

+		even in the case in which the phone is not online. The presence document

+		is taken from the xcap server and aggregated together with the other

+		presence information, if any exist, for each Notify that is sent to the

+		watchers. It is also possible to have information notified even if not 

+		issuing any Publish (useful for services such as email, SMS, MMS).

+		</para>

+		<para>

+		<emphasis>Default value is <quote>0</quote>.

+		</emphasis>

+		</para>

+		<example>

+		<title>Set <varname>pidf_manipulation</varname> parameter</title>

+		<programlisting format="linespecific">

+...

+modparam("presence_xml", "pidf_manipulation", 1)

+...

+</programlisting>

+		</example>

+	</section>

 <section>

 	<title>Exported Functions</title>

@@ -36,35 +36,44 @@

 #include "presence_xml.h"

 str* offline_nbody(str* body);

-str* agregate_xmls(str** body_array, int n);

+str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n);

 str* get_final_notify_body( subs_t *subs, str* notify_body, xmlNodePtr rule_node);

 extern int force_active;

+extern int pidf_manipulation;

-str* pres_agg_nbody(str** body_array, int n, int off_index)

+str* pres_agg_nbody(str* pres_user, str* pres_domain, str** body_array, int n, int off_index)

 {

 	str* n_body= NULL;

+	str* body= NULL;

+

+	if(body_array== NULL && !pidf_manipulation)

+		return NULL;

 	if(off_index>= 0)

 	{

-		body_array[off_index]= offline_nbody(body_array[off_index]);

+		body= body_array[off_index];

+		body_array[off_index]= offline_nbody(body);

+

 		if(body_array[off_index]== NULL || body_array[off_index]->s== NULL)

 		{

 			LOG(L_ERR, "PRESENCE_XML: ERROR while constructing offline body\n");

 			return NULL;

 		}

 	}

-	

-	n_body= agregate_xmls(body_array, n);

+

+	n_body= agregate_xmls(pres_user, pres_domain, body_array, n);

 	if(n_body== NULL)

 	{

-		LOG(L_ERR, "PRESENCE_XML: ERROR while constructing offline body\n");

+		LOG(L_ERR, "PRESENCE_XML: ERROR while aggregating body\n");

 	}

 	if(off_index>= 0)

 	{

 		xmlFree(body_array[off_index]->s);

 		pkg_free(body_array[off_index]);

+		body_array[off_index]= body;

 	}

+

 	xmlCleanupParser();

     xmlMemoryDump();

@@ -81,7 +90,13 @@ int pres_apply_auth(str* notify_body, subs_t* subs, str** final_nbody)

 	if(force_active)

 		return 0;

-	doc= get_xcap_tree(subs->to_user, subs->to_domain);

+	if(get_xcap_tree(subs->to_user, subs->to_domain, PRES_RULES, &doc)< 0)

+	{

+		LOG(L_ERR, "PRESENCE_XML:pres_apply_auth: Error while getting xcap doc"

+				" for pres_rules\n");

+		return -1;

+	}

+

 	if(doc== NULL)

 	{

 		DBG("PRESENCE_XML:pres_apply_auth: No xcap document found\n");

@@ -434,154 +449,7 @@ error:

 	return NULL;

 }	

-/*

-if(strncmp(subs->status.s, "active", 6)==0 && subs->reason.s

-					&& strncmp(subs->reason.s, "polite-block", 12)==0)

-				{

-					if(event->polite_block_nbody== NULL)

-					{

-						LOG(L_ERR, "PRESENCE_XML:notify: ERROR no plite_bloc_nbody hadling" 

-								" procedure defined for this event\n");

-						goto error;

-					}	

-					notify_body = event->polite_block_nbody(subs->to_user,subs->to_domain);

-					if(notify_body == NULL)

-					{

-						LOG(L_ERR, "PRESENCE_XML:notify: ERROR while building"

-							" polite-block body\n");

-						goto error;

-					}	

-

-

-

-if(xcap_tree!=NULL)

-		xmlFreeDoc(xcap_tree);

-

-

-

-int add_event(ev_t* event)

-{

-	ev_t* ev= NULL;

-	int size;

-	str str_name;

-	str* str_param= NULL;

-	char* sep= NULL;

-	str wipeer_name;

-	char buf[50];

-	int ret_code= 1;

-

-	str_name.s= name;

-	str_name.len= strlen(name);

-

-	if(param)

-	{

-		str_param= (str*)pkg_malloc(sizeof(str));

-		if(str_param== NULL)

-		{

-			LOG(L_ERR, "PRESENCE_XML: add_event: ERROR No more memory\n");

-			return -1;

-		}

-		str_param->s= param;

-		str_param->len= strlen(param);

-	}

-

-	if(contains_event(&str_name, str_param))

-	{

-		DBG("PRESENCE_XML: add_event: Found prevoius record for event\n");

-		ret_code= -1;

-		goto done;

-	}	

-	size= sizeof(ev_t)+ (str_name.len+ strlen(content_type))

-		*sizeof(char);

-

-	if(param)

-		size+= sizeof(str)+ ( 2*strlen(param) + str_name.len+ 1)* sizeof(char);

-

-	ev= (ev_t*)shm_malloc(size);

-	if(ev== NULL)

-	{

-		LOG(L_ERR, "PRESENCE_XML: add_event: ERROR while allocating memory\n");

-		ret_code= -1;

-		goto done;

-	}

-	memset(ev, 0, sizeof(ev_t));

-

-	size= sizeof(ev_t);

-	ev->name.s= (char*)ev+ size;

-	ev->name.len= str_name.len;

-	memcpy(ev->name.s, name, str_name.len);

-	size+= str_name.len;

-

-	if(str_param)

-	{	

-		ev->param= (str*)((char*)ev+ size);

-		size+= sizeof(str);

-		ev->param->s= (char*)ev+ size;

-		memcpy(ev->param->s, str_param->s, str_param->len);

-		ev->param->len= str_param->len;

-		size+= str_param->len;

-

-		ev->stored_name.s= (char*)ev+ size;

-		memcpy(ev->stored_name.s, name, str_name.len);

-		ev->stored_name.len= str_name.len;

-		memcpy(ev->stored_name.s+ ev->stored_name.len, ";", 1);

-		ev->stored_name.len+= 1;

-		memcpy(ev->stored_name.s+ ev->stored_name.len, str_param->s, str_param->len);

-		ev->stored_name.len+= str_param->len;

-		size+= ev->stored_name.len;

-	}

-	else

-	{

-		ev->stored_name.s= ev->name.s;

-		ev->stored_name.len= ev->name.len;

-	}	

-

-	ev->content_type.s= (char*)ev+ size;

-	ev->content_type.len= strlen(content_type);

-	memcpy(ev->content_type.s, content_type, ev->content_type.len);

-	size+= ev->content_type.len;

-	

-	ev->agg_body= agg_body;

-	

-	sep= strchr(name, '.');

-	if(sep)

-	{

-		if(strncmp(sep+1, "winfo", 5)== 0)

-		{	

-			ev->type= WINFO_TYPE;

-			wipeer_name.s= name;

-			wipeer_name.len= sep - name;

-			

-			ev->wipeer= contains_event(&wipeer_name, ev->param );

-		}

-		else

-		{	

-			ev->type= PUBL_TYPE;

-			wipeer_name.s= buf;

-			wipeer_name.len= sprintf(wipeer_name.s, "%s", name);

-			memcpy(wipeer_name.s+ wipeer_name.len, ".winfo", 5);

-			wipeer_name.len+= 5;

-			ev->wipeer= contains_event(&wipeer_name, ev->param);

-		}

-

-	}	

-	else

-		ev->type= PUBL_TYPE;

-

-	ev->next= EvList->events;

-	EvList->events= ev;

-	EvList->ev_count++;

-

-done:

-	if(str_param)

-		pkg_free(str_param);

-	return ret_code; 

-}

-

-*/

-

-str* agregate_xmls(str** body_array, int n)

-

+str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n)

 {

 	int i, j= 0, append ;

 	xmlNodePtr p_root= NULL, new_p_root= NULL ;

@@ -590,19 +458,40 @@ str* agregate_xmls(str** body_array, int n)

 	xmlNodePtr add_node = NULL ;

 	str *body= NULL;

 	char* id= NULL, *tuple_id = NULL;

+	xmlDocPtr pidf_manip_doc= NULL;

-	xml_array = (xmlDocPtr*)pkg_malloc( (n+1)*sizeof(xmlDocPtr));

-

+	xml_array = (xmlDocPtr*)pkg_malloc( (n+2)*sizeof(xmlDocPtr));

 	if(xml_array== NULL)

 	{

 		LOG(L_ERR,"PRESENCE:agregate_xmls: Error while alocating memory");

 		return NULL;

 	}

-	

-	memset(xml_array, 0, (n+1)*sizeof(xmlDocPtr)) ;

+	memset(xml_array, 0, (n+2)*sizeof(xmlDocPtr)) ;

-	for(i=0; i<n;i++)

+	/* if pidf_manipulation usage is configured */

+	if(pidf_manipulation)

+	{

+		if( get_xcap_tree(*pres_user, *pres_domain, PIDF_MANIPULATION, &pidf_manip_doc)< 0)

+		{

+			LOG(L_ERR, "PRESENCE:agregate_xmls: Error while getting xcap tree"

+					" for doc_type PIDF_MANIPULATION\n");

+			goto error;

+		}	

+

+		if(pidf_manip_doc== NULL)

+		{

+			DBG( "PRESENCE:agregate_xmls: No PIDF_MANIPULATION doc for [user]= %.*s"

+					" [domain]= %.*s found\n", pres_user->len, pres_user->s, pres_domain->len, pres_domain->s);

+		}		

+		else

+		{	

+			xml_array[0]= pidf_manip_doc;

+			j++;

+		}

+	}

+	

+	for(i=0; i<n; i++)

 	{

 		if(body_array[i] == NULL )

 			continue;

@@ -617,7 +506,14 @@ str* agregate_xmls(str** body_array, int n)

 		}

 		j++;

-	} 	

+	} 

+

+	if(j== 0)  /* no body */

+	{

+		if(xml_array)

+			pkg_free(xml_array);

+		return NULL;

+	}

 	j--;

 	p_root = xmlDocGetNodeByName( xml_array[j], "presence", NULL);

@@ -818,227 +714,4 @@ error:

 	return NULL;

 }		

-#if 0

-/* not used now*/ 

-str* build_off_nbody(str p_user, str p_domain, str* etag)

-{	

-	xmlDocPtr doc = NULL, new_doc = NULL; 

-	xmlNodePtr root_node = NULL, node = NULL, p_root= NULL;

-	xmlNodePtr tuple_node = NULL, status_node = NULL, basic_node = NULL;

-

-	db_key_t query_cols[4];

-	db_op_t  query_ops[4];

-	db_val_t query_vals[4];

-	db_key_t result_cols[4];

-	db_res_t *result = NULL;

-	int body_col;

-	db_row_t *row ;	

-	db_val_t *row_vals;

-	int n_result_cols = 0;

-	int n_query_cols = 0;

-	str old_body ;

-	char * tuple_id = NULL, * entity = NULL;

-	str* body;

-	char* status = NULL;

-

-	body = (str*)pkg_malloc(sizeof(str));

-	if(body == NULL)

-	{

-		LOG(L_ERR,"PRESENCE: build_off_nbody:Error while allocating memory\n");

-		return NULL;

-	}

-	memset(body, 0, sizeof(str));

-

-	query_cols[n_query_cols] = "domain";

-	query_ops[n_query_cols] = OP_EQ;

-	query_vals[n_query_cols].type = DB_STR;

-	query_vals[n_query_cols].nul = 0;

-	query_vals[n_query_cols].val.str_val.s = p_domain.s;

-	query_vals[n_query_cols].val.str_val.len = p_domain.len;

-	n_query_cols++;

-

-	query_cols[n_query_cols] = "username";

-	query_ops[n_query_cols] = OP_EQ;

-	query_vals[n_query_cols].type = DB_STR;

-	query_vals[n_query_cols].nul = 0;

-	query_vals[n_query_cols].val.str_val.s = p_user.s;

-	query_vals[n_query_cols].val.str_val.len = p_user.len;

-	n_query_cols++;

-

-	if(etag!= NULL)

-	{

-		query_cols[n_query_cols] = "etag";

-		query_ops[n_query_cols] = OP_EQ;

-		query_vals[n_query_cols].type = DB_STR;

-		query_vals[n_query_cols].nul = 0;

-		query_vals[n_query_cols].val.str_val.s = etag->s;

-		query_vals[n_query_cols].val.str_val.len = etag->len;

-		n_query_cols++;

-	}

-

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

-

-	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 (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"

-				" presentity\n");

-		goto error;

-	}

-	if(result== NULL)

-		goto error;

-

-	if (result && result->n <=0 )

-	{

-		LOG(L_ERR, "PRESENCE: build_off_nbody:The query returned no result\n");

-		goto error;

-	}

-

-	row = &result->rows[0];

-	row_vals = ROW_VALUES(row);

-	old_body = row_vals[body_col].val.str_val ;

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

-

-	doc = xmlParseMemory( old_body.s, old_body.len );

-	if(doc== NULL) 

-	{

-		LOG(L_ERR,"PRESENCE: build_off_nbody: ERROR while parsing"

-				" the xml body message\n");

-		goto error;

-	}

-	

-	p_root = xmlDocGetNodeByName(doc,"presence", NULL);

-	status = xmlNodeGetNodeContentByName(p_root, "basic", NULL );

-	if(status == NULL)

-	{

-		LOG(L_ERR, "PRESENCE:build_off_nbody: error while getting entity"

-				" attribute\n");

-		goto error;

-	}

-

-	if( etag && (strncmp (status,"closed", 6) == 0) )

-	{

-		DBG( "PRESENCE:build_off_nbody:The presentity status was"

-				" already offline\n");

-		goto error;

-	}

-	entity = xmlNodeGetAttrContentByName(p_root, "entity");

-	if(entity == NULL)

-	{

-		LOG(L_ERR, "PRESENCE:build_off_nbody: error while getting entity"

-				" attribute\n");

-		goto error;

-	}

-	for (node = p_root->children; node!=NULL; node = node->next)

-	{

-		if(xmlStrcasecmp (node->name,(unsigned char*) "tuple") == 0)

-		{

-			tuple_id = xmlNodeGetAttrContentByName(node, "id");

-			if(tuple_id == NULL)

-			{

-				LOG(L_ERR, "PRESENCE:build_off_nbody: error while getting"

-						" entity attribute\n");

-				goto error;

-			}

-		}	

-	}

-	LIBXML_TEST_VERSION;

-	new_doc = xmlNewDoc(BAD_CAST "1.0");

-	if(new_doc==0)

-		goto error;

-    root_node = xmlNewNode(NULL, BAD_CAST "presence");

-	if(root_node==0)

-		goto error;

-    xmlDocSetRootElement(new_doc, root_node);

-

-    xmlNewProp(root_node, BAD_CAST "xmlns",

-			BAD_CAST "urn:ietf:params:xml:ns:pidf");

-	xmlNewProp(root_node, BAD_CAST "xmlns:dm",

-			BAD_CAST "urn:ietf:params:xml:ns:pidf:data-model");

-	xmlNewProp(root_node, BAD_CAST  "xmlns:rpid",

-			BAD_CAST "urn:ietf:params:xml:ns:pidf:rpid" );

-	xmlNewProp(root_node, BAD_CAST "xmlns:c",

-			BAD_CAST "urn:ietf:params:xml:ns:pidf:cipid");

-	xmlNewProp(root_node, BAD_CAST "entity", BAD_CAST entity);

-

-	tuple_node =xmlNewChild(root_node, NULL, BAD_CAST "tuple", NULL) ;

-	if( tuple_node ==NULL)

-	{

-		LOG(L_ERR, "PRESENCE:build_off_nbody: ERROR while adding child\n");

-		goto error;

-	}

-	xmlNewProp(tuple_node, BAD_CAST "id", BAD_CAST tuple_id);

-	

-	status_node = xmlNewChild(tuple_node, NULL, BAD_CAST "status", NULL) ;

-	if( status_node ==NULL)

-	{

-		LOG(L_ERR, "PRESENCE: build_off_nbody: ERROR while adding child\n");

-		goto error;

-	}

-

-	basic_node = xmlNewChild(status_node, NULL, BAD_CAST "basic",

-			BAD_CAST "closed") ;

-	if( basic_node ==NULL)

-	{

-		LOG(L_ERR, "PRESENCE:build_off_nbody: ERROR while adding child\n");

-		goto error;

-	}

-	xmlDocDumpFormatMemory(new_doc,(xmlChar**)(void*)&body->s, &body->len, 1);

-

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

-

-	if(result !=NULL)

-		pxml_dbf.free_result(pxml_db, result);

-

-    /*free the document */

-    xmlFreeDoc(doc);

-	xmlFreeDoc(new_doc);

-

-    /*

-     *Free the global variables that may

-     *have been allocated by the parser.

-     */

-    xmlCleanupParser();

-

-    /*

-     * this is to debug memory for regression tests

-     */

-    xmlMemoryDump();

-

-	xmlFree(status);

-	xmlFree(entity);

-	xmlFree(tuple_id);

-	

-    return body;

-

-error:

-	if(doc)

-		xmlFreeDoc(doc);

-	if(new_doc)

-		xmlFreeDoc(new_doc);

-	if(result)

-		pxml_dbf.free_result(pxml_db, result);

-	if(body)

-	{

-		if(body->s)

-			xmlFree(body->s);

-		pkg_free(body);

-	}

-	if(status)

-		xmlFree(status);

-	if(entity)

-		xmlFree(entity);

-	if(tuple_id)

-		xmlFree(tuple_id);

-	return NULL;

-

-}

-#endif

@@ -29,7 +29,8 @@

 #ifndef _NBODY_H_

 #define _NBODY_H_