diff --git a/app/ClassWMResulthandler/DD_WMResulthandler.vbproj b/app/ClassWMResulthandler/DD_WMResulthandler.vbproj
index ad880af..bf593ef 100644
--- a/app/ClassWMResulthandler/DD_WMResulthandler.vbproj
+++ b/app/ClassWMResulthandler/DD_WMResulthandler.vbproj
@@ -110,6 +110,7 @@
+
True
diff --git a/app/ClassWMResulthandler/ModCurrent.vb b/app/ClassWMResulthandler/ModCurrent.vb
new file mode 100644
index 0000000..00355d5
--- /dev/null
+++ b/app/ClassWMResulthandler/ModCurrent.vb
@@ -0,0 +1,5 @@
+Module ModCurrent
+ Public CURRENToWMSession_Created As Date = Now
+ Public CURRENToWMConnect As Object
+ Public CURRENToWMSession As Object
+End Module
diff --git a/app/ClassWMResulthandler/clsEmail.vb b/app/ClassWMResulthandler/clsEmail.vb
index 3861539..e5cf9b2 100644
--- a/app/ClassWMResulthandler/clsEmail.vb
+++ b/app/ClassWMResulthandler/clsEmail.vb
@@ -11,6 +11,34 @@ Public Class clsEmail
Sub New(MyLogger As LogConfig)
Logger = MyLogger.GetLogger()
End Sub
+ Public Function Testmail(ByVal mailSubject As String, ByVal mailBody As String, mailto As String,
+ mailfrom As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String,
+ AUTH_TYPE As String, Optional attment As String = "")
+ Try
+ Dim message As New Message()
+ message.From = New Mailbox(mailUser, mailUser)
+ message.To.Add(New Mailbox(mailto))
+ message.Subject = mailSubject
+ message.Body = mailBody
+ message.ContentType = New ContentType("text", "plain", "iso-8859-1")
+ message.ContentTransferEncoding = ContentTransferEncoding.QuotedPrintable
+
+ Dim client As New SmtpClient(mailsmtp, mailport)
+ client.EnableSsl = True
+ client.ValidateRemoteCertificate = False
+
+ client.Connect()
+ client.Login(mailUser, mailPW)
+
+ client.Send(message)
+ client.Disconnect()
+ Return True
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.Critical)
+ End Try
+
+ End Function
+
Public Function Email_Send_Independentsoft(ByVal mailSubject As String, ByVal mailBody As String, mailto As String,
mailfrom As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String,
AUTH_TYPE As String, Optional attment As String = "")
@@ -63,17 +91,17 @@ Public Class clsEmail
_error = True
Continue For
End Try
- Try
- client.Connect()
- Catch ex As Exception
- Logger.Warn("clsEmail.Client.Connect: " & ex.Message)
- _error = True
- ' Continue For
- End Try
- Logger.Info("Connected to Client!")
+ 'Try
+ ' client.Connect()
+ 'Catch ex As Exception
+ ' Logger.Warn("clsEmail.Client.Connect: " & ex.Message)
+ ' _error = True
+ ' ' Continue For
+ 'End Try
+
If AUTH_TYPE = "SSL" Then
client.EnableSsl = True
- 'client.ValidateRemoteCertificate = True
+ ' client.ValidateRemoteCertificate = True
Logger.Info("Authentification via SSL.")
ElseIf AUTH_TYPE = "TLS" Then
' client.ValidateRemoteCertificate = False
@@ -85,10 +113,10 @@ Public Class clsEmail
Logger.Info("Authentification NONE. SSL disabled")
End If
Try
-
client.Connect()
+ Logger.Info("Connected to Client!")
Catch ex As Exception
- Logger.Warn("clsEmail.Client.Connect: " & ex.Message)
+ Logger.Warn("clsEmail.Client.Connect2: " & ex.Message)
_error = True
' Continue For
End Try
@@ -105,7 +133,7 @@ Public Class clsEmail
If mailsmtp.Contains("office365.com") Then
client.Login(mailUser, mailPW, AuthenticationType.Login)
Else
- client.Login(mailUser, mailPW, AuthenticationType.Anonymous)
+ client.Login(mailUser, mailPW, AuthenticationType.None)
End If
Catch ex1 As Exception
@@ -125,9 +153,18 @@ Public Class clsEmail
_error = False
Catch ex As Exception
Logger.Warn("clsEmail.Client.Send: " & ex.Message)
- _error = True
- client.Disconnect()
- Continue For
+ Try
+ client.Login(mailUser, mailPW, AuthenticationType.Login)
+ client.Send(message)
+ Catch ex1 As Exception
+ Logger.Warn("clsEmail.Client.Send2: " & ex.Message)
+ _error = True
+ client.Disconnect()
+ Continue For
+ End Try
+
+
+
End Try
client.Disconnect()
diff --git a/app/ClassWMResulthandler/clsWindream_Allgemein.vb b/app/ClassWMResulthandler/clsWindream_Allgemein.vb
index 871e194..fa7cfbf 100644
--- a/app/ClassWMResulthandler/clsWindream_Allgemein.vb
+++ b/app/ClassWMResulthandler/clsWindream_Allgemein.vb
@@ -21,7 +21,7 @@ Public Class clsWindream_allgemein
#Region "+++++ Variablen +++++"
Public Shared oConnect ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht)
- Public Shared oSession 'As WINDREAMLib.WMSession ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht)
+ Public Shared oWMSession 'As WINDREAMLib.WMSession ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht)
Public Shared oBrowser As New WMOBRWSLib.ServerBrowser
Public Shared oDokumentTypen As WINDREAMLib.WMObjects
Private Shared oController As New WMOSearchController
@@ -56,84 +56,71 @@ Public Class clsWindream_allgemein
''' Liefert True wenn das Anmelden erfolgreich war, sonst False
'''
Public Function Init() As Boolean
-
Try
- Try
- ' Session-Objekt instanziieren und mit dem im Client ausgewählten Server belegen
- oSession = CreateObject("Windream.WMSession", GetCurrentServer)
- ' Connection-Objekt instanziieren
- oConnect = CreateObject("Windream.WMConnect")
- 'MsgBox("windrem init 'ed")
- Catch ex As Exception
- Return False
- End Try
-
- ' wenn windream nicht angemeldet ist
- If Not IsLoggedIn() Then
- ' Art der Anmeldung an windream festlegen
- ' 0x0L (also 0) = Standard windream Benutzer
- ' WM_MODULE_ID_DOCTYPEEDITOR_LIC = ermöglicht Zugriff auf die windream Management Funktionen (Z.B. zur Verwaltung der windream Dokumententypen, Auswahllisten, etc.)
- ' WM_MODULE_ID_INDEXSERVICE = ermöglicht der Session die Indexierungs-Events vom windream DMS-Service zu empfangen
- oConnect.ModuleID = 0
-
- ' setzt die minimal erwartete windream-Version
- oConnect.MinReqVersion = "3"
- ' Logger.Debug("Personifizierung'")
-
- ' -- Impersonifizierung nur möglich mit registry-eintrag --
- 'oConnect.UserName = "\digitaldata\SchreiberM"
- 'oConnect.Password = "pw"
-
- ' Verbindung mit Session-Objekt (und dem ausgewählten Server) aufbauen
- oConnect.LoginSession(oSession)
- Logger.Debug("windream-Server: '" & GetCurrentServer() & "'")
- Logger.Debug("windream-UserName: '" & oConnect.UserName & "'")
-
- If oSession.aLoggedin = False Then
- Logger.Warn("Es konnte keine Verbindung mit dem windream-Server hergestellt werden")
- Return False
- End If
-
- ' AUSGABE VON SYSTEMINFORMATIONEN
- ' Gibt die Versionsart (Lizenztyp) also Small-Business-Edition (SBE), Small-Business-Extension (SBX)
- ' oder Business-Edition (BE) aus
- 'MsgBox("WindreamVersion: " & oSession.GetSystemInfo("WindreamVersion") & vbNewLine & "LicenceKey: " & oSession.GetSystemInfo("LicenceKey") & vbNewLine & _
- ' vbNewLine & "LicenceName: " & oSession.GetSystemInfo("LicenceName"))
-
- 'Dim WMCtrl As AISCONTROLDATACOMLib.AISControlData
- 'WMCtrl = New AISCONTROLDATACOMLib.AISControlData
-
- '' liefert die Versionsnummer des Clients
- 'MsgBox(WMCtrl.WMWorkstationBuildNo)
- 'MsgBox(WMCtrl.W
- '' liefert den Servernamen des angemeldeten windreams
- 'MsgBox(WMCtrl.WMServerName)
-
+ Dim oHourDifference As Integer
+ oHourDifference = CInt(DateDiff(DateInterval.Hour, CURRENToWMSession_Created, Now))
+ If IsNothing(CURRENToWMConnect) Or oHourDifference >= 2 Then
Try
- oSession.SwitchEvents(WMCOMEventWMSessionNeedIndex, False)
- ' der Parameter WMEntityDocument definiert, dass nur Dokumenttypen und keine
- ' Ordnertypen ausgelesen werden
- oDokumentTypen = oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
+ 'Session-Objekt instanziieren und mit dem im Client ausgewählten Server belegen
+ oWMSession = CreateObject("Windream.WMSession", GetCurrentServer)
+ ' Connection-Objekt instanziieren
+ oConnect = CreateObject("Windream.WMConnect")
+ 'MsgBox("windrem init 'ed")
Catch ex As Exception
- Logger.Warn("Problem beim Auslesen der Objekttypen: " & ex.Message)
-
+ Logger.Warn("Could not create WMObjects Session or Connect: " & ex.Message)
Return False
End Try
+ 'wenn windream nicht angemeldet ist
+ If Not IsLoggedIn() Then
+ 'Art der Anmeldung an windream festlegen
+ '0x0L (also 0) = Standard windream Benutzer
+ 'WM_MODULE_ID_DOCTYPEEDITOR_LIC = ermöglicht Zugriff auf die windream Management Funktionen (Z.B. zur Verwaltung der windream Dokumententypen, Auswahllisten, etc.)
+ 'WM_MODULE_ID_INDEXSERVICE = ermöglicht der Session die Indexierungs-Events vom windream DMS-Service zu empfangen
+ oConnect.ModuleID = 0
+ 'setzt die minimal erwartete windream-Version
+ oConnect.MinReqVersion = "3"
+ ' Verbindung mit Session-Objekt (und dem ausgewählten Server) aufbauen
+ oConnect.LoginSession(oWMSession)
+ Logger.Debug("windream-UserName: '" & oConnect.UserName & "'")
+ If oWMSession.aLoggedin = False Then
+ Logger.Warn("Es konnte keine Verbindung mit dem windream-Server hergestellt werden")
+ Return False
+ End If
+
+ Try
+ If Not IsNothing(oWMSession) Then
+ oWMSession.SwitchEvents(WMCOMEventWMSessionNeedIndex, False)
+ ' der Parameter WMEntityDocument definiert, dass nur Dokumenttypen und keine
+ ' Ordnertypen ausgelesen werden
+ oDokumentTypen = oWMSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
+ Else
+ Logger.Warn("Unexpected...but the WMSession is nothing...")
+ Return False
+ End If
+
+ Catch ex As Exception
+ Logger.Warn("Problem beim Auslesen der Objekttypen: " & ex.Message)
+ Return False
+ End Try
+ End If
+ Logger.Debug("Alles OK - Erfolgreich angemeldet und Session aufgebaut")
+ CURRENToWMSession = oWMSession
+ CURRENToWMSession_Created = Now
+ Return True
+ Else
+ oWMSession = CURRENToWMSession
+
+ Logger.Debug("oWMSession already created!")
+ Return True
End If
- Logger.Debug("Alles OK - Erfolgreich angemeldet und Session aufgebaut")
- Return True
+
+
Catch ex As Exception
Logger.Error(ex)
- 'If Err.Number = -2147220985 Then
- ' clsLogger.AddError("Die installierte windream-Version ist nicht ausreichend für den Betrieb", "clswindream.Init")
- 'Else
- ' clsLogger.AddError("Fehler beim Login an windream: " & ex.Message, "clswindream.Init")
- 'End If
Return False
End Try
-
End Function
#End Region
@@ -198,7 +185,7 @@ Public Class clsWindream_allgemein
Dim oRelProperties As WMObjectRelationClass
' den Objekttyp laden
- oObjectType = oSession.GetWMObjectByName(WMEntityObjectType, name)
+ oObjectType = oWMSession.GetWMObjectByName(WMEntityObjectType, name)
' Beziehung zu Indizes des Objekttyp auslesen
oIndexAttributes = oObjectType.GetWMObjectRelationByName("TypeAttributes")
@@ -240,7 +227,7 @@ Public Class clsWindream_allgemein
Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject
Try
' alle Objekttypen auslesen
- Dim oObjectTypes As WMObjects = oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
+ Dim oObjectTypes As WMObjects = oWMSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
' alle Objekttypen durchlaufen und nach dem mit dem angegebenen Namen suchen
For Each oObjectType As WMObject In oObjectTypes
@@ -293,7 +280,7 @@ Public Class clsWindream_allgemein
'''
Public Function IsLoggedIn() As Boolean
Try
- Return oSession.aLoggedin
+ Return oWMSession.aLoggedin
Catch ex As Exception
Logger.Error(ex)
End Try
@@ -309,7 +296,7 @@ Public Class clsWindream_allgemein
Public Function GetCurrentServer() As String
Try
Logger.Debug(oBrowser.GetCurrentServer.ToString)
- Return oBrowser.GetCurrentServer 'ClassWindream.oBrowser.GetCurrentServer
+ Return oBrowser.GetCurrentServer
Catch ex As Exception
Logger.Error(ex)
End Try
@@ -358,7 +345,7 @@ Public Class clsWindream_allgemein
'''
Public Shared Function GetTypeOfIndexAsIntByName(ByVal indexname As String) As Integer
Try
- Dim oAttribute = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
+ Dim oAttribute = oWMSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
Dim vType = oAttribute.getVariableValue("dwAttrType")
Return vType
Catch ex As Exception
@@ -370,7 +357,7 @@ Public Class clsWindream_allgemein
'Dim oAttribute = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
'Dim vType = oAttribute.getVariableValue("vItems")
'Return vType
- Dim oChoiceList = oSession.GetWMObjectByName(WMEntityChoiceList, indexname)
+ Dim oChoiceList = oWMSession.GetWMObjectByName(WMEntityChoiceList, indexname)
If Err.Number = 0 And TypeName(oChoiceList) <> "Nothing" Then
Dim Values = oChoiceList
Values = oChoiceList.GetVariableValue("vItems")
@@ -403,7 +390,7 @@ Public Class clsWindream_allgemein
Public Function WDObject_exists(wdobj_location As String)
Dim WDObject As WMObject
Try
- WDObject = oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, wdobj_location.Substring(2))
+ WDObject = oWMSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, wdobj_location.Substring(2))
If WDObject Is Nothing Then
Return False
Else
@@ -420,6 +407,13 @@ Public Class clsWindream_allgemein
Public Function GetSearchDocuments(ByVal wdfLocation As String)
'wdfLocation = 'W:\System\Suchen\WDRH\TestPDF.wdf'
Try
+ If IsNothing(CURRENToWMSession) Then
+ Logger.Warn("oWMSession is unexpected nothing...Try to create it")
+ If Init() = False Then
+ Logger.Warn("Could not recreate oWMSession...EXIT")
+ Return Nothing
+ End If
+ End If
Dim SearchName = wdfLocation.Substring(wdfLocation.LastIndexOf("\") + 1)
Dim SearchPath = wdfLocation.Substring(0, wdfLocation.Length - SearchName.Length)
Logger.Debug("WMSearch: " & wdfLocation.ToLower)
@@ -442,35 +436,26 @@ Public Class clsWindream_allgemein
'' Der öffentliche Member CheckSearchProfile für den Typ IWMQuickSearch7 wurde nicht gefunden. [Microsoft.VisualBasic] => GetSearchDocuments()
Select Case suchTyp.ToString.ToUpper
Case "WMOSRCH.WMQUICKSEARCH"
- srchQuick.WMSession = CreateObject("Windream.WMSession", GetCurrentServer)
- oConnect.LoginSession(srchQuick.WMSession)
+ srchQuick.WMSession = CURRENToWMSession
srchQuick.ClearSearch()
srchQuick.SearchProfilePath = SearchPath
srchQuick.LoadSearchProfile(SearchName)
oSearch = srchQuick.GetSearch()
Case "WMOSRCH.WMINDEXSEARCH"
- srchIndex.WMSession = CreateObject("Windream.WMSession", GetCurrentServer)
- Logger.Debug("Session created...")
- oConnect.LoginSession(srchIndex.WMSession)
- Logger.Debug("LoginSession...")
+ srchIndex.WMSession = CURRENToWMSession
+ srchIndex.ClearSearch()
srchIndex.SearchProfilePath = SearchPath
- Logger.Debug("SearchPath...")
srchIndex.LoadSearchProfile(SearchName)
- Logger.Debug("LoadSearchProfile...")
oSearch = srchIndex.GetSearch()
- Logger.Debug("GetSearch...")
+
Case "WMOSRCH.WMOBJECTTYPESEARCH"
- srchObjectType.WMSession = CreateObject("Windream.WMSession", GetCurrentServer)
- oConnect.LoginSession(srchObjectType.WMSession)
+ srchObjectType.WMSession = CURRENToWMSession
srchObjectType.ClearSearch()
srchObjectType.SearchProfilePath = SearchPath
srchObjectType.LoadSearchProfile(SearchName)
- oSearch = srchObjectType.GetSearch()
-
Case Else
Logger.Warn("KEIN GÜLTIGER WINDREAM-SUCHTYP")
-
Return Nothing
End Select
Dim WMObjects As Object
@@ -539,32 +524,24 @@ Public Class clsWindream_allgemein
Select Case suchTyp.ToString.ToUpper
Case "WMOSRCH.WMQUICKSEARCH"
- srchQuick.WMSession = CreateObject("Windream.WMSession", GetCurrentServer)
- oConnect.LoginSession(srchQuick.WMSession)
+ srchQuick.WMSession = CURRENToWMSession
srchQuick.ClearSearch()
srchQuick.SearchProfilePath = SearchPath
srchQuick.LoadSearchProfile(SearchName)
oSearch = srchQuick.GetSearch()
Case "WMOSRCH.WMINDEXSEARCH"
- srchIndex.WMSession = CreateObject("Windream.WMSession", GetCurrentServer)
- Logger.Debug("Session created...")
- oConnect.LoginSession(srchIndex.WMSession)
- Logger.Debug("LoginSession...")
+ srchIndex.WMSession = CURRENToWMSession
+ srchIndex.ClearSearch()
srchIndex.SearchProfilePath = SearchPath
- Logger.Debug("SearchPath...")
srchIndex.LoadSearchProfile(SearchName)
- Logger.Debug("LoadSearchProfile...")
oSearch = srchIndex.GetSearch()
- Logger.Debug("GetSearch...")
+
Case "WMOSRCH.WMOBJECTTYPESEARCH"
- srchObjectType.WMSession = CreateObject("Windream.WMSession", GetCurrentServer)
- oConnect.LoginSession(srchObjectType.WMSession)
+ srchObjectType.WMSession = CURRENToWMSession
srchObjectType.ClearSearch()
srchObjectType.SearchProfilePath = SearchPath
srchObjectType.LoadSearchProfile(SearchName)
- oSearch = srchObjectType.GetSearch()
-
Case Else
Logger.Warn("KEIN GÜLTIGER WINDREAM-SUCHTYP")
Return Nothing
diff --git a/app/ClassWMResulthandler/clsWindream_Index.vb b/app/ClassWMResulthandler/clsWindream_Index.vb
index 3276279..95b57d8 100644
--- a/app/ClassWMResulthandler/clsWindream_Index.vb
+++ b/app/ClassWMResulthandler/clsWindream_Index.vb
@@ -64,7 +64,7 @@ Public Class clsWindream_Index
End Function
Public Function GetIndex_Type(idxName) As String
Try
- Dim oAttribute = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, idxName)
+ Dim oAttribute = oWMSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, idxName)
'den Variablentyp (String, Integer, ...) auslesen
Dim vType = oAttribute.getVariableValue("dwAttrType")
Dim Type As String
@@ -130,7 +130,7 @@ Public Class clsWindream_Index
'VEKTORFELDER, ALSO ÜBERPRÜFEN OB ERGEBNIS-ARRAY GEFÜLLT IST
Logger.Debug("RunIndexing_Vektor: VEKTORFELD-Indexierung: Vorbereiten des Arrays")
' das entsprechende Attribut aus windream auslesen
- Dim oAttribute = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
+ Dim oAttribute = oWMSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
' den Variablentyp (String, Integer, ...) auslesen
Dim vType = oAttribute.getVariableValue("dwAttrType")
Select Case (vType)
@@ -255,7 +255,7 @@ Public Class clsWindream_Index
' wenn der Datei noch kein Dokumenttyp zugewiesen wurde
If oDocument.aObjectType.aName <> Objekttyp Then
' ihr den entsprechenden Dokumenttyp zuweisen
- oDocument.aObjectType = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityObjectType, Objekttyp)
+ oDocument.aObjectType = oWMSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityObjectType, Objekttyp)
' WMObject.aObjectType = selectedProfile.Dokumenttyp
Logger.Debug("Objekttyp war Standard und wurde in '" & Objekttyp & "' geändert.")
Else
@@ -274,7 +274,7 @@ Public Class clsWindream_Index
For Each aName As String In Indizes
indexname = aName
' das entsprechende Attribut aus windream auslesen
- Dim oAttribute = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, Indizes(i))
+ Dim oAttribute = oWMSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, Indizes(i))
' den Variablentyp (String, Integer, ...) auslesen
Dim vType = oAttribute.getVariableValue("dwAttrType")
' wenn in aValues an Position i ein Wert steht
@@ -611,7 +611,7 @@ Public Class clsWindream_Index
Dim IndexwertAusWindream As Object = Nothing
Dim _dok As WINDREAMLib.WMObject
_dok = Nothing
- _dok = oSession.GetWMObjectByPath(WMEntityDocument, _fullfilepath) 'WINDREAMLib.WMEntity.WMEntityDocument
+ _dok = oWMSession.GetWMObjectByPath(WMEntityDocument, _fullfilepath) 'WINDREAMLib.WMEntity.WMEntityDocument
IndexwertAusWindream = _dok.GetVariableValue(_indexname)
Return IndexwertAusWindream.ToString
Catch ex As Exception
diff --git a/app/DDWDResultHandler/App.config b/app/DDWDResultHandler/App.config
index c46acb5..bef02ee 100644
--- a/app/DDWDResultHandler/App.config
+++ b/app/DDWDResultHandler/App.config
@@ -7,11 +7,7 @@
-
-
-
+
@@ -20,6 +16,9 @@
Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd
+
+ Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd
+
diff --git a/app/DDWDResultHandler/My Project/Settings.Designer.vb b/app/DDWDResultHandler/My Project/Settings.Designer.vb
index e2ede33..b49b8e3 100644
--- a/app/DDWDResultHandler/My Project/Settings.Designer.vb
+++ b/app/DDWDResultHandler/My Project/Settings.Designer.vb
@@ -66,7 +66,6 @@ Namespace My
_
Public ReadOnly Property SQLSERVER_CS_PMRefresh() As String
diff --git a/app/DDWDResultHandler/My Project/Settings.settings b/app/DDWDResultHandler/My Project/Settings.settings
index 97d7146..c5424ef 100644
--- a/app/DDWDResultHandler/My Project/Settings.settings
+++ b/app/DDWDResultHandler/My Project/Settings.settings
@@ -5,12 +5,7 @@
Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd
-
- <?xml version="1.0" encoding="utf-16"?>
-<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <ConnectionString>Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString>
- <ProviderName>System.Data.SqlClient</ProviderName>
-</SerializableConnectionString>
+
Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd
diff --git a/app/DDWDResultHandler/clsPMRefresh.vb b/app/DDWDResultHandler/clsPMRefresh.vb
index 6f13959..61e6465 100644
--- a/app/DDWDResultHandler/clsPMRefresh.vb
+++ b/app/DDWDResultHandler/clsPMRefresh.vb
@@ -21,6 +21,10 @@ Public Class clsPMRefresh
_windream = New clsWindream_allgemein(MyLogger)
Logger.Debug("..in CheckRun..classes initialized")
If _windream.Init() = True Then
+ If My.Settings.SQLSERVER_CS_PMRefresh = "" Then
+ Logger.Info("SQLSERVER_CS_PMRefresh is empty!")
+ Return False
+ End If
If _database.Init(My.Settings.SQLSERVER_CS_PMRefresh, False) = True Then
Dim oDTPM_CONFIG As DataTable = _database.Return_Datatable("select * from TBPM_KONFIGURATION where GUID = 1", My.Settings.SQLSERVER_CS_PMRefresh)
If oDTPM_CONFIG.Rows.Count = 1 Then
@@ -79,7 +83,7 @@ Public Class clsPMRefresh
Logger.Warn("oDTPM_CONFIG.Rows.Count <> 1")
End If
Else
- Logger.Warn($"Could not initialize the database of PMRefresh ({My.Settings.SQLSERVER_CS_PMRefresh})")
+ Logger.Warn($"Could not initialize the database of PMRefresh ConString: '{My.Settings.SQLSERVER_CS_PMRefresh}'")
End If
Else
Logger.Warn("Could not initialize windream in PMRefresh.")
diff --git a/app/ResultHandler_Konfig/frmMain.resx b/app/ResultHandler_Konfig/frmMain.resx
index 031a6e3..3787f2e 100644
--- a/app/ResultHandler_Konfig/frmMain.resx
+++ b/app/ResultHandler_Konfig/frmMain.resx
@@ -260,7 +260,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAI
- DAAAAk1TRnQBSQFMAgEBAwEAAUgBAwFIAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ DAAAAk1TRnQBSQFMAgEBAwEAAVABAwFQAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/app/ResultHandler_Konfig/frmMain.vb b/app/ResultHandler_Konfig/frmMain.vb
index 81c0860..9366de4 100644
--- a/app/ResultHandler_Konfig/frmMain.vb
+++ b/app/ResultHandler_Konfig/frmMain.vb
@@ -851,7 +851,7 @@ Public Class frmMain
Dim PWPlain = wrapper.DecryptData(EMAIL_PWTextBox.Text)
- If _email.Email_Send_Independentsoft("Testmail DD Windream-ResultHandler", "This is the body (text will be replaced within profile)", txtTestmail.Text,
+ If _email.Testmail("Testmail DD Windream-ResultHandler", "This is the body (text will be replaced within profile)", txtTestmail.Text,
EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "") = True Then
MsgBox("Email was send successfully.", MsgBoxStyle.Information)
Else
@@ -958,4 +958,8 @@ Public Class frmMain
RUNTODAY = TextBox1.Text.Substring(SUBS, 1)
MsgBox(RUNTODAY)
End Sub
+
+ Private Sub LOG_ERRORS_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOG_ERRORS_ONLYCheckBox.CheckedChanged
+
+ End Sub
End Class