MS Use without WM

This commit is contained in:
SchreiberM 2021-01-13 10:31:01 +01:00
parent 34368ce760
commit 03a6d14214
69 changed files with 206 additions and 79 deletions

Binary file not shown.

Binary file not shown.

View File

@ -29,6 +29,9 @@
<setting name="MyTestHTML" serializeAs="String"> <setting name="MyTestHTML" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="DEBUG" serializeAs="String">
<value>False</value>
</setting>
</CONFIG_APP.My.MySettings> </CONFIG_APP.My.MySettings>
</userSettings> </userSettings>
<applicationSettings> <applicationSettings>
@ -45,6 +48,9 @@
<setting name="FB_PW" serializeAs="String"> <setting name="FB_PW" serializeAs="String">
<value>dd</value> <value>dd</value>
</setting> </setting>
<setting name="USE_WM" serializeAs="String">
<value>False</value>
</setting>
</CONFIG_APP.My.MySettings> </CONFIG_APP.My.MySettings>
</applicationSettings> </applicationSettings>
</configuration> </configuration>

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.2.0.0")> <Assembly: AssemblyVersion("2.3.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@ -149,6 +149,27 @@ Namespace My
Me("MyTestHTML") = value Me("MyTestHTML") = value
End Set End Set
End Property End Property
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public ReadOnly Property USE_WM() As Boolean
Get
Return CType(Me("USE_WM"),Boolean)
End Get
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property DEBUG() As Boolean
Get
Return CType(Me("DEBUG"),Boolean)
End Get
Set
Me("DEBUG") = value
End Set
End Property
End Class End Class
End Namespace End Namespace

View File

@ -34,5 +34,11 @@
<Setting Name="MyTestHTML" Type="System.String" Scope="User"> <Setting Name="MyTestHTML" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="USE_WM" Type="System.Boolean" Scope="Application">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="DEBUG" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

View File

@ -29,6 +29,9 @@
<setting name="MyTestHTML" serializeAs="String"> <setting name="MyTestHTML" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="DEBUG" serializeAs="String">
<value>False</value>
</setting>
</CONFIG_APP.My.MySettings> </CONFIG_APP.My.MySettings>
</userSettings> </userSettings>
<applicationSettings> <applicationSettings>
@ -45,6 +48,9 @@
<setting name="FB_PW" serializeAs="String"> <setting name="FB_PW" serializeAs="String">
<value>dd</value> <value>dd</value>
</setting> </setting>
<setting name="USE_WM" serializeAs="String">
<value>False</value>
</setting>
</CONFIG_APP.My.MySettings> </CONFIG_APP.My.MySettings>
</applicationSettings> </applicationSettings>
</configuration> </configuration>

View File

@ -16,13 +16,8 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" /> <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.3.0.0" newVersion="6.3.0.0" /> <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.data> </configuration>
<DbProviderFactories>
<remove invariant="FirebirdSql.Data.FirebirdClient" />
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
</DbProviderFactories>
</system.data></configuration>

View File

@ -1021,7 +1021,7 @@ Partial Class frmMain
Me.tsbtnRunLocalMail.Image = Global.CONFIG_APP.My.Resources.Resources.email_go Me.tsbtnRunLocalMail.Image = Global.CONFIG_APP.My.Resources.Resources.email_go
Me.tsbtnRunLocalMail.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsbtnRunLocalMail.ImageTransparentColor = System.Drawing.Color.Magenta
Me.tsbtnRunLocalMail.Name = "tsbtnRunLocalMail" Me.tsbtnRunLocalMail.Name = "tsbtnRunLocalMail"
Me.tsbtnRunLocalMail.Size = New System.Drawing.Size(134, 22) Me.tsbtnRunLocalMail.Size = New System.Drawing.Size(133, 22)
Me.tsbtnRunLocalMail.Text = "Test with local email" Me.tsbtnRunLocalMail.Text = "Test with local email"
' '
'tsbtnRunProfiles 'tsbtnRunProfiles
@ -1665,7 +1665,7 @@ Partial Class frmMain
Me.BindingNavigator2.MovePreviousItem = Me.ToolStripButton5 Me.BindingNavigator2.MovePreviousItem = Me.ToolStripButton5
Me.BindingNavigator2.Name = "BindingNavigator2" Me.BindingNavigator2.Name = "BindingNavigator2"
Me.BindingNavigator2.PositionItem = Me.ToolStripTextBox1 Me.BindingNavigator2.PositionItem = Me.ToolStripTextBox1
Me.BindingNavigator2.Size = New System.Drawing.Size(1177, 25) Me.BindingNavigator2.Size = New System.Drawing.Size(964, 25)
Me.BindingNavigator2.TabIndex = 32 Me.BindingNavigator2.TabIndex = 32
Me.BindingNavigator2.Text = "BindingNavigator2" Me.BindingNavigator2.Text = "BindingNavigator2"
' '
@ -1780,7 +1780,7 @@ Partial Class frmMain
Me.GridControl1.Location = New System.Drawing.Point(0, 0) Me.GridControl1.Location = New System.Drawing.Point(0, 0)
Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MainView = Me.GridView1
Me.GridControl1.Name = "GridControl1" Me.GridControl1.Name = "GridControl1"
Me.GridControl1.Size = New System.Drawing.Size(241, 311) Me.GridControl1.Size = New System.Drawing.Size(241, 328)
Me.GridControl1.TabIndex = 0 Me.GridControl1.TabIndex = 0
Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
' '
@ -2274,7 +2274,7 @@ Partial Class frmMain
'ToolStripLabel3 'ToolStripLabel3
' '
Me.ToolStripLabel3.Name = "ToolStripLabel3" Me.ToolStripLabel3.Name = "ToolStripLabel3"
Me.ToolStripLabel3.Size = New System.Drawing.Size(160, 22) Me.ToolStripLabel3.Size = New System.Drawing.Size(161, 22)
Me.ToolStripLabel3.Text = "von {0} Indexierungsschritten" Me.ToolStripLabel3.Text = "von {0} Indexierungsschritten"
Me.ToolStripLabel3.ToolTipText = "Die Gesamtanzahl der Elemente." Me.ToolStripLabel3.ToolTipText = "Die Gesamtanzahl der Elemente."
' '
@ -2574,12 +2574,14 @@ Partial Class frmMain
' '
'LOG_ERRORS_ONLYCheckBox 'LOG_ERRORS_ONLYCheckBox
' '
Me.LOG_ERRORS_ONLYCheckBox.Checked = Global.CONFIG_APP.My.MySettings.Default.DEBUG
Me.LOG_ERRORS_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_CONFIGBindingSource, "LOG_ERRORS_ONLY", True)) Me.LOG_ERRORS_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_CONFIGBindingSource, "LOG_ERRORS_ONLY", True))
Me.LOG_ERRORS_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.CONFIG_APP.My.MySettings.Default, "DEBUG", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
Me.LOG_ERRORS_ONLYCheckBox.Location = New System.Drawing.Point(138, 22) Me.LOG_ERRORS_ONLYCheckBox.Location = New System.Drawing.Point(138, 22)
Me.LOG_ERRORS_ONLYCheckBox.Name = "LOG_ERRORS_ONLYCheckBox" Me.LOG_ERRORS_ONLYCheckBox.Name = "LOG_ERRORS_ONLYCheckBox"
Me.LOG_ERRORS_ONLYCheckBox.Size = New System.Drawing.Size(104, 23) Me.LOG_ERRORS_ONLYCheckBox.Size = New System.Drawing.Size(104, 23)
Me.LOG_ERRORS_ONLYCheckBox.TabIndex = 64 Me.LOG_ERRORS_ONLYCheckBox.TabIndex = 64
Me.LOG_ERRORS_ONLYCheckBox.Text = "Log Errors Only" Me.LOG_ERRORS_ONLYCheckBox.Text = "DEBUG (Log)"
Me.LOG_ERRORS_ONLYCheckBox.UseVisualStyleBackColor = True Me.LOG_ERRORS_ONLYCheckBox.UseVisualStyleBackColor = True
' '
'GroupBox1 'GroupBox1

View File

@ -309,12 +309,33 @@
AAAASUVORK5CYII= AAAASUVORK5CYII=
</value> </value>
</data> </data>
<metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1209, 17</value>
</metadata>
<metadata name="TBEMLP_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>467, 134</value>
</metadata>
<metadata name="TBEMLP_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>467, 134</value>
</metadata>
<metadata name="BindingNavigator5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1297, 95</value>
</metadata>
<metadata name="BindingNavigator6.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1079, 134</value>
</metadata>
<metadata name="TBEMLP_POLL_PROFILESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBEMLP_POLL_PROFILESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>514, 17</value> <value>514, 17</value>
</metadata> </metadata>
<metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>404, 17</value> <value>404, 17</value>
</metadata> </metadata>
<metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>404, 17</value>
</metadata>
<metadata name="TBDD_EMAIL_ACCOUNTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>777, 95</value>
</metadata>
<metadata name="TBDD_EMAIL_ACCOUNTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBDD_EMAIL_ACCOUNTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>777, 95</value> <value>777, 95</value>
</metadata> </metadata>
@ -385,6 +406,18 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<metadata name="BindingNavigator2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
</metadata>
<metadata name="BindingNavigator3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1175, 56</value>
</metadata>
<metadata name="BindingNavigator4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 95</value>
</metadata>
<metadata name="TBEMLP_POLL_PROCESSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>171, 56</value>
</metadata>
<metadata name="TBEMLP_POLL_PROCESSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBEMLP_POLL_PROCESSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>171, 56</value> <value>171, 56</value>
</metadata> </metadata>
@ -458,6 +491,9 @@
<metadata name="TBEMLP_POLL_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBEMLP_POLL_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>691, 56</value> <value>691, 56</value>
</metadata> </metadata>
<metadata name="TBEMLP_POLL_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>691, 56</value>
</metadata>
<metadata name="BindingNavigator3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="BindingNavigator3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1175, 56</value> <value>1175, 56</value>
</metadata> </metadata>
@ -528,6 +564,9 @@
<metadata name="TBEMLP_POLL_INDEXING_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBEMLP_POLL_INDEXING_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>171, 95</value> <value>171, 95</value>
</metadata> </metadata>
<metadata name="TBEMLP_POLL_INDEXING_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>171, 95</value>
</metadata>
<metadata name="BindingNavigator4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="BindingNavigator4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 95</value> <value>17, 95</value>
</metadata> </metadata>
@ -595,9 +634,6 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<metadata name="TBEMLP_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>467, 134</value>
</metadata>
<metadata name="TBEMLP_HISTORYBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBEMLP_HISTORYBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 134</value> <value>17, 134</value>
</metadata> </metadata>

View File

@ -35,11 +35,14 @@ Public Class frmMain
Try Try
MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName) MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName)
Logger = MyLogger.GetLogger() Logger = MyLogger.GetLogger()
MyLogger.Debug = True MyLogger.Debug = My.Settings.DEBUG
InitDatabase() InitDatabase()
ToolStripProgressBar1.Visible = False ToolStripProgressBar1.Visible = False
Logger.Debug($"AppConfig is located at: [{AppDomain.CurrentDomain.SetupInformation.ConfigurationFile}]") Logger.Debug($"AppConfig is located at: [{AppDomain.CurrentDomain.SetupInformation.ConfigurationFile}]")
_windream = New clsWindream_allgemein(MyLogger) If My.Settings.USE_WM Then
_windream = New clsWindream_allgemein(MyLogger)
End If
_email = New clsEmail(MyLogger) _email = New clsEmail(MyLogger)
_emailIMAP = New clsEmailIMAP(MyLogger, _SQLServerConString) _emailIMAP = New clsEmailIMAP(MyLogger, _SQLServerConString)
Catch ex As Exception Catch ex As Exception
@ -53,7 +56,10 @@ Public Class frmMain
Check_Steps() Check_Steps()
Active_Color() Active_Color()
End If End If
ObjektTypenEintragen() If My.Settings.USE_WM Then
ObjektTypenEintragen()
End If
_Encryption = New clsEncryption("!35452didalog=", MyLogger) _Encryption = New clsEncryption("!35452didalog=", MyLogger)
End Sub End Sub
Private Function Set_ConnectionStrings() Private Function Set_ConnectionStrings()
@ -277,7 +283,7 @@ Public Class frmMain
Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
If _RunwithLocalemail = False Then If _RunwithLocalemail = False Then
MyLogger.Debug = True MyLogger.Debug = True
Dim _work As New clsWorker(MyLogger, _SQLServerConString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW) Dim _work As New clsWorker(MyLogger, _SQLServerConString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, My.Settings.USE_WM)
_work.Start_WorkingProfiles() _work.Start_WorkingProfiles()
Else Else
@ -408,7 +414,10 @@ Public Class frmMain
End Sub End Sub
Private Sub WM_OBJEKTTYPEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WM_OBJEKTTYPEComboBox.SelectedIndexChanged Private Sub WM_OBJEKTTYPEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WM_OBJEKTTYPEComboBox.SelectedIndexChanged
Load_Indexdata() If My.Settings.USE_WM Then
Load_Indexdata()
End If
End Sub End Sub
Sub Load_Indexdata() Sub Load_Indexdata()
Try Try
@ -538,7 +547,10 @@ Public Class frmMain
Select Case XtraTabControl1.SelectedTabPageIndex Select Case XtraTabControl1.SelectedTabPageIndex
Case 0 Case 0
Check_Steps() Check_Steps()
Load_Indexdata() If My.Settings.USE_WM Then
Load_Indexdata()
End If
Case 1 Case 1
Check_IndexingSteps() Check_IndexingSteps()
Case 2 Case 2
@ -547,7 +559,10 @@ Public Class frmMain
End Sub End Sub
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
Load_Indexdata() If My.Settings.USE_WM Then
Load_Indexdata()
End If
End Sub End Sub
Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged
@ -610,6 +625,8 @@ Public Class frmMain
Private Sub LOG_ERRORS_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOG_ERRORS_ONLYCheckBox.CheckedChanged Private Sub LOG_ERRORS_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOG_ERRORS_ONLYCheckBox.CheckedChanged
If _LoadInProgress = True Then Exit Sub If _LoadInProgress = True Then Exit Sub
MyLogger.Debug = LOG_ERRORS_ONLYCheckBox.Checked
My.Settings.Save()
Dim upd = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1" Dim upd = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1"
_database.Execute_non_Query(upd) _database.Execute_non_Query(upd)
Load_Config() Load_Config()

View File

@ -0,0 +1 @@
089985a82f862c462782eef3bd09083ddec4bb21

View File

@ -1,3 +1,5 @@
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.Pdf.v18.1.Core.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.Resources.resources
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\CONFIG_APP.exe.config E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\CONFIG_APP.exe.config
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\CONFIG_APP.exe E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\CONFIG_APP.exe
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\CONFIG_APP.pdb E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\CONFIG_APP.pdb
@ -17,7 +19,6 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\NLog.d
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\S22.Imap.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\S22.Imap.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\Interop.WINDREAMLib.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\Interop.WINDREAMLib.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DigitalData.Modules.Database.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DigitalData.Modules.Database.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.Pdf.v18.1.Core.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.Sparkline.v18.1.Core.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.Sparkline.v18.1.Core.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.XtraBars.v18.1.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.XtraBars.v18.1.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.RichEdit.v18.1.Core.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.RichEdit.v18.1.Core.dll
@ -51,7 +52,6 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExp
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.XtraBars.v18.1.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.XtraBars.v18.1.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.RichEdit.v18.1.Core.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.RichEdit.v18.1.Core.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.XtraTreeList.v18.1.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.XtraTreeList.v18.1.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\FirebirdSql.Data.FirebirdClient.pdb
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.Office.v18.1.Core.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.Office.v18.1.Core.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\de\DevExpress.Data.v18.1.resources.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\de\DevExpress.Data.v18.1.resources.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\es\DevExpress.Data.v18.1.resources.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\es\DevExpress.Data.v18.1.resources.dll
@ -107,7 +107,6 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\ja\Dev
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\ru\DevExpress.Office.v18.1.Core.resources.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\ru\DevExpress.Office.v18.1.Core.resources.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.vbprojAssemblyReference.cache E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.vbprojAssemblyReference.cache
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.frmMain.resources E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.frmMain.resources
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.Resources.resources
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.vbproj.GenerateResource.cache E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.vbproj.GenerateResource.cache
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.exe.licenses E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.exe.licenses
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.vbproj.CopyComplete E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.vbproj.CopyComplete

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.6.0.0")> <Assembly: AssemblyVersion("2.8.0.0")>
<Assembly: AssemblyFileVersion("2.6.0.0")> <Assembly: AssemblyFileVersion("2.8.0.0")>

View File

@ -16,13 +16,8 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" /> <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.3.0.0" newVersion="6.3.0.0" /> <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.data> </configuration>
<DbProviderFactories>
<remove invariant="FirebirdSql.Data.FirebirdClient" />
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
</DbProviderFactories>
</system.data></configuration>

View File

@ -12,18 +12,23 @@ Public Class clsWorkEmail
Private MyLogger As LogConfig Private MyLogger As LogConfig
Private _email As clsEmail Private _email As clsEmail
Private _DB_MSSQL As clsDatabase Private _DB_MSSQL As clsDatabase
Private _USE_WM As Boolean
Private _windream As clsWindream_allgemein Private _windream As clsWindream_allgemein
Private _windream_index As clsWindream_Index Private _windream_index As clsWindream_Index
Private _firebird As Firebird Private _firebird As Firebird
Private _worked_email As Boolean = False Private _worked_email As Boolean = False
Sub New(LogConf As LogConfig, ConStr As String, FB_DATASOURCE As String, FB_DATABASE As String, FB_USER As String, FB_PW As String) Sub New(LogConf As LogConfig, ConStr As String, FB_DATASOURCE As String, FB_DATABASE As String, FB_USER As String, FB_PW As String, USE_WM As Boolean)
Try Try
Logger = LogConf.GetLogger Logger = LogConf.GetLogger
MyLogger = LogConf MyLogger = LogConf
_email = New clsEmail(LogConf) _email = New clsEmail(LogConf)
_DB_MSSQL = New clsDatabase(LogConf, ConStr) _DB_MSSQL = New clsDatabase(LogConf, ConStr)
_windream = New clsWindream_allgemein(LogConf) _USE_WM = USE_WM
_windream_index = New clsWindream_Index(LogConf) If USE_WM Then
_windream = New clsWindream_allgemein(LogConf)
_windream_index = New clsWindream_Index(LogConf)
End If
If FB_DATASOURCE <> String.Empty Then If FB_DATASOURCE <> String.Empty Then
_firebird = New Firebird(LogConf, FB_DATASOURCE, FB_DATABASE, FB_USER, FB_PW) _firebird = New Firebird(LogConf, FB_DATASOURCE, FB_DATABASE, FB_USER, FB_PW)
End If End If
@ -554,7 +559,7 @@ Public Class clsWorkEmail
Private Function INSERT_HISTORY_MSSQL() Private Function INSERT_HISTORY_MSSQL()
If MessageError = False Then If MessageError = False Then
Dim ins = $"INSERT INTO TBEMLP_HISTORY (WORK_PROCESS,EMAIL_MSGID,EMAIL_SUBJECT,EMAIL_DATE,EMAIL_BODY,EMAIL_SUBSTRING1,EMAIL_SUBSTRING2,EMAIL_FROM) VALUES " & Dim ins = $"INSERT INTO TBEMLP_HISTORY (WORK_PROCESS,EMAIL_MSGID,EMAIL_SUBJECT,EMAIL_DATE,EMAIL_BODY,EMAIL_SUBSTRING1,EMAIL_SUBSTRING2,EMAIL_FROM,PROFILE_ID) VALUES " &
$"('{CURRENT_MAIL_PROCESS_NAME}'," & $"('{CURRENT_MAIL_PROCESS_NAME}'," &
$"'{CURRENT_MAIL_MESSAGE.MessageID.Replace("<", "").Replace(">", "")}'," & $"'{CURRENT_MAIL_MESSAGE.MessageID.Replace("<", "").Replace(">", "")}'," &
$"'{CURRENT_MAIL_MESSAGE.Subject}'," & $"'{CURRENT_MAIL_MESSAGE.Subject}'," &
@ -562,7 +567,8 @@ Public Class clsWorkEmail
$"'{CURRENT_MAIL_BODY_ALL}'," & $"'{CURRENT_MAIL_BODY_ALL}'," &
$"'{CURRENT_MAIL_BODY_ANSWER1}'," & $"'{CURRENT_MAIL_BODY_ANSWER1}'," &
$"'{CURRENT_MAIL_BODY_Substr2}'," & $"'{CURRENT_MAIL_BODY_Substr2}'," &
$"'{CURRENT_MAIL_FROM}')" $"'{CURRENT_MAIL_FROM}'," &
$"{CURRENT_PROFILE_GUID})"
_DB_MSSQL.Execute_non_Query(ins) _DB_MSSQL.Execute_non_Query(ins)
Else Else
Logger.Info("! No INSERT_HISTORY as MessageError = True") Logger.Info("! No INSERT_HISTORY as MessageError = True")
@ -700,7 +706,10 @@ Public Class clsWorkEmail
For Each row As DataRow In DT_INDEXING_STEPS.Rows For Each row As DataRow In DT_INDEXING_STEPS.Rows
Dim INDEXNAME As String = row.Item("INDEXNAME") Dim INDEXNAME As String = row.Item("INDEXNAME")
Dim INDEXVALUE As String = row.Item("INDEXVALUE") Dim INDEXVALUE As String = row.Item("INDEXVALUE")
IndexFile(INDEXNAME, INDEXVALUE, False) If _USE_WM Then
IndexFile(INDEXNAME, INDEXVALUE, False)
End If
Next Next

View File

@ -7,21 +7,26 @@ Public Class clsWorker
Private _email As clsEmail Private _email As clsEmail
Private _emailIMAP As clsEmailIMAP Private _emailIMAP As clsEmailIMAP
Private _Database As clsDatabase Private _Database As clsDatabase
Private _USE_WM As Boolean = False
Private _windream As clsWindream_allgemein Private _windream As clsWindream_allgemein
Private _windream_index As clsWindream_Index Private _windream_index As clsWindream_Index
Private _workmail As clsWorkEmail Private _workmail As clsWorkEmail
Private _wrapper As clsEncryption Private _wrapper As clsEncryption
Private _POLL_PROFILEID As Integer = 0 Private _POLL_PROFILEID As Integer = 0
Dim cs As String Dim cs As String
Sub New(LogConf As LogConfig, ConStr As String, POLL_PROFILEID As Integer, FB_DATASOURCE As String, FB_DATABASE As String, FB_USER As String, FB_PW As String, Optional localeml As String = "") Sub New(LogConf As LogConfig, ConStr As String, POLL_PROFILEID As Integer, FB_DATASOURCE As String, FB_DATABASE As String, FB_USER As String, FB_PW As String, USE_WM As Boolean, Optional localeml As String = "")
Logger = LogConf.GetLogger Logger = LogConf.GetLogger
_email = New clsEmail(LogConf) _email = New clsEmail(LogConf)
_emailIMAP = New clsEmailIMAP(LogConf, ConStr) _emailIMAP = New clsEmailIMAP(LogConf, ConStr)
_Database = New clsDatabase(LogConf, ConStr) _Database = New clsDatabase(LogConf, ConStr)
cs = ConStr cs = ConStr
_windream = New clsWindream_allgemein(LogConf) _USE_WM = USE_WM
_windream_index = New clsWindream_Index(LogConf) If _USE_WM Then
_workmail = New clsWorkEmail(LogConf, ConStr, FB_DATASOURCE, FB_DATABASE, FB_USER, FB_PW) _windream = New clsWindream_allgemein(LogConf)
_windream_index = New clsWindream_Index(LogConf)
End If
_workmail = New clsWorkEmail(LogConf, ConStr, FB_DATASOURCE, FB_DATABASE, FB_USER, FB_PW, USE_WM)
_wrapper = New clsEncryption("!35452didalog=", LogConf) _wrapper = New clsEncryption("!35452didalog=", LogConf)
_POLL_PROFILEID = POLL_PROFILEID _POLL_PROFILEID = POLL_PROFILEID
ClassCurrent.CURRENT_DEBUG_LOCAL_EMAIL = localeml ClassCurrent.CURRENT_DEBUG_LOCAL_EMAIL = localeml
@ -41,32 +46,36 @@ Public Class clsWorker
If _Database.Init(cs) = True Then If _Database.Init(cs) = True Then
Logger.Debug("now windream_init... ") Logger.Debug("now windream_init... ")
If _windream.Init = True Then If _USE_WM Then
If _windream.Init = False Then
Logger.Debug("windream_initialized!") Logger.Info("windream could not be initialized!!")
Exit Sub
Dim osql As String = "SELECT * FROM TBEMLP_POLL_PROFILES"
If _POLL_PROFILEID = 0 Then
osql &= " WHERE ACTIVE = 1 order by SEQUENCE"
Else Else
osql &= " WHERE GUID = " & _POLL_PROFILEID Logger.Debug("windream_initialized!")
End If End If
Dim DT_TBDD_EMAIL As DataTable = _Database.Return_Datatable("SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1") End If
Dim DT_PROFILES = _Database.Return_Datatable(osql) Dim osql As String = "SELECT * FROM TBEMLP_POLL_PROFILES"
If _POLL_PROFILEID = 0 Then
osql &= " WHERE ACTIVE = 1 order by SEQUENCE"
Else
osql &= " WHERE GUID = " & _POLL_PROFILEID
End If
Dim DT_TBDD_EMAIL As DataTable = _Database.Return_Datatable("SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1")
Dim DT_PROFILES = _Database.Return_Datatable(osql)
If Not IsNothing(DT_PROFILES) Then If Not IsNothing(DT_PROFILES) Then
If DT_PROFILES.Rows.Count > 0 Then If DT_PROFILES.Rows.Count > 0 Then
Logger.Debug("count of active profiles: " & DT_PROFILES.Rows.Count.ToString) Logger.Debug("count of active profiles: " & DT_PROFILES.Rows.Count.ToString)
For Each oDR_Profile As DataRow In DT_PROFILES.Rows For Each oDR_Profile As DataRow In DT_PROFILES.Rows
CURRENT_PROFILE_GUID = oDR_Profile.Item("GUID") CURRENT_PROFILE_GUID = oDR_Profile.Item("GUID")
DT_POLL_PROCESS = Nothing DT_POLL_PROCESS = Nothing
Dim sql = String.Format("SELECT * FROM TBEMLP_POLL_PROCESS WHERE PROFILE_ID = {0} AND ACTIVE = 1", CURRENT_PROFILE_GUID) Dim sql = String.Format("SELECT * FROM TBEMLP_POLL_PROCESS WHERE PROFILE_ID = {0} AND ACTIVE = 1", CURRENT_PROFILE_GUID)
DT_POLL_PROCESS = _Database.Return_Datatable(sql) DT_POLL_PROCESS = _Database.Return_Datatable(sql)
If Not IsNothing(DT_POLL_PROCESS) Then If Not IsNothing(DT_POLL_PROCESS) Then
If DT_POLL_PROCESS.Rows.Count = 0 Then If DT_POLL_PROCESS.Rows.Count = 0 Then
Logger.Info("No processes configured for this Email-Profile - " & sql) Logger.Info("No processes configured for this Email-Profile - " & sql)
Continue For Continue For
Else Else
DT_STEPS = Nothing DT_STEPS = Nothing
DT_STEPS = _Database.Return_Datatable(String.Format("SELECT T.* FROM TBEMLP_POLL_STEPS T,TBEMLP_POLL_PROCESS T1 WHERE T.PROCESS_ID = T1.GUID AND T1.PROFILE_ID = {0} AND T1.ACTIVE = 1", CURRENT_PROFILE_GUID)) DT_STEPS = _Database.Return_Datatable(String.Format("SELECT T.* FROM TBEMLP_POLL_STEPS T,TBEMLP_POLL_PROCESS T1 WHERE T.PROCESS_ID = T1.GUID AND T1.PROFILE_ID = {0} AND T1.ACTIVE = 1", CURRENT_PROFILE_GUID))
End If End If
@ -193,10 +202,8 @@ Public Class clsWorker
Logger.Info("No active profiles") Logger.Info("No active profiles")
End If End If
End If End If
Else
Logger.Info("windream could not be initialized!!") _Database.Execute_non_Query("UPDATE TBEMLP_CONFIG SET LAST_TICK = GETDATE() WHERE GUID = 1")
End If
_Database.Execute_non_Query("UPDATE TBEMLP_CONFIG SET LAST_TICK = GETDATE() WHERE GUID = 1")
End If End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) Logger.Error(ex)

View File

@ -20,7 +20,6 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\Independentsoft.Email.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\Independentsoft.Email.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\NLog.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\NLog.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\S22.Imap.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\S22.Imap.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\FirebirdSql.Data.FirebirdClient.pdb
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.Resources.resources E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.Resources.resources
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.GenerateResource.cache E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.GenerateResource.cache
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.CopyComplete E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.CopyComplete

View File

@ -29,6 +29,9 @@
<setting name="DEBUG" serializeAs="String"> <setting name="DEBUG" serializeAs="String">
<value>False</value> <value>False</value>
</setting> </setting>
<setting name="USE_WM" serializeAs="String">
<value>False</value>
</setting>
</SERV_EMAIL.My.MySettings> </SERV_EMAIL.My.MySettings>
</applicationSettings> </applicationSettings>
</configuration> </configuration>

View File

@ -109,6 +109,15 @@ Namespace My
Return CType(Me("DEBUG"),Boolean) Return CType(Me("DEBUG"),Boolean)
End Get End Get
End Property End Property
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public ReadOnly Property USE_WM() As Boolean
Get
Return CType(Me("USE_WM"),Boolean)
End Get
End Property
End Class End Class
End Namespace End Namespace

View File

@ -25,5 +25,8 @@
<Setting Name="DEBUG" Type="System.Boolean" Scope="Application"> <Setting Name="DEBUG" Type="System.Boolean" Scope="Application">
<Value Profile="(Default)">False</Value> <Value Profile="(Default)">False</Value>
</Setting> </Setting>
<Setting Name="USE_WM" Type="System.Boolean" Scope="Application">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

View File

@ -24,6 +24,21 @@ Public Class MyService
Try Try
MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, "Digital Data", "DD EmailProfiler") MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, "Digital Data", "DD EmailProfiler")
Logger = MyLogger.GetLogger Logger = MyLogger.GetLogger
Try
Dim directory As New IO.DirectoryInfo(MyLogger.LogDirectory)
For Each file As IO.FileInfo In directory.GetFiles
If (Now - file.CreationTime).Days > 29 Then
file.Delete()
Else
Exit For
End If
Next
Catch ex As Exception
End Try
Logger.Info("## Service started ## ") Logger.Info("## Service started ## ")
If My.Settings.MyConnectionString = String.Empty Then If My.Settings.MyConnectionString = String.Empty Then
@ -38,7 +53,7 @@ Public Class MyService
_database = New clsDatabase(MyLogger, My.Settings.MyConnectionString) _database = New clsDatabase(MyLogger, My.Settings.MyConnectionString)
_email = New clsEmail(MyLogger) _email = New clsEmail(MyLogger)
_workmail = New clsWorkEmail(MyLogger, My.Settings.MyConnectionString, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW) _workmail = New clsWorkEmail(MyLogger, My.Settings.MyConnectionString, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, My.Settings.USE_WM)
If _database.Init(My.Settings.MyConnectionString) = False Then If _database.Init(My.Settings.MyConnectionString) = False Then
Logger.Warn("ATTENTION: No Connection was established '" & My.Settings.MyConnectionString & "'!") Logger.Warn("ATTENTION: No Connection was established '" & My.Settings.MyConnectionString & "'!")
@ -74,7 +89,7 @@ Public Class MyService
Public Sub RUN_THREAD(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs) Public Sub RUN_THREAD(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
Try Try
Dim notcompleted As Boolean = False Dim notcompleted As Boolean = False
Dim _work As New clsWorker(MyLogger, My.Settings.MyConnectionString, 0, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW) Dim _work As New clsWorker(MyLogger, My.Settings.MyConnectionString, 0, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, My.Settings.USE_WM)
_work.Start_WorkingProfiles() _work.Start_WorkingProfiles()
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) Logger.Error(ex)

View File

@ -16,13 +16,8 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" /> <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.3.0.0" newVersion="6.3.0.0" /> <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.data> </configuration>
<DbProviderFactories>
<remove invariant="FirebirdSql.Data.FirebirdClient" />
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
</DbProviderFactories>
</system.data></configuration>

View File

@ -29,6 +29,9 @@
<setting name="DEBUG" serializeAs="String"> <setting name="DEBUG" serializeAs="String">
<value>False</value> <value>False</value>
</setting> </setting>
<setting name="USE_WM" serializeAs="String">
<value>False</value>
</setting>
</SERV_EMAIL.My.MySettings> </SERV_EMAIL.My.MySettings>
</applicationSettings> </applicationSettings>
</configuration> </configuration>

View File

@ -0,0 +1 @@
194f0e0b9909d26a065a24a0efa14204b59b0794

View File

@ -37,7 +37,6 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\bin\Debug\S22.Im
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\bin\Debug\DigitalData.Modules.Database.pdb E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\bin\Debug\DigitalData.Modules.Database.pdb
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\bin\Debug\DigitalData.Modules.Database.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\bin\Debug\DigitalData.Modules.Database.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\bin\Debug\DigitalData.Modules.Database.dll.config E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\bin\Debug\DigitalData.Modules.Database.dll.config
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\bin\Debug\FirebirdSql.Data.FirebirdClient.pdb
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_EMAIL.Resources.resources E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_EMAIL.Resources.resources
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_EMAIL.MyService.resources E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_EMAIL.MyService.resources
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_EMAIL.ProjectInstaller.resources E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_EMAIL.ProjectInstaller.resources