From 68a0a01ee91da71665f884974e71930776f2fcc4 Mon Sep 17 00:00:00 2001 From: Jonathan Rioux Date: Fri, 20 Apr 2018 11:08:16 -0400 Subject: [PATCH] bugfix --- Functions/ConvertTo-Array.psm1 | 33 ++++++++++++++++++++++++++++++++- PowerDP.psd1 | Bin 8534 -> 8568 bytes 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Functions/ConvertTo-Array.psm1 b/Functions/ConvertTo-Array.psm1 index 9b9f954..c68b73f 100644 --- a/Functions/ConvertTo-Array.psm1 +++ b/Functions/ConvertTo-Array.psm1 @@ -82,7 +82,11 @@ Function ConvertTo-Array { $Size = $ArrLine[$_]/1KB/1KB $Item | Add-Member -type NoteProperty -Name $Headers[$_].replace(' [kB]',' (GB)') -Value $Size } elseif($Headers[$_] -match '^.*\[MB/min\]') { - $Item | Add-Member -type NoteProperty -Name $Headers[$_].replace(' [MB/min]',' (MB/min)') -Value $ArrLine[$_] + $Value = ConvertTo-Int $ArrLine[$_] + $Item | Add-Member -type NoteProperty -Name $Headers[$_].replace(' [MB/min]',' (MB/min)') -Value $Value + } elseif($Headers[$_] -match '(GB Written|Media|Errors|Warnings|Objects|Files)') { + $Value = ConvertTo-Int $ArrLine[$_] + $Item | Add-Member -type NoteProperty -Name $Headers[$_].replace(' [MB/min]',' (MB/min)') -Value $Value } else { $Item | Add-Member -type NoteProperty -Name $Headers[$_] -Value $ArrLine[$_] } @@ -95,4 +99,31 @@ Function ConvertTo-Array { END { return $ArrayOutput } +} + +Function ConvertTo-Int { + <# + .SYNOPSIS + Converts a string value to a Int or Double + #> + [CmdletBinding()] + Param( + [Parameter(ValueFromPipeline = $true)] + [ValidateNotNullOrEmpty()] + $IntVal + ) + try{ + if($IntVal.GetType().FullName -match '^.*Int.*$') { + return [int]$IntVal + } elseif($IntVal.GetType().FullName -match '^.*(Double|Float).*$') { + return [math]::Round([double]$IntVal,2) + } elseif($IntVal -match '^.*(\,|\.).*$') { + return [math]::Round([double]($IntVal.replace(',','.')),2) + } else { + return [int]($IntVal) + } + } catch { + write-host "catch" + return $IntVal + } } \ No newline at end of file diff --git a/PowerDP.psd1 b/PowerDP.psd1 index 7069622399ed6d455517eb6466e9f3071a7f624f..6f340dcbbb38d80c264bf4dd1f29a6070b9cac32 100644 GIT binary patch delta 22 dcmccS^uuX`naE@ZK{i%ThCGIn&GI7VyZ~H{29W>& delta 15 Wcmez2bj@jlnaJc@0t$;OM0f!@Kn5lN