[svn-commits] eliel: branch eliel/data_api_providers_gsoc2010 r273877 - in /team/eliel/data...

[SVN commits to the Digium repositories]

Author: eliel
Date: Sat Jul  3 21:34:28 2010
New Revision: 273877

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273877
Log:
Use the SECONDS data type in the queue data provider.


Modified:
    team/eliel/data_api_providers_gsoc2010/apps/app_queue.c
    team/eliel/data_api_providers_gsoc2010/channels/chan_agent.c

Modified: team/eliel/data_api_providers_gsoc2010/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/eliel/data_api_providers_gsoc2010/apps/app_queue.c?view=diff&rev=273877&r1=273876&r2=273877
==============================================================================
--- team/eliel/data_api_providers_gsoc2010/apps/app_queue.c (original)
+++ team/eliel/data_api_providers_gsoc2010/apps/app_queue.c Sat Jul  3 21:34:28 2010
@@ -7770,19 +7770,18 @@
 	MEMBER(call_queue, wrapped, AST_DATA_BOOLEAN)			\
 	MEMBER(call_queue, timeoutrestart, AST_DATA_BOOLEAN)		\
 	MEMBER(call_queue, announceholdtime, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, strategy, AST_DATA_INTEGER)			\
 	MEMBER(call_queue, maskmemberstatus, AST_DATA_BOOLEAN)		\
 	MEMBER(call_queue, realtime, AST_DATA_BOOLEAN)			\
 	MEMBER(call_queue, found, AST_DATA_BOOLEAN)			\
 	MEMBER(call_queue, announcepositionlimit, AST_DATA_INTEGER)	\
-	MEMBER(call_queue, announcefrequency, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, minannouncefrequency, AST_DATA_INTEGER)	\
+	MEMBER(call_queue, announcefrequency, AST_DATA_SECONDS)		\
+	MEMBER(call_queue, minannouncefrequency, AST_DATA_SECONDS)	\
 	MEMBER(call_queue, periodicannouncefrequency, AST_DATA_SECONDS)	\
 	MEMBER(call_queue, numperiodicannounce, AST_DATA_INTEGER)	\
 	MEMBER(call_queue, randomperiodicannounce, AST_DATA_INTEGER)	\
-	MEMBER(call_queue, roundingseconds, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, holdtime, AST_DATA_INTEGER)			\
-	MEMBER(call_queue, talktime, AST_DATA_INTEGER)			\
+	MEMBER(call_queue, roundingseconds, AST_DATA_SECONDS)		\
+	MEMBER(call_queue, holdtime, AST_DATA_SECONDS)			\
+	MEMBER(call_queue, talktime, AST_DATA_SECONDS)			\
 	MEMBER(call_queue, callscompleted, AST_DATA_INTEGER)		\
 	MEMBER(call_queue, callsabandoned, AST_DATA_INTEGER)		\
 	MEMBER(call_queue, servicelevel, AST_DATA_INTEGER)		\
@@ -7791,9 +7790,9 @@
 	MEMBER(call_queue, montype, AST_DATA_INTEGER)			\
 	MEMBER(call_queue, count, AST_DATA_INTEGER)			\
 	MEMBER(call_queue, maxlen, AST_DATA_INTEGER)			\
-	MEMBER(call_queue, wrapuptime, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, retry, AST_DATA_INTEGER)			\
-	MEMBER(call_queue, timeout, AST_DATA_INTEGER)			\
+	MEMBER(call_queue, wrapuptime, AST_DATA_SECONDS)		\
+	MEMBER(call_queue, retry, AST_DATA_SECONDS)			\
+	MEMBER(call_queue, timeout, AST_DATA_SECONDS)			\
 	MEMBER(call_queue, weight, AST_DATA_INTEGER)			\
 	MEMBER(call_queue, autopause, AST_DATA_INTEGER)			\
 	MEMBER(call_queue, timeoutpriority, AST_DATA_INTEGER)		\
@@ -7867,6 +7866,8 @@
 	}
 
 	ast_data_add_structure(call_queue, data_queue, queue);
+
+	ast_data_add_str(data_queue, "strategy", int2strat(queue->strategy));
 
 	/* announce position */
 	enum_node = ast_data_add_node(data_queue, "announceposition");

Modified: team/eliel/data_api_providers_gsoc2010/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/team/eliel/data_api_providers_gsoc2010/channels/chan_agent.c?view=diff&rev=273877&r1=273876&r2=273877
==============================================================================
--- team/eliel/data_api_providers_gsoc2010/channels/chan_agent.c (original)
+++ team/eliel/data_api_providers_gsoc2010/channels/chan_agent.c Sat Jul  3 21:34:28 2010
@@ -283,7 +283,7 @@
 	MEMBER(agent_pvt, autologoff, AST_DATA_INTEGER)		\
 	MEMBER(agent_pvt, ackcall, AST_DATA_BOOLEAN)		\
 	MEMBER(agent_pvt, deferlogoff, AST_DATA_BOOLEAN)	\
-	MEMBER(agent_pvt, wrapuptime, AST_DATA_INTEGER)		\
+	MEMBER(agent_pvt, wrapuptime, AST_DATA_MILLISECONDS)	\
 	MEMBER(agent_pvt, acknowledged, AST_DATA_BOOLEAN)	\
 	MEMBER(agent_pvt, name, AST_DATA_STRING)		\
 	MEMBER(agent_pvt, password, AST_DATA_PASSWORD)		\