Index: WS/TAPI/Router.cls.xml
===================================================================
diff -u -r1074 -r2949
--- WS/TAPI/Router.cls.xml	(.../Router.cls.xml)	(revision 1074)
+++ WS/TAPI/Router.cls.xml	(.../Router.cls.xml)	(revision 2949)
@@ -11,6 +11,12 @@
 <Default>TAPI.Router</Default>
 </Parameter>
 
+<Parameter name="LOCATION">
+<Description>
+URL for invoking the WebService.</Description>
+<Default>http://cache01/csp/Admin1</Default>
+</Parameter>
+
 <Parameter name="NAMESPACE">
 <Description>
 TODO: change this to actual SOAP namespace.
@@ -30,26 +36,56 @@
 <Implementation><![CDATA[
 	Kill ^TAPI("POOL")
 	Set ^TAPI("POOL")="Pool niet editeren maar wel de init routine d ##class(WS.TAPI.Router).InitPool()"
-	;Do SetPool("NJA","NJA;CDV;NBR","","")
-	Do SetPool("PBU","CDV;NBR;JME","","")
-	Do SetPool("NBR","NBR;CDV;AB","","")
-	Do SetPool("CDV","CDV;NBR;JME","","")
-	Do SetPool("AB","AB;CGI;SRO","","")
-	Do SetPool("JME","JME;VBL;AB","","")
-	Do SetPool("JB","JB;NBR;AB","","")
+	Do SetPool("NBR","NBR;JRO;BBE","","")
+	Do SetPool("JRO","JRO;SRO;NBR","","")
+	Do SetPool("SRO","SRO;JRO;NBR","","")
+	Do SetPool("KCO","KCO;CGI;AB","","")
+	Do SetPool("AB","AB;KCO;CGI","","")
+	Do SetPool("JME","JME;VBL;DSM","","")
+	Do SetPool("BBE","BBE;AB;NBR","","")
 	Do SetPool("VBL","VBL;JME;AB","","")
-	Do SetPool("CGI","CGI;SRO;VBL","","")
-	Do SetPool("SRO","SRO;CGI;VBL","","")
+	Do SetPool("CGI","CGI;KCO;NSL","","")
+	Do SetPool("DSM","DSM;NSL;AB","","")
+	Do SetPool("NSL","NSL;DSM;JME","","")
 
 	Kill ^TAPI("DI")
+	Do DirInkies("037601904","JRO")
+	Do DirInkies("037601905","NBR") 
+	Do DirInkies("037601906","VBL") 
+	Do DirInkies("037601908","AB") 
+	Do DirInkies("037601913","JME") 
+	Do DirInkies("037601914","BBE") 
+	Do DirInkies("037601907","CGI") 
+	Do DirInkies("037601936","DSM") 
+	Do DirInkies("037601937","SRO")
+	Do DirInkies("037601934","NSL")
+	Do DirInkies("037787108","KCO")
+	/* 
+	Do SetPool("NBR","NBR;JRO;SRO","","")
+	Do SetPool("JRO","JRO;SRO;NBR","","")
+	Do SetPool("SRO","SRO;JRO;NBR","","")
+	Do SetPool("CDV","CDV;CGI;AB","","")
+	Do SetPool("AB","AB;CDV;CGI","","")
+	Do SetPool("JME","JME;VBL;DSM","","")
+	Do SetPool("BBE","BBE;NBR;AB","","")
+	Do SetPool("VBL","VBL;JME;AB","","")
+	Do SetPool("CGI","CGI;CDV;TFL","","")
+	Do SetPool("DSM","DSM;TFL;AB","","")
+	Do SetPool("TFL","TFL;DSM;JME","","")
+
+	Kill ^TAPI("DI")
 	;Do DirInkies("037601903","KDP")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
-	Do DirInkies("037601904","CDV")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+	Do DirInkies("037601904","JRO") ; was CDV                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 	Do DirInkies("037601905","NBR")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 	Do DirInkies("037601906","VBL")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 	Do DirInkies("037601908","AB")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 	Do DirInkies("037601913","JME")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
-	Do DirInkies("037601914","JB")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
-
+	Do DirInkies("037601914","BBE")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+	Do DirInkies("037601931","JB")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+	Do DirInkies("037601923","TFL") ;was SRO                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             
+	Do DirInkies("037601907","CGI")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+	Do DirInkies("037601936","DSM")                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+	*/
 	Quit
 DirInkies(Tel,VerantW)
 	Set VerantWIPNr=$G(^vhUSER("II",VerantW))
@@ -97,17 +133,36 @@
 <Implementation><![CDATA[
  	
  	Set CLIP=$TR(CLIP,".,+-/\ ","")_" " ; Verwijder leestekens
+ 	
+ 	If Line="VIRT NL NAAR BE",$E(CLIP,1)="0",$E(CLIP,1,2)'="00" Set $E(CLIP,1)="0031"  ; Nederlandse nummers 0031 toevoegen
+ 	If $E(CLIP,1,4)="0032" Set $E(CLIP,1,4)="0" ; belgisch nr van uit buitenland
+
+  	d WLIP^vhDBG(15,"TAPI Line CLIP:"_CLIP_" Line:"_Line_" Called:"_Called_" AVRActive:"_AVRActive)
   	
- 	;If CLIP="037601900 " do  Quit RouteData ; DEBUG PV 10-9-04
- 	. Set AVRActive=1
+	;TIJDELIJK !!!!!!!!!!!!!!!!!!!!!!!!!!
+	If ((CLIP="0473950396 ")) Do  Quit RouteData
+ 	. ;Set AVRActive=1
  	. Set RouteData=##class(WS.TAPI.RouterData).%New() ; Return object
-	. Set RouteData.CustomerName="TEST ROUTING"
+	. Set RouteData.CustomerName="PROSTEPS"
 	. Set RouteData.ContactName=""
 	. Set RouteData.CustomerNumber="9999"
-	. Set RouteData.User1=$S(AVRActive:"",1:"PaulV")
-	. Set RouteData.User2=$S(AVRActive:"",1:"WernerR")
-	. Set RouteData.User3=""
+	. Set RouteData.User1="REFTER BE" ;$S(AVRActive:"",1:"JohanB")
+	. Set RouteData.User2="ONLINE BE" ;$S(AVRActive:"",1:"JeroenR")
+	. Set RouteData.User3="" ;$S(AVRActive:"",1:"AnneB")
+	. Set RouteData.HuntGroup="VanHoeckeDinsdagTotVrijdag"
 
+	;If Line="VIRT NL NAAR BE",(CLIP'="0498440207 ") Do  Quit RouteData
+ 	. ;Set AVRActive=1
+ 	. Set RouteData=##class(WS.TAPI.RouterData).%New() ; Return object
+	. Set RouteData.CustomerName="ROUTING NL NIET ACTIEF"
+	. Set RouteData.ContactName=""
+	. Set RouteData.CustomerNumber="9999"
+	. Set RouteData.User1="" ;$S(AVRActive:"",1:"JohanB")
+	. Set RouteData.User2="" ;$S(AVRActive:"",1:"JeroenR")
+	. Set RouteData.User3="" ;$S(AVRActive:"",1:"AnneB")
+	. Set RouteData.HuntGroup="VanHoeckeDinsdagTotVrijdag"
+	. 
+
  	Set Found=1	
 	Set:'$L(CLIP) Found=0
 	Set:'$D(^TAPI("T",CLIP)) Found=0 ; Geen telefoon nummer gevonden
@@ -145,7 +200,7 @@
 	. Set RouteData.User2=..TranslateUser($LG(PoolList,2))
 	. Set RouteData.User3=..TranslateUser($LG(PoolList,3))
 	. Set RouteData.CustomerName=$TR($LG(List,1),"&","+")
-	. Set RouteData.CustomerNumber=ObjRef
+	. Set RouteData.CustomerNumber=$S(ObjType="L":"L:",1:"")_ObjRef
 	. Set:'Dubbel RouteData.ContactName=$LG(List,2)
 	Else  Do
 	. Set PoolList=..DirecteInkiezing(Called,"",.AVRActive)