luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check

Browse source
This commit is contained in:
Luc Vandenbroucke 2022-11-25 14:37:12 +01:00
parent 9e090d9f73
commit 1d9eafed0c
5 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eDosLocal/UpdateLocal.sql
View file

@ -260,7 +260,9 @@ GO
IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id=OBJECT_ID('[dbo].[StationSettings]') AND name='AllowMultipleEPD')
ALTER TABLE [dbo].[StationSettings] ADD AllowMultipleEPD BIT NULL;
IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id=OBJECT_ID('[dbo].[StationSettings]') AND name='EPDRetries')
ALTER TABLE [dbo].[StationSettings] ADD EPDRetries BIT NULL;
ALTER TABLE [dbo].[StationSettings] ADD EPDRetries INT NULL;
IF EXISTS (SELECT * FROM sys.columns WHERE object_id=OBJECT_ID('[dbo].[StationSettings]') AND name='EPDRetries' AND [system_type_id]<>56)
ALTER TABLE [dbo].[StationSettings] ALTER COLUMN [EPDREtries] int
GO
ALTER PROCEDURE [dbo].[StationSettingsSelect] AS
SELECT

27
syncEdosLocal/Program.cs
View file

@ -9,7 +9,6 @@ using spl = LSWLib.CLog;
namespace syncEdosLocal
{
class cResult
{
@ -96,11 +95,11 @@ namespace syncEdosLocal
class Program
{
[DllImport("kernel32.dll")] static extern IntPtr GetConsoleWindow();
[DllImport("user32.dll")] static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
//[DllImport("kernel32.dll")] static extern IntPtr GetConsoleWindow();
//[DllImport("user32.dll")] static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
const int SW_HIDE = 0;
const int SW_SHOW = 5;
//const int SW_HIDE = 0;
//const int SW_SHOW = 5;
const string moduleName = "syncEdosLocal";
public static string pcName;
@ -331,17 +330,13 @@ namespace syncEdosLocal
}
if (Verbose > 0)
{
var handle = GetConsoleWindow();
ShowWindow(handle, SW_SHOW);
LSWLib.Util.ShowConsoleWindow();
oStream = new System.IO.StreamWriter(System.Console.OpenStandardOutput());
}
else
{
oStream = null; // new System.IO.StreamWriter( System.IO.Stream.Null);
var handle = GetConsoleWindow();
ShowWindow(handle, SW_HIDE);
//// Show
//ShowWindow(handle, SW_SHOW);
LSWLib.Util.HideConsoleWindow();
}
pcName = System.Environment.MachineName;
@ -403,7 +398,6 @@ namespace syncEdosLocal
}
if (eDosLocalCon != null) UpdateRemoteReturns(eDosLocalCon);
}
}
catch (System.Exception ex)
@ -415,8 +409,6 @@ namespace syncEdosLocal
if (error) goto final;
final:
messages.AppendLine($"Process:End,tm={System.DateTime.Now.ToString("yyyy-MM-ddTHH:mm")}, Errors={error}, Warnings={warning}");
//System.Diagnostics.Debug.WriteLine(messages.ToString());
@ -436,6 +428,8 @@ namespace syncEdosLocal
// using (var mc = new System.Net.Mail.SmtpClient(smtpServer, smtpPort)) { mc.Send(m); }
//}
spLog.CloseSplunkLog();
if (error) Environment.Exit(1);
else Environment.Exit(1);
}
static void DoorloopVisits(SqlConnection coLocal, SqlConnection coCentral, spl spLog, ref bool error)
{
@ -555,10 +549,5 @@ namespace syncEdosLocal
spLog.Connection_InfoMessageLog(e, ref messages);
}
static Program()
{
var handle = GetConsoleWindow();
ShowWindow(handle, SW_HIDE);
}
}
}

4
syncEdosLocal/Properties/AssemblyInfo.cs
View file

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.6.3.0")]
[assembly: AssemblyFileVersion("1.6.3.0")]
[assembly: AssemblyVersion("1.7.0.0")]
[assembly: AssemblyFileVersion("1.7.0.0")]

2
syncEdosLocal/packages.config
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LSWLib" version="3.1.3" targetFramework="net48" />
<package id="LSWLib" version="3.2.24" targetFramework="net48" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="4.0.8" targetFramework="net48" developmentDependency="true" />
</packages>

11
syncEdosLocal/syncEdosLocal.csproj
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\LSWLib.3.1.3\build\LSWLib.props" Condition="Exists('..\packages\LSWLib.3.1.3\build\LSWLib.props')" />
<Import Project="..\packages\LSWLib.3.2.24\build\LSWLib.props" Condition="Exists('..\packages\LSWLib.3.2.24\build\LSWLib.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -106,9 +106,12 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
<Error Condition="!Exists('..\packages\LSWLib.3.1.3\build\LSWLib.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.1.3\build\LSWLib.props'))" />
<Error Condition="!Exists('..\packages\LSWLib.3.1.3\build\LSWLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.1.3\build\LSWLib.targets'))" />
<Error Condition="!Exists('..\packages\LSWLib.3.2.24\build\LSWLib.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.2.24\build\LSWLib.props'))" />
<Error Condition="!Exists('..\packages\LSWLib.3.2.24\build\LSWLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.2.24\build\LSWLib.targets'))" />
</Target>
<Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
<Import Project="..\packages\LSWLib.3.1.3\build\LSWLib.targets" Condition="Exists('..\packages\LSWLib.3.1.3\build\LSWLib.targets')" />
<Import Project="..\packages\LSWLib.3.2.24\build\LSWLib.targets" Condition="Exists('..\packages\LSWLib.3.2.24\build\LSWLib.targets')" />
<PropertyGroup>
<PostBuildEvent>%25signer%25 $(TargetPath)</PostBuildEvent>
</PropertyGroup>
</Project>