[asterisk-commits] branch murf/AEL2 r8970 - in /team/murf/AEL2/pbx: applist pbx_ael2.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Mon Jan 30 23:58:26 2006
New Revision: 8970

URL: http://svn.digium.com/view/asterisk?rev=8970&view=rev
Log:
update the Dial and Read entries in the applist-- and Dial was missing the P() option.
in pbx_ael2.c, in the app arg checking func, if an enum arg is empty in the app call arglist, it's not an error.


Modified:
    team/murf/AEL2/pbx/applist
    team/murf/AEL2/pbx/pbx_ael2.c

Modified: team/murf/AEL2/pbx/applist
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/pbx/applist?rev=8970&r1=8969&r2=8970&view=diff
==============================================================================
--- team/murf/AEL2/pbx/applist (original)
+++ team/murf/AEL2/pbx/applist Mon Jan 30 23:58:26 2006
@@ -20,7 +20,7 @@
                  DBdel: "Delete a key from the database"; args=family_key;
              DBdeltree: "Delete a family or keytree from the database"; args=family_keytree;
                DeadAGI: "Executes AGI on a hungup channel";  args = command|...;
-                  Dial: "Place a call and connect to the current channel"; args=Technology_resource|[timeout#i]|[:options]|[:URL]; options=A(),C,d,D(),f,g,G(),h,H,j,L(),m(),M(),n,N,o,p,r,S(),t,T,w,W; Chanvars=DIALEDTIME,ANSWEREDTIME,DIALSTATUS:CHANUNAVAIL | CONGESTION | NOANSWER | BUSY | ANSWER | CANCEL | DONTCALL | TORTURE; 
+                  Dial: "Place a call and connect to the current channel"; args=Technology_resource|[timeout#i]|[:options]|[:URL]; options=A(),C,d,D(),f,g,G(),h,H,j,L(),m(),M(),n,N,o,p,P(),r,S(),t,T,w,W; Chanvars=DIALEDTIME,ANSWEREDTIME,DIALSTATUS:CHANUNAVAIL | CONGESTION | NOANSWER | BUSY | ANSWER | CANCEL | DONTCALL | TORTURE; 
                Dictate: "Virtual Dictation Machine"; args=[base_dir]; 
              Directory: "Provide directory of voicemail extensions"; args=vm-context|[dial-context]|[:options]; options=f;
                   DISA: "DISA (Direct Inward System Access)"; args=numeric_passcode|[context]; 
@@ -79,7 +79,7 @@
               Progress: "Indicate progress"; 
                  Queue: "Queue a call for a call queue"; args=queuename|[options]|[:URL]|[announceoverride]|[timeout#i]; options=d,h,H,n,r,t,T,w,W; Chanvars=QUEUESTATUS:TIMEOUT | FULL | JOINEMPTY | LEAVEEMPTY | JOINUNAVAIL | LEAVEUNAVAIL;
                 Random: "Conditionally branches, based upon a probability"; args=[probability]|[context]|[extension]|priority;
-                  Read: "Read a variable"; args=variable|[filename]|[:maxdigits]|[:<opt:skip,noanswer>]|[:attempts#i]|[:timeout#i]; 
+                  Read: "Read a variable"; args=variable|[:filename]|[:maxdigits#i]|[:options]|[:attempts#i]|[:timeout#i]; options=s,i,n;
               ReadFile: "ReadFile(varname=file,length)"; args=varname_file|length#i;
               RealTime: "Realtime Data Lookup"; args=family|colmatch|value|[prefix]; Chanvars=REALTIMECOUNT;
         RealTimeUpdate: "Realtime Data Rewrite"; args=family|colmatch|value|newcol|newval; Chanvars=REALTIMECOUNT;

Modified: team/murf/AEL2/pbx/pbx_ael2.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/pbx/pbx_ael2.c?rev=8970&r1=8969&r2=8970&view=diff
==============================================================================
--- team/murf/AEL2/pbx/pbx_ael2.c (original)
+++ team/murf/AEL2/pbx/pbx_ael2.c Mon Jan 30 23:58:26 2006
@@ -1693,6 +1693,8 @@
 		break;
 		
 	case ARGD_ENUM:
+		if( !is->u1.str || strlen(is->u1.str) == 0 )
+			return 1; /* a null arg in the call will match an enum, I guess! */
 		for (ac=should->choices; ac; ac=ac->next) {
 			if (strcmp(ac->name,is->u1.str) == 0)
 				return 1;