Skip to content

Addressing issue #71, Tokenizer: Use SelectNodes instead of SelectSin… #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Addressing issue #71, Tokenizer: Use SelectNodes instead of SelectSin… #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Tests/Tokenizer/tokenizer-ps3.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ Describe "Not set variables should not get replaced" {

$env:INPUT_SOURCEPATH = $srcPath = Join-Path $env:TEMP 'source.txt'
$env:INPUT_DESTINATIONPATH = $destPath = Join-Path $env:TEMP 'dest.txt'
$env:INPUT_REPLACEUNDEFINEDVALUESWITHEMPTY = $false
$fooVal = "的I am foo的"
$barVal = "的I am bar的"
$secretVal = "I am secret"
Expand Down
28 changes: 15 additions & 13 deletions Utilites/Tokenizer/tokenize-ps3.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,24 @@ try {
if ($key.NamespaceUrl -And $key.NamespacePrefix) {
$ns = New-Object System.Xml.XmlNamespaceManager($xmlraw.NameTable)
$ns.AddNamespace($key.NamespacePrefix, $key.NamespaceUrl)
$node = $xmlraw.SelectSingleNode($key.KeyName, $ns)
$nodes = $xmlraw.SelectNodes($key.KeyName, $ns)
} else {
$node = $xmlraw.SelectSingleNode($key.KeyName)
$nodes = $xmlraw.SelectNodes($key.KeyName)
}

if ($node) {
try {
Write-Host "Updating $($key.Attribute) of $($key.KeyName): $($key.Value)"
$node.($key.Attribute) = $key.Value
}
catch {
Write-Error "Failure while updating $($key.Attribute) of $($key.KeyName): $($key.Value)"
}
} else {
Write-Verbose "'$($key.KeyName)' not found in source"
}
if ($nodes) {
foreach ($node in $nodes) {
try {
Write-Host "Updating $($key.Attribute) of $($key.KeyName): $($key.Value)"
$node.($key.Attribute) = $key.Value
}
catch {
Write-Error "Failure while updating $($key.Attribute) of $($key.KeyName): $($key.Value)"
}
}
} else {
Write-Verbose "'$($key.KeyName)' not found in source"
}
}
$xmlraw.Save($tempFile)
}
Expand Down
21 changes: 12 additions & 9 deletions Utilites/Tokenizer/tokenize.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,21 @@ if (($SourceIsXml) -and ($Configuration)) {
if ($key.NamespaceUrl -And $key.NamespacePrefix) {
$ns = New-Object System.Xml.XmlNamespaceManager($xmlraw.NameTable)
$ns.AddNamespace($key.NamespacePrefix, $key.NamespaceUrl)
$node = $xmlraw.SelectSingleNode($key.KeyName, $ns)
$nodes = $xmlraw.SelectNodes($key.KeyName, $ns)
} else {
$node = $xmlraw.SelectSingleNode($key.KeyName)
$nodes = $xmlraw.SelectNodes($key.KeyName)
}

if ($node) {
try {
Write-Host "Updating $($key.Attribute) of $($key.KeyName): $($key.Value)"
$node.($key.Attribute) = $key.Value
}
catch {
Write-Error "Failure while updating $($key.Attribute) of $($key.KeyName): $($key.Value)"
if ($nodes) {
foreach ($node in $nodes) {
try {
Write-Host "Updating $($key.Attribute) of $($key.KeyName): $($key.Value)"
$node.($key.Attribute) = $key.Value
Write-Host "Updated $($key.Attribute) of $($key.KeyName): $($key.Value)"
}
catch {
Write-Error "Failure while updating $($key.Attribute) of $($key.KeyName): $($key.Value)"
}
}
}
}
Expand Down