[sr-dev] git:master: xcap_server: etag column is of type str

[Daniel-Constantin Mierla]

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

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Mon Aug 30 10:34:43 2010 +0200

xcap_server: etag column is of type str

---

 modules_k/xcap_server/xcap_server.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c
index 07c2a36..f78afa1 100644
--- a/modules_k/xcap_server/xcap_server.c
+++ b/modules_k/xcap_server/xcap_server.c
@@ -305,7 +305,7 @@ static int xcaps_put_db(str* user, str *domain, str* path, str *etag,
 	ncols++;
 
 	qcols[ncols] = &str_etag_col;
-	qvals[ncols].type = DB1_STRING;
+	qvals[ncols].type = DB1_STR;
 	qvals[ncols].nul = 0;
 	qvals[ncols].val.str_val= *etag;
 	ncols++;
@@ -431,7 +431,7 @@ static int w_xcaps_put(sip_msg_t* msg, char* puri, char* ppath,
 		goto error;
 	}
 	etag.s = etag_hdr.s + 10; /* 'SIP-ETag: ' */
-	etag.len = etag_hdr.len - 12;
+	etag.len = etag_hdr.len - 12; /* 'SIP-ETag: '  '\r\n' */
 	if(xcaps_put_db(&turi.user, &turi.host, &path, &etag, dtype, &body)<0)
 	{
 		LM_ERR("could not store document\n");