[Freeswitch-trunk] [commit] r6944 - freeswitch/trunk/scripts/contrib/trixter/dialplan

[Freeswitch SVN]

Author: trixter
Date: Fri Dec 21 01:38:04 2007
New Revision: 6944

Modified:
   freeswitch/trunk/scripts/contrib/trixter/dialplan/README
   freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml

Log:
tighten up NL regexps and clarify in the readme


Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/README
==============================================================================
--- freeswitch/trunk/scripts/contrib/trixter/dialplan/README	(original)
+++ freeswitch/trunk/scripts/contrib/trixter/dialplan/README	Fri Dec 21 01:38:04 2007
@@ -45,16 +45,6 @@
 the lines
 
 
-
--=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- 
-
-dont just leave regexps undefined that may cause matches to occur that 
-shouldnt.  Instead use the regexp DONT_MATCH_ME or something similar that will 
-never cause a match.  dialplan.es.xml uses this if you need an example 
-
--=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- 
-
-
 <context name="default">
 </context>
 
@@ -64,13 +54,20 @@
 They have their own context tags so that they may be used seperately
 should you opt to do that.  
 
-You should not have to edit anything else to get this to work, unless
-your provider requires you to prefix numbers with something.  This
-is often not the case, so it should work with the majority of providers.
 
 
 
 
+-=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- 
+
+dont just leave regexps undefined that may cause matches to occur that 
+shouldnt.  Instead use the regexp DONT_MATCH_ME or something similar that will 
+never cause a match.  dialplan.es.xml uses this if you need an example 
+
+-=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- IMPORTANT -=- 
+
+
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-
 EXPLANATION OF THE VARIABLE FILES
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -79,8 +76,9 @@
 deal with a call.  An attempt is made to query enum, if that fails
 then it will use the default gateway that is defined.
 
-You may set these variables globally, or you may set them on a per user 
-basis from the user directory.  The option is yours.
+You may set these variables globally by setting it for the domain, or you
+may set them on a per user basis from the user directory.  Or a mix, user vars
+override the domain.  The option is yours.
 
 There are two types of variables, static which are simply strings, 
 and regexps.  Due to the way variables are used you should not 

Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml
==============================================================================
--- freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml	(original)
+++ freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml	Fri Dec 21 01:38:04 2007
@@ -22,10 +22,10 @@
 <variable name="default_international_regexp" value="^00(\d+)$"/>
 
 <!-- What matches a domestic out of area call -->
-<variable name="default_domestic_regexp" value="^0([1-9]\d+)$"/>
+<variable name="default_domestic_regexp" value="^0([1-9]\d{8})$"/>
 
 <!-- What matches a local same area call -->
-<variable name="default_local_regexp" value="^([1-9]\d+)$"/>
+<variable name="default_local_regexp" value="^([1-9]\d(6,7})$"/>
 
 <!-- What is dialed for direct routed stuff like emergency numbers -->
 <variable name="default_emergency_number" value="^112$"/>