[svn-commits] file: trunk r104215 - in /trunk: ./ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: file
Date: Tue Feb 26 13:14:04 2008
New Revision: 104215

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104215
Log:
Add an 'e' option to ResetCDR which re-enables a CDR that has been disabled.
(closes issue #11170)
Reported by: kratzers
Patches:
      ResetCDR.1.diff uploaded by kratzers (license 307)

Modified:
    trunk/CHANGES
    trunk/include/asterisk/cdr.h
    trunk/main/cdr.c
    trunk/main/pbx.c

Modified: trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/trunk/CHANGES?view=diff&rev=104215&r1=104214&r2=104215
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Tue Feb 26 13:14:04 2008
@@ -478,6 +478,8 @@
      (but a record will still be inserted, based on what columns remain).  Note
      that the other two features from cdr_adaptive_odbc (alias and filter) are
      not currently supported.
+  * The ResetCDR application now has an 'e' option that re-enables a CDR if it
+     has been disabled using the NoCDR application.
 
 Miscellaneous New Modules
 -------------------------

Modified: trunk/include/asterisk/cdr.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/cdr.h?view=diff&rev=104215&r1=104214&r2=104215
==============================================================================
--- trunk/include/asterisk/cdr.h (original)
+++ trunk/include/asterisk/cdr.h Tue Feb 26 13:14:04 2008
@@ -29,6 +29,7 @@
 #define AST_CDR_FLAG_LOCKED			(1 << 2)
 #define AST_CDR_FLAG_CHILD			(1 << 3)
 #define AST_CDR_FLAG_POST_DISABLED		(1 << 4)
+#define AST_CDR_FLAG_POST_ENABLE                (1 << 5)
 
 /*! \name CDR Flags */
 /*@{ */

Modified: trunk/main/cdr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cdr.c?view=diff&rev=104215&r1=104214&r2=104215
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Tue Feb 26 13:14:04 2008
@@ -1025,6 +1025,12 @@
 				ast_set_flag(cdr, AST_CDR_FLAG_POSTED);
 			}
 
+			/* enable CDR only */
+			if (ast_test_flag(&flags, AST_CDR_FLAG_POST_ENABLE)) {
+				ast_clear_flag(cdr, AST_CDR_FLAG_POST_DISABLED);
+				continue;
+			}
+
 			/* clear variables */
 			if (!ast_test_flag(&flags, AST_CDR_FLAG_KEEP_VARS)) {
 				ast_cdr_free_vars(cdr, 0);

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=104215&r1=104214&r2=104215
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Tue Feb 26 13:14:04 2008
@@ -589,6 +589,7 @@
 	"    w -- Store the current CDR record before resetting it.\n"
 	"    a -- Store any stacked records.\n"
 	"    v -- Save CDR variables.\n"
+	"    e -- Enable CDR only (negate effects of NoCDR).\n"
 	},
 
 	{ "Ringing", pbx_builtin_ringing,
@@ -6846,6 +6847,7 @@
 	AST_APP_OPTION('w', AST_CDR_FLAG_POSTED),
 	AST_APP_OPTION('a', AST_CDR_FLAG_LOCKED),
 	AST_APP_OPTION('v', AST_CDR_FLAG_KEEP_VARS),
+	AST_APP_OPTION('e', AST_CDR_FLAG_POST_ENABLE),
 });
 
 /*!