From 3bef0b37e03730f8876d86cf1af6ca97ddfc9791 Mon Sep 17 00:00:00 2001 From: Daniel Covington Date: Tue, 28 May 2024 09:25:13 -0400 Subject: [PATCH] Cleanup of exports --- App/Controllers/Kit/KitController.asp | 2 -- CiCd/deploy.vbs | 15 ++++++++++++++- ImportService/TrackingDataImport.vbs | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/App/Controllers/Kit/KitController.asp b/App/Controllers/Kit/KitController.asp index cfba396..ca703bc 100644 --- a/App/Controllers/Kit/KitController.asp +++ b/App/Controllers/Kit/KitController.asp @@ -191,8 +191,6 @@ Class KitController Response.BinaryWrite objStream.Read objStream.Close Set objStream = Nothing - - End If End Sub diff --git a/CiCd/deploy.vbs b/CiCd/deploy.vbs index b5d6c97..fcf748e 100644 --- a/CiCd/deploy.vbs +++ b/CiCd/deploy.vbs @@ -23,8 +23,21 @@ Debug.WriteLine ScriptDirectory & "PsExec64.exe -i \\" & DeployMachine & " -u nt "nircmd.exe elevatecmd runassystem C:\Windows\System32\inetsrv\appcmd.exe stop site /site.name:tracking & " & _ "copy /Y """ & transferFolder & "\zzip.zip"" " & """" & remoteDeployPath & "\zip.zip""" & " & tar -xf ""C:\inetpub\tracking\zip.zip"" -C ""C:\inetpub\tracking"" & exit" +'WshShell.Run ScriptDirectory & "PsExec64.exe -i \\" & DeployMachine & " -u ntp\daniel_admin -p BarkHornSlam4* cmd.exe /C " & _ +'"echo ""stopping app pool"" & " & _ + +'WshShell.Run ScriptDirectory & "PsExec64.exe -i \\" & DeployMachine & " -u ntp\daniel_admin -p BarkHornSlam4* ""nircmd.exe"" elevatecmd runassystem ""C:\Windows\System32\inetsrv\appcmd.exe"" stop apppool /apppool.name:tracking + +'"nircmd.exe elevatecmd runassystem ""C:\Windows\System32\inetsrv\appcmd.exe"" stop apppool /apppool.name:tracking & " & _ +'"echo ""stopping site"" & " & _ +'"nircmd.exe elevatecmd runassystem ""C:\Windows\System32\inetsrv\appcmd.exe"" stop site /site.name:tracking & " & _ +'"echo ""removing files"" & " & _ +'"nircmd.exe elevatecmd runassystem ""powershell"" Get-ChildItem -Path 'C:\inetpub\tracking\' -File -Recurse -Force | Remove-Item -WhatIf" & _ + WshShell.Run ScriptDirectory & "PsExec64.exe -i \\" & DeployMachine & " -u ntp\daniel_admin -p BarkHornSlam4* cmd.exe /C " & _ - "copy /Y """ & transferFolder & "\zzip.zip"" " & """" & remoteDeployPath & "\zip.zip""" & " & tar -xf ""C:\inetpub\tracking\zip.zip"" -C ""C:\inetpub\tracking"" & exit",1,True + "copy /Y """ & transferFolder & "\zzip.zip"" " & """" & remoteDeployPath & "\zip.zip""" & _ + " & tar -xf ""C:\inetpub\tracking\zip.zip"" -C ""C:\inetpub\tracking"" & exit" _ + ,1,True 'WshShell.Run ScriptDirectory & "PsExec64.exe -i \\" & DeployMachine & " -u ntp\daniel_admin -p BarkHornSlam4* " &_ diff --git a/ImportService/TrackingDataImport.vbs b/ImportService/TrackingDataImport.vbs index b7f3898..afaa545 100644 --- a/ImportService/TrackingDataImport.vbs +++ b/ImportService/TrackingDataImport.vbs @@ -104,7 +104,7 @@ Dim row:row = 0 objInkjetCSV.SetCellByName row,"Address 2",AddressArray(2) objInkjetCSV.SetCellByName row,"Address 3",AddressArray(3) objInkjetCSV.SetCellByName row,"Address 4",AddressArray(4) - objInkJetCSV.SetCellByName row,"IM barcode Characters",KitLabelsRs("OutboundIMBDigits").Value + objInkJetCSV.SetCellByName row,"IM barcode Characters","*" & KitLabelsRs("OutboundIMBDigits").Value & "*" objInkJetCSV.SetCellByName row,"Precinct",KitLabelsRs("PRECINCT").Value objInkJetCSV.SetCellByName row,"Ballot ID",KitLabelsRs("VOTERID").Value objInkJetCSV.SetCellByName row,"Ballot Number",TrimLeadingZeros(KitLabelsRs("BALLOT_NUMBER").Value)