diff --git a/Process-ADObjects-Base.ps1 b/Process-ADObjects-Base.ps1 index 459fb76..abdc4e3 100644 --- a/Process-ADObjects-Base.ps1 +++ b/Process-ADObjects-Base.ps1 @@ -170,11 +170,6 @@ function getRoleType function buildPrefixMatcher { - param( - [Parameter(Mandatory = $true, Position = 0)] - [string]$CsvPath - ) - $byLength = [System.Collections.Generic.Dictionary[int, System.Collections.Generic.HashSet[string]]]::new() foreach ($row in $SPK.ProfilPrefixes) diff --git a/Process-ADObjects-Work-R125.ps1 b/Process-ADObjects-Work-R125.ps1 index 93c0dda..ee5d044 100644 --- a/Process-ADObjects-Work-R125.ps1 +++ b/Process-ADObjects-Work-R125.ps1 @@ -1633,7 +1633,7 @@ function ProcessADObjects $adObjectEntry.GUIADGroupDisplayName = $DisplayName } - $prefixMatcher = buildPrefixMatcher $KURSProfilePrefixes + $prefixMatcher = buildPrefixMatcher $ProfilNummer = 470000000 $ProfilNummerLM = 471000000 diff --git a/Process-ADObjects-Work-Y015.ps1 b/Process-ADObjects-Work-Y015.ps1 index 747030c..abbdbd5 100644 --- a/Process-ADObjects-Work-Y015.ps1 +++ b/Process-ADObjects-Work-Y015.ps1 @@ -1633,8 +1633,8 @@ function ProcessADObjects $adObjectEntry.GUIADGroupDisplayName = $DisplayName } - $prefixMatcher = buildPrefixMatcher $KURSProfilePrefixes - + $prefixMatcher = buildPrefixMatcher + $ProfilNummer = 470000000 $ProfilNummerLM = 471000000 $iSonstiges = 0 diff --git a/Process-ADObjects.ps1 b/Process-ADObjects.ps1 index aa059e1..343fae1 100644 --- a/Process-ADObjects.ps1 +++ b/Process-ADObjects.ps1 @@ -59,7 +59,7 @@ Remove-Item -Path $LogFileName -ErrorAction Ignore if ($Config.CleanWorkDirs) { - clearWorkDirectories @($InstituteRootPathTmp, $InstituteRootPathOut) + clearWorkDirectories @($InstituteRootPathTmp, $InstituteRootPathOut) } $IsTestMode = checkTestMode $InstitutsSourcePath = $PSScriptroot + "/Process-ADObjects-Work-" + $Institut + ".ps1" @@ -96,11 +96,6 @@ $KURSPositionfunctionsPositionsInFilePathRegExp = "$InstituteRootPathIn" + $Inst $KURSProfileEmployeeInFilePathRegExp = "$InstituteRootPathIn" + $Institut + "_KURSProfile-Mitarbeiter" + ".csv" $KURSProfileDAWRightsInFilePathRegExp = "$InstituteRootPathIn" + $Institut + "_KURSProfile-DAWBerechtigungen" + ".csv" -################ this is NEW input ################################################################## -$KURSProfileNumberMapping = "$InstituteRootPathIn" + $Institut + "_ProfilNummernMapping" + ".csv" -$KURSProfilePrefixes = "$InstituteRootPathIn" + $Institut + "_ProfilPrefixe" + ".csv" -################ this is NEW input ################################################################## - $ADObjectsFilePath = Get-ChildItem -Path $ADObjectsFilePathRegExp | Sort-Object Name | Select-Object -Last 1 $ADObjectMembershipsFilePath = Get-ChildItem -Path $ADObjectMembershipsFilePathRegExp | Sort-Object Name | Select-Object -Last 1