[asterisk-commits] rmudgett: branch rmudgett/parking r329206 - in /team/rmudgett/parking: ./ app...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jul 21 13:09:27 2011
New Revision: 329206

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329206
Log:
Merged revisions 329199,329203 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r329199 | rmudgett | 2011-07-21 12:30:57 -0500 (Thu, 21 Jul 2011) | 17 lines
  
  Update PickupChan documentation.
  
  The PickupChan uses the ampersand as the argument separator.
  Was documented as:
  PickupChan(channel[,channel2[,...][,options]])
  
  Fixed documentation to:
  PickupChan(Technology/Resource[&Technology2/Resource2[&...]][,options])
  
  This is a continuation of ASTERISK-17494 for v1.8 and later.
  
  (closes issue ASTERISK-18144)
  Reported by: Erik Smith
  Patches:
        pickupchan_ducumentation-v2.patch (License #6263) patch uploaded by Erik Smith
  Tested by: Erik Smith
........
  r329203 | rmudgett | 2011-07-21 13:04:09 -0500 (Thu, 21 Jul 2011) | 6 lines
  
  Document parkinglot in chan_dahdi.conf.sample.
  
  * Document existing feature in chan_dahdi.conf.sample.
  
  * Remove some dead code related to the parkinglot option.
........

Modified:
    team/rmudgett/parking/   (props changed)
    team/rmudgett/parking/apps/app_directed_pickup.c
    team/rmudgett/parking/channels/chan_dahdi.c

Propchange: team/rmudgett/parking/
------------------------------------------------------------------------------
--- parking-integrated (original)
+++ parking-integrated Thu Jul 21 13:09:27 2011
@@ -1,1 +1,1 @@
-/branches/1.8:1-329192
+/branches/1.8:1-329205

Modified: team/rmudgett/parking/apps/app_directed_pickup.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/parking/apps/app_directed_pickup.c?view=diff&rev=329206&r1=329205&r2=329206
==============================================================================
--- team/rmudgett/parking/apps/app_directed_pickup.c (original)
+++ team/rmudgett/parking/apps/app_directed_pickup.c Thu Jul 21 13:09:27 2011
@@ -80,9 +80,11 @@
 		<synopsis>
 			Pickup a ringing channel.
 		</synopsis>
-		<syntax>
-			<parameter name="channel" required="true" />
-			<parameter name="channel2" multiple="true" />
+		<syntax >
+			<parameter name="Technology/Resource" argsep="&amp;" required="true">
+				<argument name="Technology/Resource" required="true" />
+				<argument name="Technology2/Resource2" required="false" multiple="true" />
+			</parameter>
 			<parameter name="options" required="false">
 				<optionlist>
 					<option name="p">

Modified: team/rmudgett/parking/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/parking/channels/chan_dahdi.c?view=diff&rev=329206&r1=329205&r2=329206
==============================================================================
--- team/rmudgett/parking/channels/chan_dahdi.c (original)
+++ team/rmudgett/parking/channels/chan_dahdi.c Thu Jul 21 13:09:27 2011
@@ -16634,11 +16634,6 @@
 		if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
 			continue;
 
-		/* must have parkinglot in confp before build_channels is called */
-		if (!strcasecmp(v->name, "parkinglot")) {
-			ast_copy_string(confp->chan.parkinglot, v->value, sizeof(confp->chan.parkinglot));
-		}
-
 		/* Create the interface list */
 		if (!strcasecmp(v->name, "channel") || !strcasecmp(v->name, "channels")) {
  			if (options & PROC_DAHDI_OPT_NOCHAN) {
@@ -16801,6 +16796,8 @@
 			ast_copy_string(confp->chan.mohinterpret, v->value, sizeof(confp->chan.mohinterpret));
 		} else if (!strcasecmp(v->name, "mohsuggest")) {
 			ast_copy_string(confp->chan.mohsuggest, v->value, sizeof(confp->chan.mohsuggest));
+		} else if (!strcasecmp(v->name, "parkinglot")) {
+			ast_copy_string(confp->chan.parkinglot, v->value, sizeof(confp->chan.parkinglot));
 		} else if (!strcasecmp(v->name, "stripmsd")) {
 			ast_log(LOG_NOTICE, "Configuration option \"%s\" has been deprecated. Please use dialplan instead\n", v->name);
 			confp->chan.stripmsd = atoi(v->value);