Index: DOM/VKP/impl/EindPersonalityBepaler.cls.xml =================================================================== diff -u -r72827 -r72841 --- DOM/VKP/impl/EindPersonalityBepaler.cls.xml (.../EindPersonalityBepaler.cls.xml) (revision 72827) +++ DOM/VKP/impl/EindPersonalityBepaler.cls.xml (.../EindPersonalityBepaler.cls.xml) (revision 72841) @@ -26,28 +26,29 @@ = 2) && ($Piece($List(OorsprongKetting, $ListLength(OorsprongKetting) - 1),",", 1) = ##class(DOM.common.enu.Personality).BlumPL())) - If (..IsOorsprongKettingVanBlumPolen(OorsprongKetting)) { - Set PersonalityID = $Piece($List(OorsprongKetting, $ListLength(OorsprongKetting) - 1),",", 1) + If (IsPersonalityBlumPolen) { + Set PersonalityId = ##class(DOM.common.enu.Personality).BlumPL() } Else { - Set PersonalityID = $Piece($List(OorsprongKetting, 1),",", 1) + Set PersonalityId = $Piece($List(OorsprongKetting, 1),",", 1) } } Catch { #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() - Do ##class(vhLib.Logger).%New().Warning("EindPersonalityBepaler","Er was een probleem met het verwerken van oorsprongketting '"_OorsprongKettingString_"'") + Do ##class(vhLib.Logger).%New().Warning("EindPersonalityBepaler","Er was een probleem met het verwerken van oorsprongketting '" _ OorsprongKettingString _ "'") Do ##class(TECH.ExceptionHandler).Rethrow(Exception) } - If ##class(TECH.StringUtils).Equals(PersonalityID,"","()") { - Set PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke() + If ##class(TECH.StringUtils).Equals(PersonalityId, "", "()") { + Set PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke() } - Set Personality = ..PersonalityRepository.GeefViaID(PersonalityID) + Set Personality = ..PersonalityRepository.GeefViaID(PersonalityId) } Quit Personality @@ -87,19 +88,6 @@ Quit ##class(TECH.ListUtils).PiecesToListbuild(OorsprongKettingString, "), (") ]]> - - -OorsprongKetting:%List -1 -= 2) && ($Piece($List(OorsprongKetting, $ListLength(OorsprongKetting) - 1),",", 1) = PersonalityIdBlumPolen)) { - Quit $$$True - } - Quit $$$False -]]> - Index: vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml =================================================================== diff -u -r72827 -r72841 --- vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml (.../Test.cls.xml) (revision 72827) +++ vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml (.../Test.cls.xml) (revision 72841) @@ -73,6 +73,14 @@ ]]> + + + +