[asterisk-commits] mnicholson: tag 1.6.2.8-rc2 r265892 - in /tags/1.6.2.8-rc2: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed May 26 11:00:20 2010
New Revision: 265892

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=265892
Log:
Merged r265612 from 1.6.2:

Merged revisions 265611 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r265611 | mnicholson | 2010-05-25 12:00:11 -0500 (Tue, 25 May 2010) | 15 lines
  
  Merged revisions 265610 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r265610 | mnicholson | 2010-05-25 11:48:19 -0500 (Tue, 25 May 2010) | 8 lines
    
    Don't mark the cdr records of unanswered queue calls with "NOANSWER".  This restores the behavior prior to r258670.
    
    (closes issue #17334)
    Reported by: jvandal
    Patches:
          queue-cdr-fixes1.diff uploaded by mnicholson (license 96)
    Tested by: aragon, jvandal
  ........
................


Modified:
    tags/1.6.2.8-rc2/   (props changed)
    tags/1.6.2.8-rc2/apps/app_queue.c

Propchange: tags/1.6.2.8-rc2/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/1.6.2:265612

Modified: tags/1.6.2.8-rc2/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.8-rc2/apps/app_queue.c?view=diff&rev=265892&r1=265891&r2=265892
==============================================================================
--- tags/1.6.2.8-rc2/apps/app_queue.c (original)
+++ tags/1.6.2.8-rc2/apps/app_queue.c Wed May 26 11:00:20 2010
@@ -3942,7 +3942,6 @@
 				ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", peer->name);
 				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
 				record_abandoned(qe);
-				ast_cdr_noanswer(qe->chan->cdr);
 				ast_hangup(peer);
 				ao2_ref(member, -1);
 				return -1;
@@ -5169,7 +5168,6 @@
 		/* Leave if we have exceeded our queuetimeout */
 		if (qe.expire && (time(NULL) >= qe.expire)) {
 			record_abandoned(&qe);
-			ast_cdr_noanswer(qe.chan->cdr);
 			reason = QUEUE_TIMEOUT;
 			res = 0;
 			ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", 
@@ -5193,7 +5191,6 @@
 		/* Leave if we have exceeded our queuetimeout */
 		if (qe.expire && (time(NULL) >= qe.expire)) {
 			record_abandoned(&qe);
-			ast_cdr_noanswer(qe.chan->cdr);
 			reason = QUEUE_TIMEOUT;
 			res = 0;
 			ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
@@ -5215,7 +5212,6 @@
 			int status = 0;
 			if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty))) {
 				record_abandoned(&qe);
-				ast_cdr_noanswer(qe.chan->cdr);
 				reason = QUEUE_LEAVEEMPTY;
 				ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start));
 				res = 0;
@@ -5228,7 +5224,6 @@
 			ast_verb(3, "Exiting on time-out cycle\n");
 			ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
 			record_abandoned(&qe);
-			ast_cdr_noanswer(qe.chan->cdr);
 			reason = QUEUE_TIMEOUT;
 			res = 0;
 			break;
@@ -5238,7 +5233,6 @@
 		/* Leave if we have exceeded our queuetimeout */
 		if (qe.expire && (time(NULL) >= qe.expire)) {
 			record_abandoned(&qe);
-			ast_cdr_noanswer(qe.chan->cdr);
 			reason = QUEUE_TIMEOUT;
 			res = 0;
 			ast_queue_log(qe.parent->name, qe.chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", qe.pos, qe.opos, (long) time(NULL) - qe.start);
@@ -5267,7 +5261,6 @@
 		if (res < 0) {
 			if (!qe.handled) {
 				record_abandoned(&qe);
-				ast_cdr_noanswer(qe.chan->cdr);
 				ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",
 					"%d|%d|%ld", qe.pos, qe.opos,
 					(long) time(NULL) - qe.start);