Index: DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r58718 -r71640
--- DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 58718)
+++ DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71640)
@@ -26,23 +26,11 @@
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality
 	If (OorsprongKettingString = "") {
-		If FallBackKlantId = "" {
-			Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
-		} Else {
-			If (FallBackKlantId = ##class(DOM.VKP.enu.Klant).HaefeleNederland()) {
-				Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).HaefeleNL())
-			}
-			If (FallBackKlantId = ##class(DOM.VKP.enu.Klant).HaefeleDuitsland()) {
-				Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).HaefeleDE())
-			}	
-		}
+		Set Personality = ..GeefFallBackPersonality(FallBackKlantId)
 	} Else {
 		Try {	
-			Set OorsprongKettingString = $Replace(OorsprongKettingString,"((","")
-			Set OorsprongKettingString = $Replace(OorsprongKettingString,"))","")
+			#dim OorsprongKetting As %List = ..GeefOorsprongKettingLijst(OorsprongKettingString)
 			
-			#dim OorsprongKetting As %List = ##class(TECH.ListUtils).PiecesToListbuild(OorsprongKettingString, "), (")
-			
 			#dim PersonalityID As %Integer = $Piece($List(OorsprongKetting,1),",",1)
 			If ##class(TECH.StringUtils).Equals(PersonalityID,"","()") {
 				Set PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
@@ -58,6 +46,40 @@
 	Quit Personality
 ]]></Implementation>
 </Method>
+
+<Method name="GeefFallBackPersonality">
+<FormalSpec>FallBackKlantId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.common.Personality</ReturnType>
+<Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality
+	
+	If FallBackKlantId = "" {
+		Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
+	} Else {
+		If (FallBackKlantId = ##class(DOM.VKP.enu.Klant).HaefeleNederland()) {
+			Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).HaefeleNL())
+		}
+		If (FallBackKlantId = ##class(DOM.VKP.enu.Klant).HaefeleDuitsland()) {
+			Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).HaefeleDE())
+		}	
+	}
+	
+	Quit Personality
+]]></Implementation>
+</Method>
+
+<Method name="GeefOorsprongKettingLijst">
+<FormalSpec>OorsprongKettingString:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[
+	Set OorsprongKettingString = $Replace(OorsprongKettingString,"((","")
+	Set OorsprongKettingString = $Replace(OorsprongKettingString,"))","")
+			
+	Quit ##class(TECH.ListUtils).PiecesToListbuild(OorsprongKettingString, "), (")
+]]></Implementation>
+</Method>
 </Class>