[sr-dev] git:master: modules_k/presence Reverted a change from last commit

[Anca Vamanu]

Module: sip-router
Branch: master
Commit: a87298867d48de1daea58f5058e43ac264d6a076
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a87298867d48de1daea58f5058e43ac264d6a076

Author: Anca Vamanu <anca.vamanu at 1and1.ro>
Committer: Anca Vamanu <anca.vamanu at 1and1.ro>
Date:   Thu Mar 15 18:33:38 2012 +0200

modules_k/presence Reverted a change from last commit

Do not use affected_rows on delete (the send notify part relies on
finding the record in database)

---

 modules_k/presence/presentity.c |   41 ++++++++++++--------------------------
 1 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/modules_k/presence/presentity.c b/modules_k/presence/presentity.c
index 8da45a6..bb69df6 100644
--- a/modules_k/presence/presentity.c
+++ b/modules_k/presence/presentity.c
@@ -471,17 +471,17 @@ after_dialog_check:
 		if(presentity->expires == 0) 
 		{
 
-			if (!pa_dbf.affected_rows && !db_record_exists)
+			if (!db_record_exists)
 			{
 				if (pa_dbf.query (pa_db, query_cols, query_ops, query_vals,
-				 result_cols, n_query_cols, n_result_cols, 0, &result) < 0) 
+					result_cols, n_query_cols, n_result_cols, 0, &result) < 0) 
 				{
 					LM_ERR("unsuccessful sql query\n");
 					goto error;
 				}
 				if(result== NULL)
 					goto error;
-				
+
 				if (!(result->n > 0))
 					goto send_412;
 
@@ -491,30 +491,6 @@ after_dialog_check:
 				result = NULL;
 			}
 
-			LM_DBG("expires =0 -> deleting from database\n");
-			if(pa_dbf.delete(pa_db,query_cols,0,query_vals,n_query_cols)<0)
-			{
-				LM_ERR("unsuccessful sql delete operation");
-				goto error;
-			}
-
-			if (pa_dbf.affected_rows && !db_record_exists)
-			{
-				if ((affected_rows = pa_dbf.affected_rows ( pa_db ))<0)
-				{
-						LM_ERR("unsuccessful sql affected rows operation");
-						goto error;
-				}
-
-				LM_DBG ("affected rows after delete: %d\n", affected_rows );
-			}
-			/*if either affected_rows (if exists) or select query show that there is no line in database*/
-			if ((pa_dbf.affected_rows && !affected_rows) || (!pa_dbf.affected_rows && !db_record_exists))
-				goto send_412;
-
-			LM_DBG("deleted from db %.*s\n",	presentity->user.len,
-			presentity->user.s);
-
 			if( publ_send200ok(msg, presentity->expires, presentity->etag)< 0)
 			{
 				LM_ERR("sending 200OK reply\n");
@@ -526,6 +502,16 @@ after_dialog_check:
 				LM_ERR("while sending notify\n");
 				goto error;
 			}
+
+			LM_DBG("expires =0 -> deleting from database\n");
+			if(pa_dbf.delete(pa_db,query_cols,0,query_vals,n_query_cols)<0)
+			{
+				LM_ERR("unsuccessful sql delete operation");
+				goto error;
+			}
+
+			LM_DBG("deleted from db %.*s\n", presentity->user.len, presentity->user.s);
+
 			/* delete from hash table */
 			if( publ_cache_enabled &&
 				delete_phtable(&pres_uri, presentity->event->evp->type)< 0)
@@ -534,7 +520,6 @@ after_dialog_check:
 				goto error;
 			}
 			goto done;
-		
 		}
 
 		n_update_cols= 0;