diff --git a/ToolCollection/ClassNIDatenbankzugriff.vb b/ToolCollection/ClassNIDatenbankzugriff.vb index f2997ae..bbbaea4 100644 --- a/ToolCollection/ClassNIDatenbankzugriff.vb +++ b/ToolCollection/ClassNIDatenbankzugriff.vb @@ -827,11 +827,12 @@ Public Class ClassNIDatenbankzugriff End Try End Function - Public Shared Function Return_Datatable(Select_anweisung As String) + Public Shared Function Return_Datatable(pSQLCommand As String) As DataTable Try Dim sw As New ClassStopwatch("Return_Datatable") Dim SQLconnection As New SqlClient.SqlConnection(My.Settings.DDECMConString) - Dim SQLcommand As New SqlCommand(Select_anweisung, SQLconnection) + Dim SQLcommand As New SqlCommand(pSQLCommand, SQLconnection) + SQLcommand.CommandTimeout = 600 SQLconnection.Open() @@ -844,7 +845,7 @@ Public Class ClassNIDatenbankzugriff Return dt Catch ex As Exception _Logger.Error(ex) - + _Logger.Error($"SQL Return Datatable [{pSQLCommand}]") Return Nothing End Try End Function diff --git a/ToolCollection/ClassNIWindream.vb b/ToolCollection/ClassNIWindream.vb index 8f39ca4..2cbf953 100644 --- a/ToolCollection/ClassNIWindream.vb +++ b/ToolCollection/ClassNIWindream.vb @@ -6,6 +6,7 @@ Public Class ClassNIWindream Private Shared _Logger As DigitalData.Modules.Logging.Logger Private Shared _MyLogger As LogConfig Private _selectedProfil As ClassNIProfil + Private database As ClassNIDatenbankzugriff #Region "+++++ Konstanten +++++" 'Protected Const WMObjectEditModeObject = &H1F Protected Const WMObjectStreamOpenModeReadWrite = 2 @@ -44,6 +45,7 @@ Public Class ClassNIWindream MyBase.New(LogConfig) _MyLogger = LogConfig _Logger = _MyLogger.GetLogger + database = New ClassNIDatenbankzugriff(LogConfig) End Sub Private Function IsNotEmpty(ByVal aValue As Object) @@ -67,9 +69,9 @@ Public Class ClassNIWindream Private Function return_type(ByVal _wert As Object) Return _wert.GetType End Function - Public Shared Function GetIndex_Type(idxName) As String + Public Function GetIndex_Type(idxName) As String Try - Dim oAttribute = ClassNIWindream.oWMSession.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 @@ -278,7 +280,7 @@ Public Class ClassNIWindream Return True End Try Else - _Logger.Warn("ACHTUNG: Fehler bei Locken der Datei (ClassNiWindream.RunIndexing): " & ex.Message) + _Logger.Warn($"ACHTUNG: Fehler bei Locken der Datei (ClassNiWindream.RunIndexing): " & ex.Message) _Logger.Warn("Ergebnis CStr(dwflag): " & CStr(dwflag)) Return True End If @@ -289,11 +291,9 @@ Public Class ClassNIWindream Dim i As Integer = 0 Dim indexname As String - Dim oLengthValues As Integer Try If aValues.Length = 1 And aValues(0) = "" Then - - _Logger.Info("Indexwert ist leer/Nothing - Keine Nachindexierung 313") + _Logger.Info($"Indexwert ist leer/Nothing - Keine Nachindexierung 313 Dokument [{oDocument.aName}]") End If Catch ex As Exception Try @@ -312,15 +312,16 @@ Public Class ClassNIWindream oDocument.aObjectType = Me.oWMSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityObjectType, Objekttyp) ' WMObject.aObjectType = Me.selectedProfile.Dokumenttyp _Logger.Debug("Objekttyp '" & oDocument.aObjectType.aName & "' wurde in '" & Objekttyp & "' geändert.") + Try + oDocument.Save() + Catch ex As Exception + ' wenn es einen Fehler beim speichern gab, dann konnte auch kein Dokumenttyp gesetzt werden -> es kann also auch keine + ' Indexierung stattfinden und die Indexierung muss nicht fortgesetzt werden + Return False + End Try End If - Try - oDocument.Save() - Catch ex As Exception - ' wenn es einen Fehler beim speichern gab, dann konnte auch kein Dokumenttyp gesetzt werden -> es kann also auch keine - ' Indexierung stattfinden und die Indexierung muss nicht fortgesetzt werden - Return False - End Try + 'Jetzt jeden Indexwert durchlaufen For Each aName As String In Indizes @@ -575,7 +576,7 @@ Public Class ClassNIWindream For Each DR In DT_VEKTOR.Rows If DR.Item("IndexName") = aName.ToString Then - myArray(i1) = Convert_IndexValue(vType, value) + myArray(i1) = Convert_IndexValue(vType, DR.Item("Value")) _Logger.Debug("Value (" & i1 & "): '" & DR.Item("Value").ToString & "'") i1 = i1 + 1 @@ -589,7 +590,7 @@ Public Class ClassNIWindream Dim VektorArray Select Case Me._selectedProfil._links.selectedLink.vktins_state Case 1 - _Logger.Debug("vektInsState = '1' - Vekrotvalues will be replaced") + _Logger.Debug("vektInsState = '1' - Vektovalues will be replaced") Dim z As Integer = 0 Try ReDim VektorArray(myArray.Length) @@ -624,8 +625,8 @@ Public Class ClassNIWindream ReDim myArray(VektorArray.count - 1) End Try Dim oIndex As Integer = 0 - For Each oStr As String In VektorArray - myArray(oIndex) = Convert_IndexValue(vType, oStr) + For Each oStr In VektorArray + myArray(oIndex) = oStr oIndex += 1 Next @@ -665,9 +666,7 @@ Public Class ClassNIWindream Next oDocument.unlock() - If My.Settings.vLogErrorsonly = False Then - _Logger.Debug(">> Unlock durchgeführt)") - End If + _Logger.Debug(">> Unlock durchgeführt)") Return False Else _Logger.Info(">> Dokument ist gesperrt, Indexierung erst im nächsten Durchlauf!") @@ -916,11 +915,11 @@ Public Class ClassNIWindream #Region "+++++ Allgemeine Funktionen die Informationen zurückliefern +++++" Public Function GetSearchDocuments(ByVal wdfLocation As String) - - + WMSearchIsSQL = False wdfLocation = wdfLocation.Replace("W:", "\\windream\objects") + wdfLocation = wdfLocation.Replace("X:", "\\windream\objects") + wdfLocation = wdfLocation.Replace("U:", "\\windream\objects") If System.IO.File.Exists(wdfLocation) Then - Try Dim ProfileName = wdfLocation.Substring(wdfLocation.LastIndexOf("\") + 1) Dim ProfilePath = wdfLocation.Substring(0, wdfLocation.Length - ProfileName.Length) @@ -976,17 +975,22 @@ Public Class ClassNIWindream _Logger.Debug("KEIN GÜLTIGER WINDREAM-SUCHTYP") Return Nothing End Select - Dim WMObjects As Object + 'Dim WMObjects As Object _Logger.Debug("Start der Suche: " & Now) ' System.Threading.Thread.Sleep(200000) - WMObjects = oSearch.Execute + 'WMObjects = oSearch.Execute Return oSearch.execute Catch ex As Exception ' bei einem Fehler einen Eintrag in der Logdatei machen _Logger.Error(ex) Return Nothing End Try + Else + If wdfLocation.ToUpper.Contains("SELECT") Or wdfLocation.ToUpper.Contains("EXEC") Then + WMSearchIsSQL = True + + End If End If Return Nothing diff --git a/ToolCollection/ClassWindream_allgemein.vb b/ToolCollection/ClassWindream_allgemein.vb index 00110f4..9b7fbca 100644 --- a/ToolCollection/ClassWindream_allgemein.vb +++ b/ToolCollection/ClassWindream_allgemein.vb @@ -22,7 +22,7 @@ Public Class ClassWindream_allgemein #Region "+++++ Variablen +++++" Public oConnect ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht) - Public Shared oWMSession As Object 'As WINDREAMLib.WMSession ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht) + Public oWMSession As Object 'As WINDREAMLib.WMSession ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht) Public oBrowser As New WMOBRWSLib.ServerBrowser Public oObjekttypen As WINDREAMLib.WMObjects Public oOrdnerTypen As WINDREAMLib.WMObjects diff --git a/ToolCollection/ModuleCURRENT.vb b/ToolCollection/ModuleCURRENT.vb index abea9a0..8ef8f0e 100644 --- a/ToolCollection/ModuleCURRENT.vb +++ b/ToolCollection/ModuleCURRENT.vb @@ -30,5 +30,6 @@ Module ModuleCURRENT Public Stopwatch2 As String Public CURRENT_UNTERV As List(Of String) Public CURRENT_DOCID As Int64 + Public WMSearchIsSQL As Boolean = False End Module diff --git a/ToolCollection/My Project/AssemblyInfo.vb b/ToolCollection/My Project/AssemblyInfo.vb index 346692a..4ded619 100644 --- a/ToolCollection/My Project/AssemblyInfo.vb +++ b/ToolCollection/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/ToolCollection/frmNIHauptseite.vb b/ToolCollection/frmNIHauptseite.vb index 55a8f92..30faa31 100644 --- a/ToolCollection/frmNIHauptseite.vb +++ b/ToolCollection/frmNIHauptseite.vb @@ -44,6 +44,7 @@ Public Class frmNIHauptseite Private _validModules() Private licenseManager As ClassLicenseManager = Nothing Public Shared _windream As ClassWindream_allgemein + Private Const ConstWMEntityDocument = 1 ''WINDREAMLib.WMEntity.WMEntityDocument Public Shared Function Instance() As frmNIHauptseite If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then _Instance = New frmNIHauptseite @@ -334,7 +335,7 @@ Public Class frmNIHauptseite 'AUSKOMMENTIERT um Fehler beim Speichern der Dateien zu verhindern!! 17.08.2015 'aktivesProfil.Save(False) - If clsHelper.file_exists(Me.aktivesProfil.WindreamSuche, "NI") = False Then + If clsHelper.file_exists(Me.aktivesProfil.WindreamSuche, "NI") = False AndAlso Me.aktivesProfil.WindreamSuche.ToLower.Contains("select") = False Then _Logger.Warn("Windream Suche für Profil: " & profil.Profilname & " konnte nicht ausgeführt werden! Die Datei " & Me.aktivesProfil.WindreamSuche & " existiert nicht!") ' wenn die gesuchte File eine Suche ist: per MAil informierne und Indexierung abbrechen If My.Settings.vNIMailsenden = True Then @@ -377,12 +378,17 @@ Public Class frmNIHauptseite If _Fehler = False Then - If Not IsNothing(windreamSucheErgebnisse) Then + If Not IsNothing(windreamSucheErgebnisse) Or WMSearchIsSQL = True Then - If windreamSucheErgebnisse.Count > 0 Then - _Logger.Debug($"windreamSucheErgebnisse.Count: [{windreamSucheErgebnisse.Count}]") + If (Not IsNothing(windreamSucheErgebnisse) AndAlso windreamSucheErgebnisse.Count > 0) Or WMSearchIsSQL = True Then + If (Not IsNothing(windreamSucheErgebnisse) AndAlso windreamSucheErgebnisse.Count > 0) Then + _Logger.Debug($"windreamSucheErgebnisse.Count: [{windreamSucheErgebnisse.Count}]") + ElseIf WMSearchIsSQL = True Then + _Logger.Debug($"windreamSucheErgebnisse will be collected with SQL!") + End If + 'Wenn Nachbearbeitung AD aktiv ist dann, Klassen initialisieren If aktivesProfil.NachbearbeitungAD = True Then _Logger.Debug($"aktivesProfil.NachbearbeitungAD = True") @@ -423,61 +429,123 @@ Public Class frmNIHauptseite _Logger.Debug($"clsWorkfile._fileerror Checked...") _Logger.Debug("Ni-Art: " & aktivesProfil.Ni_Art.ToLower) ' neue Anzahl von Dateien an ProgressBar2 - bwProfil.ReportProgress(windreamSucheErgebnisse.Count) + If WMSearchIsSQL = False Then + bwProfil.ReportProgress(windreamSucheErgebnisse.Count) + End If + Dim oWorkCount As Integer = 1 - For Each dok As WMObject In windreamSucheErgebnisse - Dim StopwatchTimer As New ClassStopwatch("Stopwatch FileRun") - _Logger.Info($"Working on Doc: [{dok.aName}] # ({oWorkCount} of {windreamSucheErgebnisse.Count})") - ' aktuelles Dokument der Klasse mitteilen - Me.aktivesDokument = dok + If WMSearchIsSQL = False Then + For Each dok As WMObject In windreamSucheErgebnisse + Dim StopwatchTimer As New ClassStopwatch("Stopwatch FileRun") + _Logger.Info($"Working on Doc: [{dok.aName}] # ({oWorkCount} of {windreamSucheErgebnisse.Count})") + ' aktuelles Dokument der Klasse mitteilen + Me.aktivesDokument = dok - '####### Go für das Dokument ########## - ' Thread für diese Datei starten + '####### Go für das Dokument ########## + ' Thread für diese Datei starten + Me.startDateiDurchlauf() + '###################################### + ' solange der Datei-Thread noch nicht abgeschlossen wurde - Me.startDateiDurchlauf() - '###################################### - ' solange der Datei-Thread noch nicht abgeschlossen wurde - 'tim = 0 - While Me.bwDatei.IsBusy - ' warten - ' tim += 1 - 'Select Case tim - ' Case 5000 - ' _Logger.Debug("ACHTUNG: bwDatei (5000) is still busy") - ' Case 10000 - ' _Logger.Debug("ACHTUNG: bwDatei (10000) is still busy") - ' Case 30000 - ' _Logger.Debug("ACHTUNG: bwDatei (30000) is still busy") - ' _Logger.Debug("ACHTUNG: ThreadDatei wird abgebrochen") - ' Try - ' Me.bwDatei.CancelAsync() - ' Catch ex As Exception - ' _Logger.Debug("Fehler beim Abbrechen des Threads bwDatei: " & ex.Message) - ' End Try - ' Exit While - 'End Select + While Me.bwDatei.IsBusy + + End While + ' nächste Datei an ProgressBar2 + bwProfil.ReportProgress(-1) + oWorkCount += 1 + ' Vorgang abbrechen + If bwProfil.CancellationPending Then + _Logger.Info($"bwProfil.CancellationPending...Exit bwProfil_DoWork") + StopwatchTimer.Done() + Exit Sub + ElseIf manually_cancel = True Then + _Logger.Info($"manually_cancel...Exit bwProfil_DoWork") + StopwatchTimer.Done() + Exit Sub + End If + + Dim swMessage = StopwatchTimer.Done() + If swMessage <> "" Then + _Logger.Info(swMessage) + End If + Next + Else + Try + Dim oDTResults As DataTable + oDTResults = database.Return_Datatable(aktivesProfil.WindreamSuche) + + If Not IsNothing(oDTResults) Then + If oDTResults.Rows.Count > 0 Then + bwProfil.ReportProgress(oDTResults.Rows.Count) + _Logger.Debug($">> Working on [{oDTResults.Rows.Count}] documents via SQL...") + If Not IsNothing(_windreamNI) Then + Dim i As Integer = 0 + For Each oROW As DataRow In oDTResults.Rows + Dim oFilenameWM = oROW.Item(1).ToString + oFilenameWM = oFilenameWM.Replace("W:", "") + oFilenameWM = oFilenameWM.Replace("\\windream\objects", "") + _Logger.Debug($">> Trying to create WMObject by path [{oFilenameWM}] ...") + 'Dim _dok As WMObject + '_dok = Nothing + Try + aktivesDokument = _windreamNI.oWMSession.GetWMObjectByPath(ConstWMEntityDocument, oFilenameWM) + Catch ex As Exception + _Logger.Warn($"ATTENTION: error while creating a windream-object via objectpath - ERROR [{ex.InnerException.Message}]") + _Logger.Warn($"Filename [{oFilenameWM}]") + _Logger.Error(ex) + bwProfil.ReportProgress(-4) + Exit Sub + End Try + + If Not IsNothing(aktivesDokument) Then + _Logger.Debug($"..Got a windream-document-object for {aktivesDokument.aName}...") + i += 1 + '####### Go für das Dokument ########## + ' Thread für diese Datei starten + Me.startDateiDurchlauf() + '###################################### + ' solange der Datei-Thread noch nicht abgeschlossen wurde + + While Me.bwDatei.IsBusy + + End While + ' nächste Datei an ProgressBar2 + bwProfil.ReportProgress(-1) + oWorkCount += 1 + ' Vorgang abbrechen + If bwProfil.CancellationPending Then + _Logger.Info($"bwProfil.CancellationPending...Exit bwProfil_DoWork") + Exit Sub + ElseIf manually_cancel = True Then + _Logger.Info($"manually_cancel...Exit bwProfil_DoWork") + + Exit Sub + End If + Else + _Logger.Error("Could not create a WMDocument via path!") + End If + Next + Else + _Logger.Error("ATTENTION: _windreamNI not intitialized properly...") + _Logger.Warn("ATTENTION: _windreamNI not intitialized properly...") + End If + End If + Else + _Logger.Warn($"ATTENTION: The datatable for WMResults is nothing") + End If + Catch ex As Exception + _Logger.Warn($"UNEXPECTED ERROR IN GetSearchDocuments via SQL: {ex.Message}") + _Logger.Warn($"Dokument: {aktivesDokument.aName}") + _Logger.Error(ex) + Dim oLIneNumber = GetLineNumber(ex) + If oLIneNumber > 0 Then + _Logger.Warn($"#### oLIneNumber: {oLIneNumber} ####") + End If + End Try + + End If - End While - ' nächste Datei an ProgressBar2 - bwProfil.ReportProgress(-1) - oWorkCount += 1 - ' Vorgang abbrechen - If bwProfil.CancellationPending Then - _Logger.Info($"bwProfil.CancellationPending...Exit bwProfil_DoWork") - StopwatchTimer.Done() - Exit Sub - ElseIf manually_cancel = True Then - _Logger.Info($"manually_cancel...Exit bwProfil_DoWork") - StopwatchTimer.Done() - Exit Sub - End If - - Dim swMessage = StopwatchTimer.Done() - If swMessage <> "" Then - _Logger.Info(swMessage) - End If - Next Else _Logger.Debug("Fehler = True - Check Log") _Logger.Warn("Fehler = True - Check Log") @@ -486,12 +554,12 @@ Public Class frmNIHauptseite Else _Logger.Debug("Keine windream-Dokumente für Profil: " & profil.Profilname & " gefunden!") - ' keine Dateien zum Indexieren - bwProfil.ReportProgress(-4) + ' keine Dateien zum Indexieren + bwProfil.ReportProgress(-4) + End If + Else + _Logger.Warn($"windreamSucheErgebnisse Is Nothing!! - Please check Search of {profil.Profilname}") End If - Else - _Logger.Warn($"windreamSucheErgebnisse is Nothing!! - Please check Search of {profil.Profilname}") - End If Else _Logger.Warn("_Fehler = True - Check the config of Nachindexierung") bwProfil.ReportProgress(-4) @@ -514,7 +582,17 @@ Public Class frmNIHauptseite End Try End Sub - + Public Function GetLineNumber(ByVal ex As Exception) + Dim lineNumber As Int32 = 0 + Const lineSearch As String = ":line " + Dim index = ex.StackTrace.LastIndexOf(lineSearch) + If index <> -1 Then + Dim lineNumberText = ex.StackTrace.Substring(index + lineSearch.Length) + If Int32.TryParse(lineNumberText, lineNumber) Then + End If + End If + Return lineNumber + End Function Private Sub bwProfil_RunWorkerCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) If e.Cancelled Then @@ -721,6 +799,7 @@ Public Class frmNIHauptseite ' Indexiert die windream-Suchergebnisse Public Sub IndexiereVerarbeiteDokument(ByVal dokument As WMObject) Dim oResultNachindexierung = Nothing + Try If bwDatei.CancellationPending Then _Logger.Info("bwDatei.CancellationPending - IndexiereVerarbeiteDokument - Exit Sub") @@ -776,15 +855,34 @@ Public Class frmNIHauptseite 'End If If aktivesProfil.checkIndexsql <> String.Empty And oUnexpectedError = False Then _Logger.Debug("Überprüfung des deskriptiven Indexwertes gegen die DB") + Dim oResultCheck As Integer '################## 'Zuerst überprüfen ob der Deskriptive Idnex einen gültigen Wert zurückliefert Try Dim odescIndexValue As String - ' den Wert des deskriptiven Indexes für das aktuelle Dokument auslesen - odescIndexValue = dokument.GetVariableValue(aktivesProfil.Desk_windreamIndex) - Dim Check As Integer = Check_DeskIndexValue(odescIndexValue, aktivesProfil.checkIndexsql, dokument) + Dim oAttribute = _windreamNI.oWMSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, aktivesProfil.Desk_windreamIndex) + Try + Dim vType = oAttribute.getVariableValue("dwAttrType") + + If vType >= 4097 Or vType = 8 Then + oResultCheck = 1 + _Logger.Warn($"Could not check descriptiveIndex as Index is a Vectorfield!") + + Else + ' den Wert des deskriptiven Indexes für das aktuelle Dokument auslesen + odescIndexValue = dokument.GetVariableValue(aktivesProfil.Desk_windreamIndex) + oResultCheck = Check_DeskIndexValue(odescIndexValue, aktivesProfil.checkIndexsql, dokument) + End If + + Catch ex As Exception + + _Logger.Warn($" Error getting {dokument.aName} # Der deskriptive Indexwert '{odescIndexValue}' of Index [{aktivesProfil.Desk_windreamIndex}] verweist auf KEINEN Eintrag in der Datenbank!") + + End Try + + 'Überprüfen welcher WErt zurücgekommen ist - Select Case Check + Select Case oResultCheck Case 0 'Kein Ergebnis für den Deskriptiven Index also Kennzeichnen des Dokumentes über den Index der das Dokument für die Validierung kennzeichnet _Logger.Warn($"{dokument.aName} # Der deskriptive Indexwert '{odescIndexValue}' of Index [{aktivesProfil.Desk_windreamIndex}] verweist auf KEINEN Eintrag in der Datenbank!") @@ -1094,7 +1192,7 @@ Public Class frmNIHauptseite Dim _dokxml As WINDREAMLib.WMObject _dokxml = Nothing 'Dim _path2xmlfile As String = ordnerpfad & "\" & System.IO.Path.GetFileNameWithoutExtension(dokument.aPath) & "." & aktivesProfil.xmlEnd - _dokxml = _windreamNI.oWMSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, _pathxmlfile.Substring(2)) 'WINDREAMLib.WMEntity.WMEntityDocument + _dokxml = _windreamNI.oWMSession.GetWMObjectByPath(ConstWMEntityDocument, _pathxmlfile.Substring(2)) 'Überprüfen ob deskriptiver Wert eindeutig? _Logger.Debug("Überprüfung ob deskriptiver Wert eindeutig?") Dim Check As Integer = Check_DeskIndexValue(oResultNachindexierung, aktivesProfil.checkIndexsql, dokument) @@ -1250,7 +1348,7 @@ Public Class frmNIHauptseite Dim _dokxml As WINDREAMLib.WMObject _dokxml = Nothing - _dokxml = _windreamNI.oWMSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, _pathxmlfile.Substring(2)) 'WINDREAMLib.WMEntity.WMEntityDocument + _dokxml = _windreamNI.oWMSession.GetWMObjectByPath(ConstWMEntityDocument, _pathxmlfile.Substring(2)) '1. aktives Dok File_SetBooleanIndex(True, aktivesDokument, aktivesProfil.IndexValidation) '2. Indexierungs-Datei @@ -1582,7 +1680,7 @@ Public Class frmNIHauptseite 'Nun die xffres Datei indexieren Dim _dokxml As WINDREAMLib.WMObject _dokxml = Nothing - _dokxml = _windreamNI.oWMSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, _pathxmlfile.Substring(2)) 'WINDREAMLib.WMEntity.WMEntityDocument + _dokxml = _windreamNI.oWMSession.GetWMObjectByPath(ConstWMEntityDocument, _pathxmlfile.Substring(2)) '2. Indexierungs-Datei File_SetBooleanIndex(True, _dokxml, aktivesProfil.IndexValidation) 'Fehlermarkierung setzen @@ -1618,7 +1716,7 @@ Public Class frmNIHauptseite 'Den Flag Validation für das aktuelle Dok auf True setzen Dim _dokxml As WINDREAMLib.WMObject _dokxml = Nothing - _dokxml = _windreamNI.oWMSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, _pathxmlfile.Substring(2)) 'WINDREAMLib.WMEntity.WMEntityDocument + _dokxml = _windreamNI.oWMSession.GetWMObjectByPath(ConstWMEntityDocument, _pathxmlfile.Substring(2)) 'WINDREAMLib.WMEntity.WMEntityDocument '2. Indexierungs-Datei File_SetBooleanIndex(True, _dokxml, aktivesProfil.IndexValidation) 'Fehlermarkierung setzen @@ -2422,7 +2520,8 @@ Public Class frmNIHauptseite Catch ex As Exception If ex.Message.Contains("Variable: Error not found") Then - _Logger.Warn("Schwerwiegender Fehler bei SetErrorMeldung - Der 'Error'-Index existiert nicht: " & ex.Message) + _Logger.Warn("Error in SetErrorMeldung - Der 'Error'-Index existiert nicht!") + _Logger.Warn($"ERROR MESSAGE to set: [{_error}]") Else _Logger.Error(ex) diff --git a/ToolCollection/frmNIProfileigenschaften.Designer.vb b/ToolCollection/frmNIProfileigenschaften.Designer.vb index 04bdcdc..baf6a05 100644 --- a/ToolCollection/frmNIProfileigenschaften.Designer.vb +++ b/ToolCollection/frmNIProfileigenschaften.Designer.vb @@ -23,6 +23,7 @@ Partial Class frmNIProfileigenschaften _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNIProfileigenschaften)) Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 1") Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 2") Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 3") @@ -32,17 +33,25 @@ Partial Class frmNIProfileigenschaften Dim TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-3", New System.Windows.Forms.TreeNode() {TreeNode6}) Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-4", New System.Windows.Forms.TreeNode() {TreeNode7}) Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Windream-/W-Laufwerk", New System.Windows.Forms.TreeNode() {TreeNode8}) - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNIProfileigenschaften)) Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() + Me.btnSpeichern = New System.Windows.Forms.ToolStripDropDownButton() + Me.btnLöschen = New System.Windows.Forms.ToolStripDropDownButton() + Me.btnHinzufügen = New System.Windows.Forms.ToolStripDropDownButton() Me.cmbProfilauswahl = New System.Windows.Forms.ToolStripSplitButton() Me.tslblAnzahl = New System.Windows.Forms.ToolStripStatusLabel() + Me.tsbtnfirst = New System.Windows.Forms.ToolStripDropDownButton() + Me.tsbtnprevious = New System.Windows.Forms.ToolStripDropDownButton() + Me.tsbtnnext = New System.Windows.Forms.ToolStripDropDownButton() + Me.tsbtnlast = New System.Windows.Forms.ToolStripDropDownButton() Me.lblProfil = New System.Windows.Forms.ToolStripStatusLabel() Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog() Me.dlgMdbLocation = New System.Windows.Forms.OpenFileDialog() Me.gbxDatenbank = New System.Windows.Forms.GroupBox() Me.chkOR_ohne_TNS = New System.Windows.Forms.CheckBox() Me.CheckBoxwin_aut = New System.Windows.Forms.CheckBox() + Me.btnCheck_Con = New System.Windows.Forms.Button() Me.lblInitialCatalog = New System.Windows.Forms.Label() + Me.btnMdbLöschen = New System.Windows.Forms.Button() Me.btnMdbLocation = New System.Windows.Forms.Button() Me.txtDataSource1 = New System.Windows.Forms.TextBox() Me.lblDSN = New System.Windows.Forms.Label() @@ -84,6 +93,7 @@ Partial Class frmNIProfileigenschaften Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.grbxLDAP = New System.Windows.Forms.GroupBox() + Me.btnTestLDAP = New System.Windows.Forms.Button() Me.txtLDAP_PW = New System.Windows.Forms.TextBox() Me.lblLDAP_PW = New System.Windows.Forms.Label() Me.txtLDAP_User = New System.Windows.Forms.TextBox() @@ -101,12 +111,15 @@ Partial Class frmNIProfileigenschaften Me.chkbxAD = New System.Windows.Forms.CheckBox() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.grpbxMORE = New System.Windows.Forms.GroupBox() + Me.Button1 = New System.Windows.Forms.Button() Me.Label21 = New System.Windows.Forms.Label() Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.Label25 = New System.Windows.Forms.Label() + Me.btncrFolder_delete = New System.Windows.Forms.Button() Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.cmbCrFolderDate = New System.Windows.Forms.ComboBox() Me.Label20 = New System.Windows.Forms.Label() + Me.btnaddcrFolderParameter = New System.Windows.Forms.Button() Me.txtcrFoldermanuell = New System.Windows.Forms.TextBox() Me.Label19 = New System.Windows.Forms.Label() Me.Label18 = New System.Windows.Forms.Label() @@ -134,20 +147,7 @@ Partial Class frmNIProfileigenschaften Me.chkbxGetOrdnerRechte = New System.Windows.Forms.CheckBox() Me.Label16 = New System.Windows.Forms.Label() Me.txtObjekttyp = New System.Windows.Forms.TextBox() - Me.Button1 = New System.Windows.Forms.Button() Me.btnopenSuche = New System.Windows.Forms.Button() - Me.btnTestLDAP = New System.Windows.Forms.Button() - Me.btnCheck_Con = New System.Windows.Forms.Button() - Me.btnMdbLöschen = New System.Windows.Forms.Button() - Me.btncrFolder_delete = New System.Windows.Forms.Button() - Me.btnaddcrFolderParameter = New System.Windows.Forms.Button() - Me.btnSpeichern = New System.Windows.Forms.ToolStripDropDownButton() - Me.btnLöschen = New System.Windows.Forms.ToolStripDropDownButton() - Me.btnHinzufügen = New System.Windows.Forms.ToolStripDropDownButton() - Me.tsbtnfirst = New System.Windows.Forms.ToolStripDropDownButton() - Me.tsbtnprevious = New System.Windows.Forms.ToolStripDropDownButton() - Me.tsbtnnext = New System.Windows.Forms.ToolStripDropDownButton() - Me.tsbtnlast = New System.Windows.Forms.ToolStripDropDownButton() Me.StatusStrip1.SuspendLayout() Me.gbxDatenbank.SuspendLayout() Me.gbxDatei.SuspendLayout() @@ -181,6 +181,41 @@ Partial Class frmNIProfileigenschaften Me.StatusStrip1.TabIndex = 23 Me.StatusStrip1.Text = "StatusStrip1" ' + 'btnSpeichern + ' + Me.btnSpeichern.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.btnSpeichern.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.btnSpeichern.Enabled = False + Me.btnSpeichern.Image = Global.ToolCollection.My.Resources.Resources.table_save + Me.btnSpeichern.ImageTransparentColor = System.Drawing.Color.Magenta + Me.btnSpeichern.Name = "btnSpeichern" + Me.btnSpeichern.ShowDropDownArrow = False + Me.btnSpeichern.Size = New System.Drawing.Size(20, 20) + Me.btnSpeichern.Text = "Profil speichern" + ' + 'btnLöschen + ' + Me.btnLöschen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.btnLöschen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.btnLöschen.Enabled = False + Me.btnLöschen.Image = Global.ToolCollection.My.Resources.Resources.table_delete + Me.btnLöschen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.btnLöschen.Name = "btnLöschen" + Me.btnLöschen.ShowDropDownArrow = False + Me.btnLöschen.Size = New System.Drawing.Size(20, 20) + Me.btnLöschen.Text = "Profil löschen" + ' + 'btnHinzufügen + ' + Me.btnHinzufügen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.btnHinzufügen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.btnHinzufügen.Image = Global.ToolCollection.My.Resources.Resources.table_add + Me.btnHinzufügen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.btnHinzufügen.Name = "btnHinzufügen" + Me.btnHinzufügen.ShowDropDownArrow = False + Me.btnHinzufügen.Size = New System.Drawing.Size(20, 20) + Me.btnHinzufügen.Text = "Profil hinzufügen" + ' 'cmbProfilauswahl ' Me.cmbProfilauswahl.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right @@ -196,6 +231,46 @@ Partial Class frmNIProfileigenschaften Me.tslblAnzahl.Size = New System.Drawing.Size(83, 17) Me.tslblAnzahl.Text = "Anzahl Profile:" ' + 'tsbtnfirst + ' + Me.tsbtnfirst.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.tsbtnfirst.Image = Global.ToolCollection.My.Resources.Resources.control_rewind + Me.tsbtnfirst.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tsbtnfirst.Name = "tsbtnfirst" + Me.tsbtnfirst.ShowDropDownArrow = False + Me.tsbtnfirst.Size = New System.Drawing.Size(20, 20) + Me.tsbtnfirst.Text = "Erstes Profil" + ' + 'tsbtnprevious + ' + Me.tsbtnprevious.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.tsbtnprevious.Image = Global.ToolCollection.My.Resources.Resources.arrow_left + Me.tsbtnprevious.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tsbtnprevious.Name = "tsbtnprevious" + Me.tsbtnprevious.ShowDropDownArrow = False + Me.tsbtnprevious.Size = New System.Drawing.Size(20, 20) + Me.tsbtnprevious.Text = "Vorheriges Profil" + ' + 'tsbtnnext + ' + Me.tsbtnnext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.tsbtnnext.Image = Global.ToolCollection.My.Resources.Resources.arrow_right + Me.tsbtnnext.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tsbtnnext.Name = "tsbtnnext" + Me.tsbtnnext.ShowDropDownArrow = False + Me.tsbtnnext.Size = New System.Drawing.Size(20, 20) + Me.tsbtnnext.Text = "Nächstes Profil" + ' + 'tsbtnlast + ' + Me.tsbtnlast.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.tsbtnlast.Image = Global.ToolCollection.My.Resources.Resources.control_fastforward + Me.tsbtnlast.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tsbtnlast.Name = "tsbtnlast" + Me.tsbtnlast.ShowDropDownArrow = False + Me.tsbtnlast.Size = New System.Drawing.Size(20, 20) + Me.tsbtnlast.Text = "Letztes Profil" + ' 'lblProfil ' Me.lblProfil.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -263,6 +338,19 @@ Partial Class frmNIProfileigenschaften Me.CheckBoxwin_aut.UseVisualStyleBackColor = True Me.CheckBoxwin_aut.Visible = False ' + 'btnCheck_Con + ' + Me.btnCheck_Con.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnCheck_Con.Image = Global.ToolCollection.My.Resources.Resources.database_connect + Me.btnCheck_Con.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCheck_Con.Location = New System.Drawing.Point(273, 14) + Me.btnCheck_Con.Name = "btnCheck_Con" + Me.btnCheck_Con.Size = New System.Drawing.Size(152, 31) + Me.btnCheck_Con.TabIndex = 39 + Me.btnCheck_Con.Text = "Test DB-Verbindung" + Me.btnCheck_Con.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnCheck_Con.UseVisualStyleBackColor = True + ' 'lblInitialCatalog ' Me.lblInitialCatalog.AutoSize = True @@ -274,6 +362,17 @@ Partial Class frmNIProfileigenschaften Me.lblInitialCatalog.Text = "InitialCatalog*:" Me.lblInitialCatalog.Visible = False ' + 'btnMdbLöschen + ' + Me.btnMdbLöschen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.btnMdbLöschen.Image = CType(resources.GetObject("btnMdbLöschen.Image"), System.Drawing.Image) + Me.btnMdbLöschen.Location = New System.Drawing.Point(462, 72) + Me.btnMdbLöschen.Name = "btnMdbLöschen" + Me.btnMdbLöschen.Size = New System.Drawing.Size(25, 21) + Me.btnMdbLöschen.TabIndex = 33 + Me.btnMdbLöschen.UseVisualStyleBackColor = True + Me.btnMdbLöschen.Visible = False + ' 'btnMdbLocation ' Me.btnMdbLocation.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None @@ -425,7 +524,7 @@ Partial Class frmNIProfileigenschaften Me.lblDateiendung.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblDateiendung.Location = New System.Drawing.Point(130, 25) Me.lblDateiendung.Name = "lblDateiendung" - Me.lblDateiendung.Size = New System.Drawing.Size(113, 13) + Me.lblDateiendung.Size = New System.Drawing.Size(114, 13) Me.lblDateiendung.TabIndex = 3 Me.lblDateiendung.Text = "Dateiendungen/Typ*" ' @@ -472,7 +571,6 @@ Partial Class frmNIProfileigenschaften Me.txtWindreamsuche.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtWindreamsuche.Location = New System.Drawing.Point(18, 126) Me.txtWindreamsuche.Name = "txtWindreamsuche" - Me.txtWindreamsuche.ReadOnly = True Me.txtWindreamsuche.Size = New System.Drawing.Size(451, 22) Me.txtWindreamsuche.TabIndex = 6 ' @@ -644,6 +742,7 @@ Partial Class frmNIProfileigenschaften ' 'ListView1 ' + Me.ListView1.HideSelection = False Me.ListView1.Location = New System.Drawing.Point(10, 135) Me.ListView1.Name = "ListView1" Me.ListView1.Size = New System.Drawing.Size(234, 148) @@ -709,6 +808,18 @@ Partial Class frmNIProfileigenschaften Me.grbxLDAP.Text = "Indexierung gegen Active Directory:" Me.grbxLDAP.Visible = False ' + 'btnTestLDAP + ' + Me.btnTestLDAP.Image = Global.ToolCollection.My.Resources.Resources.asterisk_orange1 + Me.btnTestLDAP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnTestLDAP.Location = New System.Drawing.Point(348, 30) + Me.btnTestLDAP.Name = "btnTestLDAP" + Me.btnTestLDAP.Size = New System.Drawing.Size(135, 23) + Me.btnTestLDAP.TabIndex = 14 + Me.btnTestLDAP.Text = "Teste Verbindung" + Me.btnTestLDAP.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnTestLDAP.UseVisualStyleBackColor = True + ' 'txtLDAP_PW ' Me.txtLDAP_PW.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -900,6 +1011,15 @@ Partial Class frmNIProfileigenschaften Me.grpbxMORE.TabStop = False Me.grpbxMORE.Text = "Move and Rename" ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(9, 57) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(460, 23) + Me.Button1.TabIndex = 1 + Me.Button1.Text = "Öffne Move and Rename Konfiguration" + Me.Button1.UseVisualStyleBackColor = True + ' 'Label21 ' Me.Label21.AutoSize = True @@ -941,6 +1061,15 @@ Partial Class frmNIProfileigenschaften Me.Label25.TabIndex = 10 Me.Label25.Text = "Inhalte von Datum-Indizes werden automatisch YYYYMMDD konvertiert" ' + 'btncrFolder_delete + ' + Me.btncrFolder_delete.Image = Global.ToolCollection.My.Resources.Resources.delete + Me.btncrFolder_delete.Location = New System.Drawing.Point(548, 39) + Me.btncrFolder_delete.Name = "btncrFolder_delete" + Me.btncrFolder_delete.Size = New System.Drawing.Size(31, 23) + Me.btncrFolder_delete.TabIndex = 9 + Me.btncrFolder_delete.UseVisualStyleBackColor = True + ' 'GroupBox5 ' Me.GroupBox5.Controls.Add(Me.cmbCrFolderDate) @@ -976,6 +1105,19 @@ Partial Class frmNIProfileigenschaften Me.Label20.TabIndex = 5 Me.Label20.Text = "Datum-Struktur:" ' + 'btnaddcrFolderParameter + ' + Me.btnaddcrFolderParameter.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnaddcrFolderParameter.Image = Global.ToolCollection.My.Resources.Resources.add + Me.btnaddcrFolderParameter.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnaddcrFolderParameter.Location = New System.Drawing.Point(6, 152) + Me.btnaddcrFolderParameter.Name = "btnaddcrFolderParameter" + Me.btnaddcrFolderParameter.Size = New System.Drawing.Size(188, 23) + Me.btnaddcrFolderParameter.TabIndex = 4 + Me.btnaddcrFolderParameter.Text = "Ordner anhängen" + Me.btnaddcrFolderParameter.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnaddcrFolderParameter.UseVisualStyleBackColor = True + ' 'txtcrFoldermanuell ' Me.txtcrFoldermanuell.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -1109,7 +1251,7 @@ Partial Class frmNIProfileigenschaften Me.Label4.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.Location = New System.Drawing.Point(6, 18) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(638, 15) + Me.Label4.Size = New System.Drawing.Size(639, 15) Me.Label4.TabIndex = 71 Me.Label4.Text = "Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreiche" & "r Indexierung verschoben werden soll." @@ -1148,7 +1290,7 @@ Partial Class frmNIProfileigenschaften Me.Label24.AutoSize = True Me.Label24.Location = New System.Drawing.Point(461, 56) Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(122, 13) + Me.Label24.Size = New System.Drawing.Size(121, 13) Me.Label24.TabIndex = 63 Me.Label24.Text = "Beispiel Ordnerebene:" ' @@ -1273,15 +1415,6 @@ Partial Class frmNIProfileigenschaften Me.txtObjekttyp.Size = New System.Drawing.Size(396, 22) Me.txtObjekttyp.TabIndex = 80 ' - 'Button1 - ' - Me.Button1.Location = New System.Drawing.Point(9, 57) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(460, 23) - Me.Button1.TabIndex = 1 - Me.Button1.Text = "Öffne Move and Rename Konfiguration" - Me.Button1.UseVisualStyleBackColor = True - ' 'btnopenSuche ' Me.btnopenSuche.Enabled = False @@ -1297,139 +1430,6 @@ Partial Class frmNIProfileigenschaften Me.btnopenSuche.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnopenSuche.UseVisualStyleBackColor = True ' - 'btnTestLDAP - ' - Me.btnTestLDAP.Image = Global.ToolCollection.My.Resources.Resources.asterisk_orange1 - Me.btnTestLDAP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTestLDAP.Location = New System.Drawing.Point(348, 30) - Me.btnTestLDAP.Name = "btnTestLDAP" - Me.btnTestLDAP.Size = New System.Drawing.Size(135, 23) - Me.btnTestLDAP.TabIndex = 14 - Me.btnTestLDAP.Text = "Teste Verbindung" - Me.btnTestLDAP.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnTestLDAP.UseVisualStyleBackColor = True - ' - 'btnCheck_Con - ' - Me.btnCheck_Con.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnCheck_Con.Image = Global.ToolCollection.My.Resources.Resources.database_connect - Me.btnCheck_Con.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCheck_Con.Location = New System.Drawing.Point(273, 14) - Me.btnCheck_Con.Name = "btnCheck_Con" - Me.btnCheck_Con.Size = New System.Drawing.Size(152, 31) - Me.btnCheck_Con.TabIndex = 39 - Me.btnCheck_Con.Text = "Test DB-Verbindung" - Me.btnCheck_Con.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnCheck_Con.UseVisualStyleBackColor = True - ' - 'btnMdbLöschen - ' - Me.btnMdbLöschen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.btnMdbLöschen.Image = CType(resources.GetObject("btnMdbLöschen.Image"), System.Drawing.Image) - Me.btnMdbLöschen.Location = New System.Drawing.Point(462, 72) - Me.btnMdbLöschen.Name = "btnMdbLöschen" - Me.btnMdbLöschen.Size = New System.Drawing.Size(25, 21) - Me.btnMdbLöschen.TabIndex = 33 - Me.btnMdbLöschen.UseVisualStyleBackColor = True - Me.btnMdbLöschen.Visible = False - ' - 'btncrFolder_delete - ' - Me.btncrFolder_delete.Image = Global.ToolCollection.My.Resources.Resources.delete - Me.btncrFolder_delete.Location = New System.Drawing.Point(548, 39) - Me.btncrFolder_delete.Name = "btncrFolder_delete" - Me.btncrFolder_delete.Size = New System.Drawing.Size(31, 23) - Me.btncrFolder_delete.TabIndex = 9 - Me.btncrFolder_delete.UseVisualStyleBackColor = True - ' - 'btnaddcrFolderParameter - ' - Me.btnaddcrFolderParameter.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnaddcrFolderParameter.Image = Global.ToolCollection.My.Resources.Resources.add - Me.btnaddcrFolderParameter.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnaddcrFolderParameter.Location = New System.Drawing.Point(6, 152) - Me.btnaddcrFolderParameter.Name = "btnaddcrFolderParameter" - Me.btnaddcrFolderParameter.Size = New System.Drawing.Size(188, 23) - Me.btnaddcrFolderParameter.TabIndex = 4 - Me.btnaddcrFolderParameter.Text = "Ordner anhängen" - Me.btnaddcrFolderParameter.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnaddcrFolderParameter.UseVisualStyleBackColor = True - ' - 'btnSpeichern - ' - Me.btnSpeichern.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.btnSpeichern.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnSpeichern.Enabled = False - Me.btnSpeichern.Image = Global.ToolCollection.My.Resources.Resources.table_save - Me.btnSpeichern.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnSpeichern.Name = "btnSpeichern" - Me.btnSpeichern.ShowDropDownArrow = False - Me.btnSpeichern.Size = New System.Drawing.Size(20, 20) - Me.btnSpeichern.Text = "Profil speichern" - ' - 'btnLöschen - ' - Me.btnLöschen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.btnLöschen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnLöschen.Enabled = False - Me.btnLöschen.Image = Global.ToolCollection.My.Resources.Resources.table_delete - Me.btnLöschen.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnLöschen.Name = "btnLöschen" - Me.btnLöschen.ShowDropDownArrow = False - Me.btnLöschen.Size = New System.Drawing.Size(20, 20) - Me.btnLöschen.Text = "Profil löschen" - ' - 'btnHinzufügen - ' - Me.btnHinzufügen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.btnHinzufügen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnHinzufügen.Image = Global.ToolCollection.My.Resources.Resources.table_add - Me.btnHinzufügen.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnHinzufügen.Name = "btnHinzufügen" - Me.btnHinzufügen.ShowDropDownArrow = False - Me.btnHinzufügen.Size = New System.Drawing.Size(20, 20) - Me.btnHinzufügen.Text = "Profil hinzufügen" - ' - 'tsbtnfirst - ' - Me.tsbtnfirst.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.tsbtnfirst.Image = Global.ToolCollection.My.Resources.Resources.control_rewind - Me.tsbtnfirst.ImageTransparentColor = System.Drawing.Color.Magenta - Me.tsbtnfirst.Name = "tsbtnfirst" - Me.tsbtnfirst.ShowDropDownArrow = False - Me.tsbtnfirst.Size = New System.Drawing.Size(20, 20) - Me.tsbtnfirst.Text = "Erstes Profil" - ' - 'tsbtnprevious - ' - Me.tsbtnprevious.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.tsbtnprevious.Image = Global.ToolCollection.My.Resources.Resources.arrow_left - Me.tsbtnprevious.ImageTransparentColor = System.Drawing.Color.Magenta - Me.tsbtnprevious.Name = "tsbtnprevious" - Me.tsbtnprevious.ShowDropDownArrow = False - Me.tsbtnprevious.Size = New System.Drawing.Size(20, 20) - Me.tsbtnprevious.Text = "Vorheriges Profil" - ' - 'tsbtnnext - ' - Me.tsbtnnext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.tsbtnnext.Image = Global.ToolCollection.My.Resources.Resources.arrow_right - Me.tsbtnnext.ImageTransparentColor = System.Drawing.Color.Magenta - Me.tsbtnnext.Name = "tsbtnnext" - Me.tsbtnnext.ShowDropDownArrow = False - Me.tsbtnnext.Size = New System.Drawing.Size(20, 20) - Me.tsbtnnext.Text = "Nächstes Profil" - ' - 'tsbtnlast - ' - Me.tsbtnlast.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.tsbtnlast.Image = Global.ToolCollection.My.Resources.Resources.control_fastforward - Me.tsbtnlast.ImageTransparentColor = System.Drawing.Color.Magenta - Me.tsbtnlast.Name = "tsbtnlast" - Me.tsbtnlast.ShowDropDownArrow = False - Me.tsbtnlast.Size = New System.Drawing.Size(20, 20) - Me.tsbtnlast.Text = "Letztes Profil" - ' 'frmNIProfileigenschaften ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/ToolCollection/frmNIProfileigenschaften.resx b/ToolCollection/frmNIProfileigenschaften.resx index e0a1527..e65b84c 100644 --- a/ToolCollection/frmNIProfileigenschaften.resx +++ b/ToolCollection/frmNIProfileigenschaften.resx @@ -161,7 +161,7 @@ einen Startindex erhält, der nicht in der Datenbank existiert. Diese Kennzeichn AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK - CQAAAk1TRnQBSQFMAgEBAgEAAYgBAAGIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAZABAAGQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/ToolCollection/frmNIProfileigenschaften.vb b/ToolCollection/frmNIProfileigenschaften.vb index f96692d..0da70c1 100644 --- a/ToolCollection/frmNIProfileigenschaften.vb +++ b/ToolCollection/frmNIProfileigenschaften.vb @@ -218,7 +218,10 @@ Public Class frmNIProfileigenschaften Private Sub txtWindreamsuche_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtWindreamsuche.TextChanged If Not Me.txtWindreamsuche.Text = "" Then - Me.btnopenSuche.Enabled = True + If txtWindreamsuche.Text.Contains("select") = False Then + Me.btnopenSuche.Enabled = True + End If + Else Me.btnopenSuche.Enabled = False End If @@ -231,6 +234,11 @@ Public Class frmNIProfileigenschaften Me.btnSpeichern.Enabled = False End If End If + 'If txtWindreamsuche.Text.Contains("select") Then + ' txtWindreamsuche.ReadOnly = False + 'Else + ' txtWindreamsuche.ReadOnly = True + 'End If End Sub Sub Lade_Profil(ByVal name As String) ' den Löschen-Button aktivieren diff --git a/ToolCollection/frmNIProfilhinzufuegen.Designer.vb b/ToolCollection/frmNIProfilhinzufuegen.Designer.vb index e349d14..1d08827 100644 --- a/ToolCollection/frmNIProfilhinzufuegen.Designer.vb +++ b/ToolCollection/frmNIProfilhinzufuegen.Designer.vb @@ -42,7 +42,6 @@ Partial Class frmNIProfilhinzufuegen Me.cmbDbArt = New System.Windows.Forms.ComboBox() Me.lblDatenbanktyp = New System.Windows.Forms.Label() Me.btnWindreamSuche = New System.Windows.Forms.Button() - Me.Label5 = New System.Windows.Forms.Label() Me.txtWindreamSuche = New System.Windows.Forms.TextBox() Me.txtProfilname = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() @@ -87,6 +86,9 @@ Partial Class frmNIProfilhinzufuegen Me.chkbxGetOrdnerRechte = New System.Windows.Forms.CheckBox() Me.rbVolltext = New System.Windows.Forms.RadioButton() Me.btnWindreamsucheLöschen = New System.Windows.Forms.Button() + Me.RadioButton1 = New System.Windows.Forms.RadioButton() + Me.GroupBox4 = New System.Windows.Forms.GroupBox() + Me.RadioButton2 = New System.Windows.Forms.RadioButton() Me.grbxDatenbank.SuspendLayout() Me.grbxDatei.SuspendLayout() Me.GroupBox1.SuspendLayout() @@ -95,6 +97,7 @@ Partial Class frmNIProfilhinzufuegen Me.grbxFT.SuspendLayout() Me.grbxLDAP.SuspendLayout() Me.GroupBox3.SuspendLayout() + Me.GroupBox4.SuspendLayout() Me.SuspendLayout() ' 'grbxDatenbank @@ -294,29 +297,20 @@ Partial Class frmNIProfilhinzufuegen 'btnWindreamSuche ' Me.btnWindreamSuche.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.btnWindreamSuche.Location = New System.Drawing.Point(619, 84) + Me.btnWindreamSuche.Location = New System.Drawing.Point(535, 40) Me.btnWindreamSuche.Name = "btnWindreamSuche" Me.btnWindreamSuche.Size = New System.Drawing.Size(25, 21) Me.btnWindreamSuche.TabIndex = 3 Me.btnWindreamSuche.Text = "..." Me.btnWindreamSuche.UseVisualStyleBackColor = True ' - 'Label5 - ' - Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(12, 69) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(104, 13) - Me.Label5.TabIndex = 61 - Me.Label5.Text = "windream-Suche*: " - ' 'txtWindreamSuche ' Me.txtWindreamSuche.BackColor = System.Drawing.SystemColors.Info - Me.txtWindreamSuche.Location = New System.Drawing.Point(15, 85) + Me.txtWindreamSuche.Location = New System.Drawing.Point(11, 41) Me.txtWindreamSuche.Name = "txtWindreamSuche" Me.txtWindreamSuche.ReadOnly = True - Me.txtWindreamSuche.Size = New System.Drawing.Size(598, 22) + Me.txtWindreamSuche.Size = New System.Drawing.Size(518, 22) Me.txtWindreamSuche.TabIndex = 2 ' 'txtProfilname @@ -338,7 +332,7 @@ Partial Class frmNIProfilhinzufuegen 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 39) + Me.Label1.Location = New System.Drawing.Point(312, 13) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(66, 13) Me.Label1.TabIndex = 55 @@ -348,7 +342,7 @@ Partial Class frmNIProfilhinzufuegen ' Me.cmbObjektTypen.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cmbObjektTypen.FormattingEnabled = True - Me.cmbObjektTypen.Location = New System.Drawing.Point(105, 33) + Me.cmbObjektTypen.Location = New System.Drawing.Point(405, 7) Me.cmbObjektTypen.Name = "cmbObjektTypen" Me.cmbObjektTypen.Size = New System.Drawing.Size(204, 21) Me.cmbObjektTypen.TabIndex = 1 @@ -356,7 +350,7 @@ Partial Class frmNIProfilhinzufuegen 'btnOK ' Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnOK.Location = New System.Drawing.Point(516, 647) + Me.btnOK.Location = New System.Drawing.Point(516, 648) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(75, 23) Me.btnOK.TabIndex = 4 @@ -366,7 +360,7 @@ Partial Class frmNIProfilhinzufuegen 'btnAbbrechen ' Me.btnAbbrechen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnAbbrechen.Location = New System.Drawing.Point(597, 647) + Me.btnAbbrechen.Location = New System.Drawing.Point(597, 648) Me.btnAbbrechen.Name = "btnAbbrechen" Me.btnAbbrechen.Size = New System.Drawing.Size(75, 23) Me.btnAbbrechen.TabIndex = 5 @@ -385,7 +379,7 @@ Partial Class frmNIProfilhinzufuegen 'rbDatenbank ' Me.rbDatenbank.AutoSize = True - Me.rbDatenbank.Location = New System.Drawing.Point(15, 113) + Me.rbDatenbank.Location = New System.Drawing.Point(15, 116) Me.rbDatenbank.Name = "rbDatenbank" Me.rbDatenbank.Size = New System.Drawing.Size(102, 17) Me.rbDatenbank.TabIndex = 64 @@ -395,7 +389,7 @@ Partial Class frmNIProfilhinzufuegen 'rbDatei ' Me.rbDatei.AutoSize = True - Me.rbDatei.Location = New System.Drawing.Point(123, 113) + Me.rbDatei.Location = New System.Drawing.Point(123, 116) Me.rbDatei.Name = "rbDatei" Me.rbDatei.Size = New System.Drawing.Size(72, 17) Me.rbDatei.TabIndex = 65 @@ -503,7 +497,7 @@ Partial Class frmNIProfilhinzufuegen Me.GroupBox2.Controls.Add(Me.Label6) Me.GroupBox2.Controls.Add(Me.cmbIndexValidierung) Me.GroupBox2.Controls.Add(Me.Label3) - Me.GroupBox2.Location = New System.Drawing.Point(17, 558) + Me.GroupBox2.Location = New System.Drawing.Point(17, 561) Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Size = New System.Drawing.Size(655, 83) Me.GroupBox2.TabIndex = 69 @@ -523,7 +517,7 @@ Partial Class frmNIProfilhinzufuegen 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(23, 647) + Me.Label4.Location = New System.Drawing.Point(23, 650) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(74, 13) Me.Label4.TabIndex = 70 @@ -532,7 +526,7 @@ Partial Class frmNIProfilhinzufuegen 'RBLDAP ' Me.RBLDAP.AutoSize = True - Me.RBLDAP.Location = New System.Drawing.Point(201, 113) + Me.RBLDAP.Location = New System.Drawing.Point(201, 116) Me.RBLDAP.Name = "RBLDAP" Me.RBLDAP.Size = New System.Drawing.Size(159, 17) Me.RBLDAP.TabIndex = 71 @@ -546,7 +540,7 @@ Partial Class frmNIProfilhinzufuegen Me.pnlPlatzhalter.Controls.Add(Me.grbxFT) Me.pnlPlatzhalter.Controls.Add(Me.grbxLDAP) Me.pnlPlatzhalter.Controls.Add(Me.grbxDatei) - Me.pnlPlatzhalter.Location = New System.Drawing.Point(15, 136) + Me.pnlPlatzhalter.Location = New System.Drawing.Point(15, 139) Me.pnlPlatzhalter.Name = "pnlPlatzhalter" Me.pnlPlatzhalter.Size = New System.Drawing.Size(656, 326) Me.pnlPlatzhalter.TabIndex = 72 @@ -575,7 +569,7 @@ Partial Class frmNIProfilhinzufuegen Me.Label10.AutoSize = True Me.Label10.Location = New System.Drawing.Point(6, 56) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(292, 13) + Me.Label10.Size = New System.Drawing.Size(291, 13) Me.Label10.TabIndex = 0 Me.Label10.Text = "Bitte geben Sie hier den Indexnamen des Volltextes ein:" ' @@ -670,7 +664,7 @@ Partial Class frmNIProfilhinzufuegen Me.GroupBox3.Controls.Add(Me.Label7) Me.GroupBox3.Controls.Add(Me.cmbOrdnertyp) Me.GroupBox3.Controls.Add(Me.chkbxGetOrdnerRechte) - Me.GroupBox3.Location = New System.Drawing.Point(15, 468) + Me.GroupBox3.Location = New System.Drawing.Point(15, 471) Me.GroupBox3.Name = "GroupBox3" Me.GroupBox3.Size = New System.Drawing.Size(656, 84) Me.GroupBox3.TabIndex = 73 @@ -729,7 +723,7 @@ Partial Class frmNIProfilhinzufuegen 'rbVolltext ' Me.rbVolltext.AutoSize = True - Me.rbVolltext.Location = New System.Drawing.Point(366, 113) + Me.rbVolltext.Location = New System.Drawing.Point(366, 116) Me.rbVolltext.Name = "rbVolltext" Me.rbVolltext.Size = New System.Drawing.Size(83, 17) Me.rbVolltext.TabIndex = 74 @@ -741,17 +735,54 @@ Partial Class frmNIProfilhinzufuegen ' Me.btnWindreamsucheLöschen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.btnWindreamsucheLöschen.Image = Global.ToolCollection.My.Resources.Resources.cross - Me.btnWindreamsucheLöschen.Location = New System.Drawing.Point(646, 84) + Me.btnWindreamsucheLöschen.Location = New System.Drawing.Point(562, 40) Me.btnWindreamsucheLöschen.Name = "btnWindreamsucheLöschen" Me.btnWindreamsucheLöschen.Size = New System.Drawing.Size(25, 21) Me.btnWindreamsucheLöschen.TabIndex = 62 Me.btnWindreamsucheLöschen.UseVisualStyleBackColor = True ' + 'RadioButton1 + ' + Me.RadioButton1.AutoSize = True + Me.RadioButton1.Checked = True + Me.RadioButton1.Location = New System.Drawing.Point(11, 20) + Me.RadioButton1.Name = "RadioButton1" + Me.RadioButton1.Size = New System.Drawing.Size(113, 17) + Me.RadioButton1.TabIndex = 75 + Me.RadioButton1.TabStop = True + Me.RadioButton1.Text = "Windream-Suche" + Me.RadioButton1.UseVisualStyleBackColor = True + ' + 'GroupBox4 + ' + Me.GroupBox4.Controls.Add(Me.RadioButton2) + Me.GroupBox4.Controls.Add(Me.RadioButton1) + Me.GroupBox4.Controls.Add(Me.txtWindreamSuche) + Me.GroupBox4.Controls.Add(Me.btnWindreamSuche) + Me.GroupBox4.Controls.Add(Me.btnWindreamsucheLöschen) + Me.GroupBox4.Location = New System.Drawing.Point(15, 36) + Me.GroupBox4.Name = "GroupBox4" + Me.GroupBox4.Size = New System.Drawing.Size(594, 74) + Me.GroupBox4.TabIndex = 76 + Me.GroupBox4.TabStop = False + Me.GroupBox4.Text = "Art der Suche:" + ' + 'RadioButton2 + ' + Me.RadioButton2.AutoSize = True + Me.RadioButton2.Location = New System.Drawing.Point(132, 20) + Me.RadioButton2.Name = "RadioButton2" + Me.RadioButton2.Size = New System.Drawing.Size(44, 17) + Me.RadioButton2.TabIndex = 76 + Me.RadioButton2.Text = "SQL" + Me.RadioButton2.UseVisualStyleBackColor = True + ' 'frmNIProfilhinzufuegen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(684, 682) + Me.ClientSize = New System.Drawing.Size(684, 683) + Me.Controls.Add(Me.GroupBox4) Me.Controls.Add(Me.rbVolltext) Me.Controls.Add(Me.GroupBox3) Me.Controls.Add(Me.RBLDAP) @@ -759,10 +790,6 @@ Partial Class frmNIProfilhinzufuegen Me.Controls.Add(Me.GroupBox2) Me.Controls.Add(Me.rbDatei) Me.Controls.Add(Me.rbDatenbank) - Me.Controls.Add(Me.btnWindreamsucheLöschen) - Me.Controls.Add(Me.btnWindreamSuche) - Me.Controls.Add(Me.Label5) - Me.Controls.Add(Me.txtWindreamSuche) Me.Controls.Add(Me.txtProfilname) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label1) @@ -794,6 +821,8 @@ Partial Class frmNIProfilhinzufuegen Me.grbxLDAP.PerformLayout() Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.PerformLayout() + Me.GroupBox4.ResumeLayout(False) + Me.GroupBox4.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -813,7 +842,6 @@ Partial Class frmNIProfilhinzufuegen Friend WithEvents lblDatenbanktyp As System.Windows.Forms.Label Friend WithEvents btnWindreamsucheLöschen As System.Windows.Forms.Button Friend WithEvents btnWindreamSuche As System.Windows.Forms.Button - Friend WithEvents Label5 As System.Windows.Forms.Label Friend WithEvents txtWindreamSuche As System.Windows.Forms.TextBox Friend WithEvents txtProfilname As System.Windows.Forms.TextBox Friend WithEvents Label2 As System.Windows.Forms.Label @@ -862,4 +890,7 @@ Partial Class frmNIProfilhinzufuegen Friend WithEvents Label9 As System.Windows.Forms.Label Friend WithEvents txtVolltextname As System.Windows.Forms.TextBox Friend WithEvents Label10 As System.Windows.Forms.Label + Friend WithEvents RadioButton1 As RadioButton + Friend WithEvents GroupBox4 As GroupBox + Friend WithEvents RadioButton2 As RadioButton End Class diff --git a/ToolCollection/frmNIProfilhinzufuegen.vb b/ToolCollection/frmNIProfilhinzufuegen.vb index 92a5121..96c9cfe 100644 --- a/ToolCollection/frmNIProfilhinzufuegen.vb +++ b/ToolCollection/frmNIProfilhinzufuegen.vb @@ -594,4 +594,14 @@ Public Class frmNIProfilhinzufuegen Private Sub cmbInitialCatalog_Click(sender As Object, e As EventArgs) Handles cmbInitialCatalog.Click Get_MSSQL_Databases() End Sub + + Private Sub RadioButton2_CheckedChanged(sender As Object, e As EventArgs) Handles RadioButton2.CheckedChanged + If RadioButton2.Checked Then + txtWindreamSuche.ReadOnly = False + btnWindreamSuche.Visible = False + Else + txtWindreamSuche.ReadOnly = True + btnWindreamSuche.Visible = False + End If + End Sub End Class \ No newline at end of file diff --git a/ToolCollection/frmNIVerknuepfungen.vb b/ToolCollection/frmNIVerknuepfungen.vb index 6649101..2dd1387 100644 --- a/ToolCollection/frmNIVerknuepfungen.vb +++ b/ToolCollection/frmNIVerknuepfungen.vb @@ -34,6 +34,7 @@ Public Class frmNIVerknuepfungen Public Shared vReplace As String Private database As ClassNIDatenbankzugriff Private Shared _Instance As frmNIVerknuepfungen = Nothing + Private _windreamNI As ClassNIWindream Public Shared Function Instance() As frmNIVerknuepfungen If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then _Instance = New frmNIVerknuepfungen @@ -56,6 +57,7 @@ Public Class frmNIVerknuepfungen _flagIgnoreCheckedChanged = False _windream = New ClassWindream_allgemein(CURR_LogConfig) database = New ClassNIDatenbankzugriff(CURR_LogConfig) + _windreamNI = New ClassNIWindream(CURR_LogConfig) ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. Me.LoadProfilesInCombobox() End Sub @@ -249,7 +251,7 @@ Public Class frmNIVerknuepfungen Me.lvwVerknuepfungen.Items.Add(New Windows.Forms.ListViewItem(New String() {link.Index, link.Spalte, link.From})) ' wenn es den aktuellen Index noch in der Indexliste gibt If Me.lbxWMIndex.Items.Contains(link.Index) Then - Dim indextype As String = ClassNIWindream.GetIndex_Type(link.Index) + Dim indextype As String = _windreamNI.GetIndex_Type(link.Index) If Not indextype.StartsWith("Vektor") Then ' dann diesen Eintrag löschen Me.lbxWMIndex.Items.Remove(link.Index) @@ -317,7 +319,7 @@ Public Class frmNIVerknuepfungen Me.lvwVerknuepfungen.Items.Add(New Windows.Forms.ListViewItem(New String() {link.Index, link.Spalte, link.From})) ' wenn es den aktuellen Index noch in der Indexliste gibt If Me.lbxWMIndex.Items.Contains(link.Index) Then - Dim indextype As String = ClassNIWindream.GetIndex_Type(link.Index) + Dim indextype As String = _windreamNI.GetIndex_Type(link.Index) If Not indextype.StartsWith("Vektor") Then ' dann diesen Eintrag löschen Me.lbxWMIndex.Items.Remove(link.Index) @@ -397,7 +399,7 @@ Public Class frmNIVerknuepfungen Me.lvwVerknuepfungen.Items.Add(New Windows.Forms.ListViewItem(New String() {link.Index, link.Spalte, link.SelectAnweisung})) ' wenn es den aktuellen Index noch in der Indexliste gibt If Me.lbxWMIndex.Items.Contains(link.Index) Then - Dim indextype As String = ClassNIWindream.GetIndex_Type(link.Index) + Dim indextype As String = _windreamNI.GetIndex_Type(link.Index) If Not indextype.StartsWith("Vektor") Then ' dann diesen Eintrag löschen Me.lbxWMIndex.Items.Remove(link.Index) @@ -447,7 +449,7 @@ Public Class frmNIVerknuepfungen Me.lvwVerknuepfungen.Items.Add(New Windows.Forms.ListViewItem(New String() {link.Index, link.Spalte, link.From})) ' wenn es den aktuellen Index noch in der Indexliste gibt If Me.lbxWMIndex.Items.Contains(link.Index) Then - Dim indextype As String = ClassNIWindream.GetIndex_Type(link.Index) + Dim indextype As String = _windreamNI.GetIndex_Type(link.Index) If Not indextype.StartsWith("Vektor") Then ' dann diesen Eintrag löschen Me.lbxWMIndex.Items.Remove(link.Index) @@ -1406,7 +1408,7 @@ Public Class frmNIVerknuepfungen ' Liste mit Spalten deselektieren Me.lbxQuelle1.SelectedIndex = -1 If Me.txtManIndexwert.Text = "" Then - Dim indextype As String = ClassNIWindream.GetIndex_Type(Me.lbxWMIndex.SelectedItem) + Dim indextype As String = _windreamNI.GetIndex_Type(Me.lbxWMIndex.SelectedItem) If Not indextype.StartsWith("Vektor") Then ' dann diesen Eintrag löschen Me.lbxWMIndex.Items.Remove(Me.lbxWMIndex.SelectedItem) @@ -1514,7 +1516,7 @@ Public Class frmNIVerknuepfungen Me._selectedProfil._links.AddLink(Me.lbxWMIndex.SelectedItem, _value, "ft", Ft_area) ' Eintrag in ListView machen Me.lvwVerknuepfungen.Items.Add(New Windows.Forms.ListViewItem(New String() {Me.lbxWMIndex.SelectedItem, _value, Ft_area})) - Dim indextype As String = ClassNIWindream.GetIndex_Type(Me.lbxWMIndex.SelectedItem) + Dim indextype As String = _windreamNI.GetIndex_Type(Me.lbxWMIndex.SelectedItem) If Not indextype.StartsWith("Vektor") Then ' dann diesen Eintrag löschen Me.lbxWMIndex.Items.Remove(lbxWMIndex.SelectedItem) @@ -1559,7 +1561,7 @@ Public Class frmNIVerknuepfungen ' Liste mit Spalten deselektieren Me.lbxQuelle1.SelectedIndex = -1 If Me.txtManIndexwert.Text = "" Then - Dim indextype As String = ClassNIWindream.GetIndex_Type(Me.lbxWMIndex.SelectedItem) + Dim indextype As String = _windreamNI.GetIndex_Type(Me.lbxWMIndex.SelectedItem) If Not indextype.StartsWith("Vektor") Then ' dann diesen Eintrag löschen Me.lbxWMIndex.Items.Remove(Me.lbxWMIndex.SelectedItem) @@ -1976,7 +1978,7 @@ Public Class frmNIVerknuepfungen If Me.lvwVerknuepfungen.SelectedItems.Count > 0 Then If Me._selectedProfil._links.selectedLink IsNot Nothing Then 'Radiobuttons Vektor InsertState Überprüfen - selectedIndex_Type = ClassNIWindream.GetIndex_Type(Me.lvwVerknuepfungen.SelectedItems(0).SubItems(0).Text) + selectedIndex_Type = _windreamNI.GetIndex_Type(Me.lvwVerknuepfungen.SelectedItems(0).SubItems(0).Text) visinvisible_Vektor_ins_State() If selectedIndex_Type.StartsWith("Vektor") Then Me.Changeinaction = True @@ -3389,7 +3391,7 @@ Public Class frmNIVerknuepfungen Me.chkboxWhitespace.Checked = False Me.txtregex.Text = "" End Select - selectedIndex_Type = ClassNIWindream.GetIndex_Type(lbxWMIndex.SelectedItem) + selectedIndex_Type = _windreamNI.GetIndex_Type(lbxWMIndex.SelectedItem) If selectedIndex_Type Is Nothing = False Then visinvisible_Vektor_ins_State() End If