From 80247e18ddcce5279fbef64d7ccc23f6752a6b8c Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Tue, 29 Sep 2015 12:16:23 +0200 Subject: [PATCH] MS2909 --- Global_Indexer/ClassDatabase.vb | 70 ++++ Global_Indexer/ClassFilehandle.vb | 14 +- Global_Indexer/ClassFolderWatcher.vb | 48 +-- Global_Indexer/ClassPostprocessing.vb | 2 +- Global_Indexer/ClassWindream.vb | 3 +- Global_Indexer/Global_Indexer.vbproj | 18 + Global_Indexer/ModuleCURRENT.vb | 7 + Global_Indexer/My Project/AssemblyInfo.vb | 2 +- .../My Project/Resources.Designer.vb | 40 ++ Global_Indexer/My Project/Resources.resx | 36 +- Global_Indexer/MyDataset.Designer.vb | 21 +- Global_Indexer/MyDataset.xsc | 30 +- Global_Indexer/MyDataset.xsd | 90 ++--- Global_Indexer/frmAdministration.Designer.vb | 136 ++++--- Global_Indexer/frmAdministration.vb | 38 +- Global_Indexer/frmConfig_Basic.designer.vb | 132 ++++-- Global_Indexer/frmConfig_Basic.vb | 84 ++-- Global_Indexer/frmConnections.Designer.vb | 28 +- Global_Indexer/frmIndex.vb | 213 +++++----- Global_Indexer/frmSQL-Result.Designer.vb | 219 ++++++++++ Global_Indexer/frmSQL-Result.resx | 200 ++++++++++ Global_Indexer/frmSQL-Result.vb | 8 + .../frmSQLConfigAutoIndex.Designer.vb | 321 ++++++++++++++- Global_Indexer/frmSQLConfigAutoIndex.resx | 15 + Global_Indexer/frmSQLConfigAutoIndex.vb | 376 +++++++++++++++--- Global_Indexer/frmSQLSuggestion.Designer.vb | 32 +- Global_Indexer/frmSQL_Admin.vb | 8 +- Global_Indexer/frmStart.Designer.vb | 22 +- Global_Indexer/frmStart.resx | 3 + Global_Indexer/frmStart.vb | 108 +++-- SetupWix/Product.wxs | 6 +- 31 files changed, 1807 insertions(+), 523 deletions(-) create mode 100644 Global_Indexer/frmSQL-Result.Designer.vb create mode 100644 Global_Indexer/frmSQL-Result.resx create mode 100644 Global_Indexer/frmSQL-Result.vb diff --git a/Global_Indexer/ClassDatabase.vb b/Global_Indexer/ClassDatabase.vb index 5285ebe..fe32012 100644 --- a/Global_Indexer/ClassDatabase.vb +++ b/Global_Indexer/ClassDatabase.vb @@ -39,6 +39,29 @@ Public Class ClassDatabase Return Nothing End Try End Function + Public Shared Function Return_Datatable_CS(Select_anweisung As String, ConString As String, Optional userInput As Boolean = False) + Try + Dim SQLconnect As New SqlClient.SqlConnection + Dim SQLcommand As SqlClient.SqlCommand + SQLconnect.ConnectionString = ConString + SQLconnect.Open() + SQLcommand = SQLconnect.CreateCommand + SQLcommand.CommandText = Select_anweisung + + Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand) + Dim dt As DataTable = New DataTable() + adapter1.Fill(dt) + SQLconnect.Close() + Return dt + Catch ex As Exception + If userInput = True Then + MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical) + End If + ClassLogger.Add("Fehler bei Return_Datatable_CS: " & ex.Message, True) + ClassLogger.Add("#SQL: " & Select_anweisung, False) + Return Nothing + End Try + End Function Public Shared Function Execute_non_Query(ExecuteCMD As String, Optional userInput As Boolean = False) Try Dim SQLconnect As New SqlClient.SqlConnection @@ -105,4 +128,51 @@ Public Class ClassDatabase Return Nothing End Try End Function + Public Shared Function OracleExecute_non_Query(ExecuteCMD As String, OracleConnection As String, Optional userInput As Boolean = False) + Try + Dim SQLconnect As New OracleConnection + Dim SQLcommand As OracleCommand + SQLconnect.ConnectionString = OracleConnection + SQLconnect.Open() + SQLcommand = SQLconnect.CreateCommand + 'Update Last Created Record in Foo + SQLcommand.CommandText = ExecuteCMD + SQLcommand.ExecuteNonQuery() + SQLcommand.Dispose() + SQLconnect.Close() + Return True + Catch ex As Exception + If userInput = True Then + MsgBox("Error in OracleExecute_non_Query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical) + End If + ClassLogger.Add("Fehler bei OracleExecute_non_Query: " & ex.Message, True) + ClassLogger.Add("#SQL: " & ExecuteCMD, False) + + Return False + End Try + End Function + + Public Shared Function Oracle_Return_Datatable(Select_anweisung As String, OracleConnection As String, Optional userInput As Boolean = False) + Try + Dim SQLconnect As New OracleConnection + Dim SQLcommand As OracleCommand + SQLconnect.ConnectionString = OracleConnection + SQLconnect.Open() + SQLcommand = SQLconnect.CreateCommand + SQLcommand.CommandText = Select_anweisung + + Dim adapter1 As OracleDataAdapter = New OracleDataAdapter(SQLcommand) + Dim dt As DataTable = New DataTable() + adapter1.Fill(dt) + SQLconnect.Close() + Return dt + Catch ex As Exception + If userInput = True Then + MsgBox("Error in Oracle Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical) + End If + ClassLogger.Add("Fehler bei Oracle_Return_Datatable: " & ex.Message, True) + ClassLogger.Add("#SQL: " & Select_anweisung, False) + Return Nothing + End Try + End Function End Class diff --git a/Global_Indexer/ClassFilehandle.vb b/Global_Indexer/ClassFilehandle.vb index 9a19100..f0def46 100644 --- a/Global_Indexer/ClassFilehandle.vb +++ b/Global_Indexer/ClassFilehandle.vb @@ -39,7 +39,10 @@ Public Class ClassFilehandle If Not msg.InternetMessageId Is Nothing Then CURRENT_MESSAGEID = msg.InternetMessageId Else - MsgBox("Es konnte keine Message-ID ausgelesen werden." & vbNewLine & "Dies kann zu Fehlern in der Indexierung führen!", MsgBoxStyle.Exclamation, "Achtung:") + If LogErrorsOnly = False Then ClassLogger.Add(">> Email_Decay: Es konnte keine Message-ID gelesen werden. Eine GUID wird erzeugt!", False) + Dim sGUID As String + sGUID = System.Guid.NewGuid.ToString() + CURRENT_MESSAGEID = sGUID End If 'Nur die MSGDatei ablegen @@ -103,23 +106,22 @@ Public Class ClassFilehandle ' Prüft, ob die angegeben Datei aktuell durch eine ' andere Anwendung in Benutzung ist Dim ff As Integer = FreeFile() - If System.IO.File.Exists(fullFilePath) Then Try ' Versuchen, die Datei mit *exklusiven* Lese- und ' Schreibrechten zu öffnen - FileOpen(ff, fullFilePath, OpenMode.Binary, _ - OpenAccess.ReadWrite, _ - OpenShare.LockReadWrite) - Catch + FileOpen(ff, fullFilePath, OpenMode.Binary, OpenAccess.ReadWrite, OpenShare.LockReadWrite) + Catch ex As Exception ' Ist ein Fehler aufgetreten, so wird nach außen hin generell ' davon ausgegangen, dass die Datei in Benutzung ist (obwohl ' auch andere Ursachen, etwa Rechteprobleme, möglich sind). + If LogErrorsOnly = False Then ClassLogger.Add(">> FileInUse Message: " & ex.Message, False) IsFileInUse = True Finally ' Die eventuell geöffnete Datei schließen FileClose(ff) End Try + Return False End If End Function diff --git a/Global_Indexer/ClassFolderWatcher.vb b/Global_Indexer/ClassFolderWatcher.vb index d04cb28..6c828ad 100644 --- a/Global_Indexer/ClassFolderWatcher.vb +++ b/Global_Indexer/ClassFolderWatcher.vb @@ -130,9 +130,13 @@ Public Class ClassFolderWatcher End Function Private Shared Sub OnCreated(source As Object, e As FileSystemEventArgs) Try - If e.FullPath.Contains("Thumbs.") Or e.FullPath.EndsWith(".tmp") Or e.FullPath.Contains("\~$") Then - Exit Sub - End If + For Each row As DataRow In DTEXCLUDE_FILES.Rows + Dim content As String = row.Item(0).ToString.ToLower + If e.FullPath.ToLower.Contains(content) Then + Exit Sub + End If + Next + Dim handleType As String If e.FullPath.EndsWith(".msg") Then handleType = "@FW_OUTLOOK_MESSAGE@" @@ -140,47 +144,13 @@ Public Class ClassFolderWatcher handleType = "@FW_SIMPLEINDEXER@" End If 'Die Datei übergeben - If LogErrorsOnly = False Then ClassLogger.Add(">> OnCreated-File:" & CURRENT_FILENAME, False) + If LogErrorsOnly = False Then ClassLogger.Add(">> OnCreated-File:" & e.FullPath, False) If ClassIndexFunctions.FileExistsinDropTable(CURRENT_FILENAME) = False Then ClassFilehandle.Decide_FileHandle(e.FullPath, handleType) Else Console.WriteLine("File existiert bereits") End If - 'frmMain.MyNewTimer() - - 'ShowIndexForm() - 'Dim file = CURRENT_FILENAME - 'Dim frm As New frmIndex - 'frm.ShowDialog() - ''Jetzt die Anhänge auslesen - 'If file.EndsWith(".msg") Then - ' Dim _msg As New Msg.Message(CURRENT_FILENAME) - ' Dim i1 As Integer = 1 - ' For Each attachment As Independentsoft.Msg.Attachment In _msg.Attachments - ' If attachment.DisplayName Is Nothing Then - ' If Not attachment.LongFileName Is Nothing And Not attachment.LongFileName.Contains("inline") Then - ' Dim tempfile As String = Path.Combine(Path.GetTempPath, attachment.LongFileName) - ' If LogErrorsOnly = False Then ClassLogger.Add(">> Attachment (" & i1 & "):" & tempfile, False) - ' attachment.Save(tempfile) - ' CURRENT_FILENAME = "@ATTMNTEXTRACTED@" & tempfile - ' frmIndex.ShowDialog() - ' i1 += 1 - ' End If - ' End If - ' Next - - - 'End If - - ''Prüfen ob alle Files abgearbeitet wurden - 'Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND USER@WORK = '" & Environment.UserName & "'") - 'If DT.Rows.Count > 0 Then - ' For Each row As DataRow In DT.Rows - ' MsgBox("Abbrechen nicht möglich:" & vbNewLine & "Bitte indexieren Sie die folgende Datei vollständig:", MsgBoxStyle.Exclamation) - ' CURRENT_FILENAME = row.Item(1) - ' frmIndex.ShowDialog() - ' Next - 'End If + Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei folder_watch_Created") End Try diff --git a/Global_Indexer/ClassPostprocessing.vb b/Global_Indexer/ClassPostprocessing.vb index 81b5743..6721acc 100644 --- a/Global_Indexer/ClassPostprocessing.vb +++ b/Global_Indexer/ClassPostprocessing.vb @@ -35,7 +35,7 @@ Public Class ClassPostprocessing If LogErrorsOnly = False Then ClassLogger.Add(" ...Ergebnis des RegEx: " & resultRegex.ToString, False) result = resultRegex.ToString Else - ClassLogger.Add("Postprocessing RegEx konnte kein ergebnis auswerten!", True) + ClassLogger.Add("Postprocessing RegEx konnte kein Ergebnis auswerten!", True) End If End Select Next diff --git a/Global_Indexer/ClassWindream.vb b/Global_Indexer/ClassWindream.vb index 4f0e967..4182315 100644 --- a/Global_Indexer/ClassWindream.vb +++ b/Global_Indexer/ClassWindream.vb @@ -392,6 +392,7 @@ Public Class ClassWindream ' Index aus den Eigenschaften auslesen oIndex = oRelProperties.Item(0) + 'Dim o = oRelProperties.Item(2) ' Indexname speichern aIndexNames(j) = oIndex.aName Next @@ -586,7 +587,7 @@ Public Class ClassWindream End If If My.Computer.FileSystem.DirectoryExists(Zielverzeichnis) Then - If LogErrorsOnly = False Then ClassLogger.Add(" ...targetPath exisitiert", False) + If LogErrorsOnly = False Then ClassLogger.Add(" ...targetPath existiert", False) ' Überprüfen ob der zu Kopieren notwendige Speicherplatz auf Ziellaufwerk vorhanden ist Dim dvr As New DriveInfo(vWLaufwerk & ":") Dim freeSpace = dvr.TotalFreeSpace diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index 70152e4..e5650c3 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -49,6 +49,9 @@ globe_handdrawn.ico + + My Project\app.manifest + @@ -203,6 +206,12 @@ Form + + frmSQL-Result.vb + + + Form + frmSQLConfigAutoIndex.vb @@ -241,6 +250,7 @@ + @@ -301,6 +311,9 @@ frmNamenkonvention.vb + + frmSQL-Result.vb + frmSQLConfigAutoIndex.vb @@ -325,6 +338,7 @@ + MyApplicationCodeGenerator Application.Designer.vb @@ -525,6 +539,10 @@ + + + + diff --git a/Global_Indexer/ModuleCURRENT.vb b/Global_Indexer/ModuleCURRENT.vb index 0269934..3e2c985 100644 --- a/Global_Indexer/ModuleCURRENT.vb +++ b/Global_Indexer/ModuleCURRENT.vb @@ -1,4 +1,5 @@ Module ModuleCURRENT + Public ERROR_STATE As String Public START_INCOMPLETE As Boolean = False Public CURRENT_FILENAME As String Public CURRENT_NEWFILENAME As String @@ -14,6 +15,7 @@ Public FILE_DELIMITER As String Public CURRENT_MESSAGEID As String Public CURRENT_MESSAGEDATE As String + Public CURRENT_MESSAGESUBJECT As String Public CURRENT_ISATTACHMENT As Boolean = False Public CURRENT_USERID As Integer Public CURRENT_FOLDERWATCH As String = "" @@ -32,7 +34,12 @@ Public CURRENT_ABBRUCH As Integer = 0 Public MULTIINDEXING_ACTIVE As Boolean = False + Public ABORT_INDEXING As Boolean = False Public DTACTUAL_FILES As DataTable + Public DTEXCLUDE_FILES As DataTable + + Public CURRENT_SQLRESULT As String + Public DTSQL_RESULT As DataTable End Module diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 4b210ff..99660d5 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/Global_Indexer/My Project/Resources.Designer.vb b/Global_Indexer/My Project/Resources.Designer.vb index 066ccf4..1e4b346 100644 --- a/Global_Indexer/My Project/Resources.Designer.vb +++ b/Global_Indexer/My Project/Resources.Designer.vb @@ -70,6 +70,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property action_add_16xLG1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("action_add_16xLG1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property action_add_16xMD() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("action_add_16xMD", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -110,6 +130,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property arrow_previous_16xLG() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("arrow_previous_16xLG", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -370,6 +400,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property globe_handdrawn() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("globe_handdrawn", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/Global_Indexer/My Project/Resources.resx b/Global_Indexer/My Project/Resources.resx index ef61366..b88874d 100644 --- a/Global_Indexer/My Project/Resources.resx +++ b/Global_Indexer/My Project/Resources.resx @@ -139,6 +139,9 @@ ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_save1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -148,9 +151,15 @@ ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_previous_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\delete_12x12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\globe_handdrawn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,9 +178,6 @@ ..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -181,9 +187,6 @@ ..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Save_6530.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,18 +205,24 @@ ..\Resources\Einstellungen5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\bullet_arrow_top.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CheckOutforEdit_13187_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_save1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Shortcut_8169_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -247,13 +256,16 @@ ..\Resources\gear_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Shortcut_8169_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Save_6530.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Global_Indexer/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index 202b42c..3b78961 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -1608,7 +1608,6 @@ Partial Public Class MyDataset Me.columnLOGGED_WHERE.MaxLength = 50 Me.columnGI_ADMIN.AllowDBNull = false Me.columnGI_ADMIN.DefaultValue = CType(false,Boolean) - Me.columnADDED_WHO.AllowDBNull = false Me.columnADDED_WHO.MaxLength = 50 Me.columnCHANGED_WHO.MaxLength = 50 End Sub @@ -12245,7 +12244,11 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _ Public Property ADDED_WHO() As String Get - Return CType(Me(Me.tableTBDD_USER.ADDED_WHOColumn),String) + Try + Return CType(Me(Me.tableTBDD_USER.ADDED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHO in Tabelle TBDD_USER ist DBNull.", e) + End Try End Get Set Me(Me.tableTBDD_USER.ADDED_WHOColumn) = value @@ -12369,6 +12372,18 @@ Partial Public Class MyDataset Me(Me.tableTBDD_USER.LOG_OUT_WHENColumn) = Global.System.Convert.DBNull End Sub + _ + Public Function IsADDED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBDD_USER.ADDED_WHOColumn) + End Function + + _ + Public Sub SetADDED_WHONull() + Me(Me.tableTBDD_USER.ADDED_WHOColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function IsADDED_WHENNull() As Boolean @@ -19133,7 +19148,7 @@ Namespace MyDatasetTableAdapters End If Me.Adapter.InsertCommand.Parameters(4).Value = CType(GI_ADMIN,Boolean) If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") + Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value Else Me.Adapter.InsertCommand.Parameters(5).Value = CType(ADDED_WHO,String) End If diff --git a/Global_Indexer/MyDataset.xsc b/Global_Indexer/MyDataset.xsc index 12593e4..c904bdf 100644 --- a/Global_Indexer/MyDataset.xsc +++ b/Global_Indexer/MyDataset.xsc @@ -212,39 +212,29 @@ - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index 2e8d860..f993208 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -31,7 +31,7 @@ SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHE - + @@ -1699,7 +1699,7 @@ ORDER BY GUID DESC - + @@ -1742,7 +1742,7 @@ ORDER BY GUID DESC - + @@ -1761,7 +1761,7 @@ ORDER BY GUID DESC - + @@ -1837,7 +1837,7 @@ ORDER BY GUID DESC - + @@ -1874,7 +1874,7 @@ ORDER BY GUID DESC - + @@ -1888,7 +1888,7 @@ ORDER BY GUID DESC - + @@ -1902,7 +1902,7 @@ ORDER BY GUID DESC - + @@ -1980,7 +1980,7 @@ ORDER BY GUID DESC - + @@ -2053,7 +2053,7 @@ ORDER BY GUID DESC - + @@ -2165,7 +2165,7 @@ ORDER BY GUID DESC - + @@ -2261,7 +2261,7 @@ ORDER BY GUID DESC - + @@ -2316,7 +2316,7 @@ ORDER BY GUID DESC - + @@ -2324,7 +2324,7 @@ ORDER BY GUID DESC - + @@ -2374,7 +2374,7 @@ ORDER BY GUID DESC - + @@ -2446,7 +2446,7 @@ ORDER BY GUID DESC - + @@ -2527,7 +2527,7 @@ ORDER BY GUID DESC - + @@ -2541,7 +2541,7 @@ ORDER BY GUID DESC - + @@ -2550,7 +2550,7 @@ ORDER BY GUID DESC - + @@ -2580,7 +2580,7 @@ ORDER BY GUID DESC - + @@ -2605,7 +2605,7 @@ ORDER BY GUID DESC - + @@ -2644,7 +2644,7 @@ ORDER BY GUID DESC - + @@ -2676,7 +2676,7 @@ ORDER BY GUID DESC - + @@ -2748,7 +2748,7 @@ ORDER BY GUID DESC - + @@ -2787,7 +2787,7 @@ ORDER BY GUID DESC - + @@ -2801,7 +2801,7 @@ ORDER BY GUID DESC - + @@ -2847,7 +2847,7 @@ ORDER BY GUID DESC - + @@ -2907,7 +2907,7 @@ ORDER BY GUID DESC - + @@ -2939,7 +2939,7 @@ ORDER BY GUID DESC - + @@ -2977,7 +2977,7 @@ ORDER BY GUID DESC - + @@ -3108,21 +3108,21 @@ ORDER BY GUID DESC - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index 71383d3..d587ea0 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -135,6 +135,7 @@ Partial Class frmAdministration Me.ToolStripButton6 = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripButton7 = New System.Windows.Forms.ToolStripButton() + Me.ToolStripButton41 = New System.Windows.Forms.ToolStripButton() Me.GUIDTextBox1 = New System.Windows.Forms.TextBox() Me.XtraTabPage6 = New DevExpress.XtraTab.XtraTabPage() Me.VARIANTComboBox = New System.Windows.Forms.ComboBox() @@ -175,6 +176,7 @@ Partial Class frmAdministration Me.ToolStripButton30 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton31 = New System.Windows.Forms.ToolStripButton() Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage() + Me.btnAddWindowsVariable = New System.Windows.Forms.Button() Me.lblWindowParameter = New System.Windows.Forms.Label() Me.lbFileparameter = New System.Windows.Forms.ListBox() Me.ListBox6 = New System.Windows.Forms.ListBox() @@ -956,7 +958,7 @@ Partial Class frmAdministration ' GUIDLabel4.AutoSize = True GUIDLabel4.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - GUIDLabel4.Location = New System.Drawing.Point(3, 47) + GUIDLabel4.Location = New System.Drawing.Point(4, 60) GUIDLabel4.Name = "GUIDLabel4" GUIDLabel4.Size = New System.Drawing.Size(22, 15) GUIDLabel4.TabIndex = 4 @@ -965,7 +967,7 @@ Partial Class frmAdministration 'INDEXNAMELabel ' INDEXNAMELabel.AutoSize = True - INDEXNAMELabel.Location = New System.Drawing.Point(164, 47) + INDEXNAMELabel.Location = New System.Drawing.Point(164, 61) INDEXNAMELabel.Name = "INDEXNAMELabel" INDEXNAMELabel.Size = New System.Drawing.Size(68, 15) INDEXNAMELabel.TabIndex = 8 @@ -974,7 +976,7 @@ Partial Class frmAdministration 'COMMENTLabel1 ' COMMENTLabel1.AutoSize = True - COMMENTLabel1.Location = New System.Drawing.Point(164, 93) + COMMENTLabel1.Location = New System.Drawing.Point(163, 109) COMMENTLabel1.Name = "COMMENTLabel1" COMMENTLabel1.Size = New System.Drawing.Size(81, 15) COMMENTLabel1.TabIndex = 14 @@ -1191,10 +1193,10 @@ Partial Class frmAdministration ' 'StatusStrip1 ' - Me.StatusStrip1.Location = New System.Drawing.Point(0, 632) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 640) Me.StatusStrip1.Name = "StatusStrip1" Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0) - Me.StatusStrip1.Size = New System.Drawing.Size(1141, 22) + Me.StatusStrip1.Size = New System.Drawing.Size(1150, 22) Me.StatusStrip1.TabIndex = 0 Me.StatusStrip1.Text = "StatusStrip1" ' @@ -1210,7 +1212,7 @@ Partial Class frmAdministration Me.XtraTabControl1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.Size = New System.Drawing.Size(1141, 632) + Me.XtraTabControl1.Size = New System.Drawing.Size(1150, 640) Me.XtraTabControl1.TabIndex = 1 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2, Me.XtraTabPage5}) ' @@ -1265,7 +1267,7 @@ Partial Class frmAdministration Me.XtraTabPage1.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.XtraTabPage1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1135, 604) + Me.XtraTabPage1.Size = New System.Drawing.Size(1144, 612) Me.XtraTabPage1.Text = "Dokumentarten" ' 'SEQUENCENumericUpDown @@ -1331,7 +1333,7 @@ Partial Class frmAdministration Me.XtraTabControl2.Location = New System.Drawing.Point(266, 315) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3 - Me.XtraTabControl2.Size = New System.Drawing.Size(862, 281) + Me.XtraTabControl2.Size = New System.Drawing.Size(871, 289) Me.XtraTabControl2.TabIndex = 86 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage3, Me.XtraTabPage6, Me.XtraTabPage4, Me.XtraTabPage9, Me.XtraTabPage10}) ' @@ -1368,7 +1370,7 @@ Partial Class frmAdministration Me.XtraTabPage3.Controls.Add(GUIDLabel1) Me.XtraTabPage3.Controls.Add(Me.GUIDTextBox1) Me.XtraTabPage3.Name = "XtraTabPage3" - Me.XtraTabPage3.Size = New System.Drawing.Size(856, 253) + Me.XtraTabPage3.Size = New System.Drawing.Size(865, 261) Me.XtraTabPage3.Text = "manuelle Indexe" ' 'OPTIONALCheckBox @@ -1537,7 +1539,7 @@ Partial Class frmAdministration Me.NAMETextBox.Enabled = False Me.NAMETextBox.Location = New System.Drawing.Point(162, 48) Me.NAMETextBox.Name = "NAMETextBox" - Me.NAMETextBox.Size = New System.Drawing.Size(263, 23) + Me.NAMETextBox.Size = New System.Drawing.Size(272, 23) Me.NAMETextBox.TabIndex = 4 ' 'TBDD_INDEX_MANBindingNav @@ -1547,7 +1549,7 @@ Partial Class frmAdministration Me.TBDD_INDEX_MANBindingNav.CountItem = Me.ToolStripLabel1 Me.TBDD_INDEX_MANBindingNav.CountItemFormat = "von {0} manuellen Indexen" Me.TBDD_INDEX_MANBindingNav.DeleteItem = Me.ToolStripButton2 - Me.TBDD_INDEX_MANBindingNav.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton3, Me.ToolStripButton4, Me.ToolStripSeparator1, Me.ToolStripTextBox1, Me.ToolStripLabel1, Me.ToolStripSeparator2, Me.ToolStripButton5, Me.ToolStripButton6, Me.ToolStripSeparator3, Me.ToolStripButton1, Me.ToolStripButton2, Me.ToolStripButton7}) + Me.TBDD_INDEX_MANBindingNav.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton3, Me.ToolStripButton4, Me.ToolStripSeparator1, Me.ToolStripTextBox1, Me.ToolStripLabel1, Me.ToolStripSeparator2, Me.ToolStripButton5, Me.ToolStripButton6, Me.ToolStripSeparator3, Me.ToolStripButton1, Me.ToolStripButton2, Me.ToolStripButton7, Me.ToolStripButton41}) Me.TBDD_INDEX_MANBindingNav.Location = New System.Drawing.Point(0, 0) Me.TBDD_INDEX_MANBindingNav.MoveFirstItem = Me.ToolStripButton3 Me.TBDD_INDEX_MANBindingNav.MoveLastItem = Me.ToolStripButton6 @@ -1555,7 +1557,7 @@ Partial Class frmAdministration Me.TBDD_INDEX_MANBindingNav.MovePreviousItem = Me.ToolStripButton4 Me.TBDD_INDEX_MANBindingNav.Name = "TBDD_INDEX_MANBindingNav" Me.TBDD_INDEX_MANBindingNav.PositionItem = Me.ToolStripTextBox1 - Me.TBDD_INDEX_MANBindingNav.Size = New System.Drawing.Size(856, 25) + Me.TBDD_INDEX_MANBindingNav.Size = New System.Drawing.Size(865, 25) Me.TBDD_INDEX_MANBindingNav.TabIndex = 3 Me.TBDD_INDEX_MANBindingNav.Text = "BindingNavigator1" ' @@ -1654,6 +1656,15 @@ Partial Class frmAdministration Me.ToolStripButton7.Size = New System.Drawing.Size(23, 22) Me.ToolStripButton7.Text = "Daten speichern" ' + 'ToolStripButton41 + ' + Me.ToolStripButton41.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripButton41.Image = Global.Global_Indexer.My.Resources.Resources.refresh_16xLG + Me.ToolStripButton41.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton41.Name = "ToolStripButton41" + Me.ToolStripButton41.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton41.Text = "Refresh" + ' 'GUIDTextBox1 ' Me.GUIDTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "GUID", True)) @@ -1699,22 +1710,19 @@ Partial Class frmAdministration Me.XtraTabPage6.Controls.Add(Me.GUIDTextBox4) Me.XtraTabPage6.Controls.Add(Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingNavigator) Me.XtraTabPage6.Name = "XtraTabPage6" - Me.XtraTabPage6.Size = New System.Drawing.Size(856, 253) + Me.XtraTabPage6.Size = New System.Drawing.Size(865, 261) Me.XtraTabPage6.Text = "Nachbearbeitungsfunktionen manueller Index" ' 'VARIANTComboBox ' Me.VARIANTComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingSource, "VARIANT", True)) - Me.VARIANTComboBox.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingSource, "VARIANT", True)) - Me.VARIANTComboBox.DataSource = Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingSource - Me.VARIANTComboBox.DisplayMember = "VARIANT" Me.VARIANTComboBox.Enabled = False Me.VARIANTComboBox.FormattingEnabled = True + Me.VARIANTComboBox.Items.AddRange(New Object() {"ONLY FILE/FOLDER", "FILE AND INDEX"}) Me.VARIANTComboBox.Location = New System.Drawing.Point(559, 99) Me.VARIANTComboBox.Name = "VARIANTComboBox" Me.VARIANTComboBox.Size = New System.Drawing.Size(202, 23) Me.VARIANTComboBox.TabIndex = 81 - Me.VARIANTComboBox.ValueMember = "VARIANT" ' 'TBDD_INDEX_MAN_POSTPROCESSINGBindingSource ' @@ -1723,11 +1731,10 @@ Partial Class frmAdministration ' 'lblsavePostProcess ' - Me.lblsavePostProcess.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblsavePostProcess.AutoSize = True Me.lblsavePostProcess.BackColor = System.Drawing.Color.Yellow Me.lblsavePostProcess.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblsavePostProcess.Location = New System.Drawing.Point(384, 185) + Me.lblsavePostProcess.Location = New System.Drawing.Point(384, 191) Me.lblsavePostProcess.Name = "lblsavePostProcess" Me.lblsavePostProcess.Size = New System.Drawing.Size(213, 17) Me.lblsavePostProcess.TabIndex = 80 @@ -1791,7 +1798,7 @@ Partial Class frmAdministration 'Text1Label ' Me.Text1Label.AutoSize = True - Me.Text1Label.Location = New System.Drawing.Point(16, 81) + Me.Text1Label.Location = New System.Drawing.Point(13, 81) Me.Text1Label.Name = "Text1Label" Me.Text1Label.Size = New System.Drawing.Size(41, 15) Me.Text1Label.TabIndex = 29 @@ -1870,7 +1877,7 @@ Partial Class frmAdministration Me.TEXT1TextBox.Enabled = False Me.TEXT1TextBox.Location = New System.Drawing.Point(16, 99) Me.TEXT1TextBox.Name = "TEXT1TextBox" - Me.TEXT1TextBox.Size = New System.Drawing.Size(167, 23) + Me.TEXT1TextBox.Size = New System.Drawing.Size(165, 23) Me.TEXT1TextBox.TabIndex = 14 ' 'FUNCTION2TextBox @@ -1936,7 +1943,7 @@ Partial Class frmAdministration Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingNavigator.MovePreviousItem = Me.ToolStripButton27 Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingNavigator.Name = "TBDD_INDEX_MAN_POSTPROCESSINGBindingNavigator" Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingNavigator.PositionItem = Me.ToolStripTextBox4 - Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingNavigator.Size = New System.Drawing.Size(856, 25) + Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingNavigator.Size = New System.Drawing.Size(865, 25) Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingNavigator.TabIndex = 4 Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingNavigator.Text = "BindingNavigator1" ' @@ -2038,7 +2045,7 @@ Partial Class frmAdministration 'ToolStripButton31 ' Me.ToolStripButton31.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton31.Image = Global.Global_Indexer.My.Resources.Resources.arrow_refresh + Me.ToolStripButton31.Image = Global.Global_Indexer.My.Resources.Resources.refresh_16xLG Me.ToolStripButton31.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton31.Name = "ToolStripButton31" Me.ToolStripButton31.Size = New System.Drawing.Size(23, 22) @@ -2049,6 +2056,7 @@ Partial Class frmAdministration Me.XtraTabPage4.Appearance.Header.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical Me.XtraTabPage4.Appearance.HeaderActive.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical Me.XtraTabPage4.AutoScroll = True + Me.XtraTabPage4.Controls.Add(Me.btnAddWindowsVariable) Me.XtraTabPage4.Controls.Add(Me.lblWindowParameter) Me.XtraTabPage4.Controls.Add(Me.lbFileparameter) Me.XtraTabPage4.Controls.Add(Me.ListBox6) @@ -2077,13 +2085,22 @@ Partial Class frmAdministration Me.XtraTabPage4.Controls.Add(Me.INDEXNAME_AutoIndexTXT) Me.XtraTabPage4.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.XtraTabPage4.Name = "XtraTabPage4" - Me.XtraTabPage4.Size = New System.Drawing.Size(856, 253) + Me.XtraTabPage4.Size = New System.Drawing.Size(865, 261) Me.XtraTabPage4.Text = "automatische/feste Indexe" ' + 'btnAddWindowsVariable + ' + Me.btnAddWindowsVariable.Image = Global.Global_Indexer.My.Resources.Resources.arrow_previous_16xLG + Me.btnAddWindowsVariable.Location = New System.Drawing.Point(591, 78) + Me.btnAddWindowsVariable.Name = "btnAddWindowsVariable" + Me.btnAddWindowsVariable.Size = New System.Drawing.Size(31, 22) + Me.btnAddWindowsVariable.TabIndex = 89 + Me.btnAddWindowsVariable.UseVisualStyleBackColor = True + ' 'lblWindowParameter ' Me.lblWindowParameter.AutoSize = True - Me.lblWindowParameter.Location = New System.Drawing.Point(602, 47) + Me.lblWindowParameter.Location = New System.Drawing.Point(626, 60) Me.lblWindowParameter.Name = "lblWindowParameter" Me.lblWindowParameter.Size = New System.Drawing.Size(118, 15) Me.lblWindowParameter.TabIndex = 88 @@ -2095,9 +2112,9 @@ Partial Class frmAdministration Me.lbFileparameter.FormattingEnabled = True Me.lbFileparameter.ItemHeight = 15 Me.lbFileparameter.Items.AddRange(New Object() {"Dateiname (mit Endung)", "Dateiname (ohne Endung)", "Datei Erstelldatum", "Datei Erstellt wer", "Aktuelles Datum (DD.MM.YYYY)"}) - Me.lbFileparameter.Location = New System.Drawing.Point(602, 64) + Me.lbFileparameter.Location = New System.Drawing.Point(629, 78) Me.lbFileparameter.Name = "lbFileparameter" - Me.lbFileparameter.Size = New System.Drawing.Size(178, 109) + Me.lbFileparameter.Size = New System.Drawing.Size(188, 94) Me.lbFileparameter.TabIndex = 87 ' 'ListBox6 @@ -2107,9 +2124,9 @@ Partial Class frmAdministration Me.ListBox6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ListBox6.FormattingEnabled = True Me.ListBox6.ItemHeight = 15 - Me.ListBox6.Location = New System.Drawing.Point(6, 94) + Me.ListBox6.Location = New System.Drawing.Point(6, 109) Me.ListBox6.Name = "ListBox6" - Me.ListBox6.Size = New System.Drawing.Size(155, 154) + Me.ListBox6.Size = New System.Drawing.Size(155, 139) Me.ListBox6.TabIndex = 86 Me.ListBox6.ValueMember = "GUID" ' @@ -2121,18 +2138,18 @@ Partial Class frmAdministration 'lblValue ' Me.lblValue.AutoSize = True - Me.lblValue.Location = New System.Drawing.Point(374, 47) + Me.lblValue.Location = New System.Drawing.Point(374, 60) Me.lblValue.Name = "lblValue" - Me.lblValue.Size = New System.Drawing.Size(69, 15) + Me.lblValue.Size = New System.Drawing.Size(174, 15) Me.lblValue.TabIndex = 85 - Me.lblValue.Text = "Fester Wert:" + Me.lblValue.Text = "Fester oder Automatischer Wert:" ' 'INDEXNAME_AutoIndexCMB ' Me.INDEXNAME_AutoIndexCMB.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "INDEXNAME", True)) Me.INDEXNAME_AutoIndexCMB.Enabled = False Me.INDEXNAME_AutoIndexCMB.FormattingEnabled = True - Me.INDEXNAME_AutoIndexCMB.Location = New System.Drawing.Point(167, 63) + Me.INDEXNAME_AutoIndexCMB.Location = New System.Drawing.Point(167, 77) Me.INDEXNAME_AutoIndexCMB.Name = "INDEXNAME_AutoIndexCMB" Me.INDEXNAME_AutoIndexCMB.Size = New System.Drawing.Size(198, 23) Me.INDEXNAME_AutoIndexCMB.TabIndex = 84 @@ -2140,16 +2157,16 @@ Partial Class frmAdministration 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(3, 25) + Me.Label6.Location = New System.Drawing.Point(3, 26) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(603, 15) + Me.Label6.Size = New System.Drawing.Size(528, 30) Me.Label6.TabIndex = 83 - Me.Label6.Text = "Automatische Indexe werden nach den manuellen Indizes durchlaufen und ergänzen be" & _ - "i Bedarf den Dateinamen." + Me.Label6.Text = "Automatische Indexe werden nach den manuellen Indizes OHNE USERINTERAKTION durchl" & _ + "aufen." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung de" & _ + "r Datei genutzt werden." ' 'lblsaveAutoIndex ' - Me.lblsaveAutoIndex.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblsaveAutoIndex.AutoSize = True Me.lblsaveAutoIndex.BackColor = System.Drawing.Color.Yellow Me.lblsaveAutoIndex.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -2165,7 +2182,7 @@ Partial Class frmAdministration Me.btnSQLViewAuto.Enabled = False Me.btnSQLViewAuto.Image = Global.Global_Indexer.My.Resources.Resources.database_go Me.btnSQLViewAuto.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSQLViewAuto.Location = New System.Drawing.Point(377, 138) + Me.btnSQLViewAuto.Location = New System.Drawing.Point(377, 156) Me.btnSQLViewAuto.Name = "btnSQLViewAuto" Me.btnSQLViewAuto.Size = New System.Drawing.Size(148, 24) Me.btnSQLViewAuto.TabIndex = 81 @@ -2178,7 +2195,7 @@ Partial Class frmAdministration ' Me.SQL_ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_AUTOMBindingSource, "SQL_ACTIVE", True)) Me.SQL_ACTIVECheckBox.Enabled = False - Me.SQL_ACTIVECheckBox.Location = New System.Drawing.Point(167, 141) + Me.SQL_ACTIVECheckBox.Location = New System.Drawing.Point(167, 156) Me.SQL_ACTIVECheckBox.Name = "SQL_ACTIVECheckBox" Me.SQL_ACTIVECheckBox.Size = New System.Drawing.Size(198, 24) Me.SQL_ACTIVECheckBox.TabIndex = 29 @@ -2189,7 +2206,7 @@ Partial Class frmAdministration ' Me.GUIDAUTO_INDEXTextbox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "GUID", True)) Me.GUIDAUTO_INDEXTextbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GUIDAUTO_INDEXTextbox.Location = New System.Drawing.Point(6, 64) + Me.GUIDAUTO_INDEXTextbox.Location = New System.Drawing.Point(7, 77) Me.GUIDAUTO_INDEXTextbox.Name = "GUIDAUTO_INDEXTextbox" Me.GUIDAUTO_INDEXTextbox.ReadOnly = True Me.GUIDAUTO_INDEXTextbox.Size = New System.Drawing.Size(53, 23) @@ -2199,7 +2216,7 @@ Partial Class frmAdministration ' Me.VALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "VALUE", True)) Me.VALUETextBox.Enabled = False - Me.VALUETextBox.Location = New System.Drawing.Point(377, 63) + Me.VALUETextBox.Location = New System.Drawing.Point(377, 78) Me.VALUETextBox.Name = "VALUETextBox" Me.VALUETextBox.Size = New System.Drawing.Size(209, 23) Me.VALUETextBox.TabIndex = 11 @@ -2208,7 +2225,7 @@ Partial Class frmAdministration ' Me.COMMENTTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "COMMENT", True)) Me.COMMENTTextBox1.Enabled = False - Me.COMMENTTextBox1.Location = New System.Drawing.Point(167, 111) + Me.COMMENTTextBox1.Location = New System.Drawing.Point(166, 127) Me.COMMENTTextBox1.Name = "COMMENTTextBox1" Me.COMMENTTextBox1.Size = New System.Drawing.Size(419, 23) Me.COMMENTTextBox1.TabIndex = 15 @@ -2216,9 +2233,9 @@ Partial Class frmAdministration 'ACTIVECheckBox1 ' Me.ACTIVECheckBox1.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_AUTOMBindingSource, "ACTIVE", True)) - Me.ACTIVECheckBox1.Location = New System.Drawing.Point(786, 63) + Me.ACTIVECheckBox1.Location = New System.Drawing.Point(629, 26) Me.ACTIVECheckBox1.Name = "ACTIVECheckBox1" - Me.ACTIVECheckBox1.Size = New System.Drawing.Size(63, 24) + Me.ACTIVECheckBox1.Size = New System.Drawing.Size(59, 21) Me.ACTIVECheckBox1.TabIndex = 17 Me.ACTIVECheckBox1.Text = "Aktiv" Me.ACTIVECheckBox1.UseVisualStyleBackColor = True @@ -2279,7 +2296,7 @@ Partial Class frmAdministration Me.BindingNavigator2.MovePreviousItem = Me.ToolStripButton19 Me.BindingNavigator2.Name = "BindingNavigator2" Me.BindingNavigator2.PositionItem = Me.ToolStripTextBox3 - Me.BindingNavigator2.Size = New System.Drawing.Size(856, 25) + Me.BindingNavigator2.Size = New System.Drawing.Size(865, 25) Me.BindingNavigator2.TabIndex = 4 Me.BindingNavigator2.Text = "BindingNavigator1" ' @@ -2382,7 +2399,7 @@ Partial Class frmAdministration ' Me.INDEXNAME_AutoIndexTXT.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "INDEXNAME", True)) Me.INDEXNAME_AutoIndexTXT.Enabled = False - Me.INDEXNAME_AutoIndexTXT.Location = New System.Drawing.Point(167, 64) + Me.INDEXNAME_AutoIndexTXT.Location = New System.Drawing.Point(167, 78) Me.INDEXNAME_AutoIndexTXT.Name = "INDEXNAME_AutoIndexTXT" Me.INDEXNAME_AutoIndexTXT.Size = New System.Drawing.Size(198, 23) Me.INDEXNAME_AutoIndexTXT.TabIndex = 28 @@ -2394,7 +2411,7 @@ Partial Class frmAdministration Me.XtraTabPage9.Controls.Add(Me.Label8) Me.XtraTabPage9.Controls.Add(Me.ListBoxDokartzuordnung) Me.XtraTabPage9.Name = "XtraTabPage9" - Me.XtraTabPage9.Size = New System.Drawing.Size(856, 253) + Me.XtraTabPage9.Size = New System.Drawing.Size(865, 261) Me.XtraTabPage9.Text = "Zuordnung Dokumentenart-Gruppe" ' 'Button2 @@ -2427,7 +2444,6 @@ Partial Class frmAdministration ' 'lblnewDokartZuordnung ' - Me.lblnewDokartZuordnung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblnewDokartZuordnung.AutoSize = True Me.lblnewDokartZuordnung.BackColor = System.Drawing.Color.Yellow Me.lblnewDokartZuordnung.Font = New System.Drawing.Font("Segoe UI Semibold", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -2507,7 +2523,7 @@ Partial Class frmAdministration ' Me.XtraTabPage10.Controls.Add(Me.GroupBox4) Me.XtraTabPage10.Name = "XtraTabPage10" - Me.XtraTabPage10.Size = New System.Drawing.Size(856, 253) + Me.XtraTabPage10.Size = New System.Drawing.Size(865, 261) Me.XtraTabPage10.Text = "Create Folder for Index" ' 'GroupBox4 @@ -2734,7 +2750,7 @@ Partial Class frmAdministration Me.lblSaveDokart.AutoSize = True Me.lblSaveDokart.BackColor = System.Drawing.Color.Yellow Me.lblSaveDokart.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblSaveDokart.Location = New System.Drawing.Point(842, 231) + Me.lblSaveDokart.Location = New System.Drawing.Point(842, 234) Me.lblSaveDokart.Name = "lblSaveDokart" Me.lblSaveDokart.Size = New System.Drawing.Size(240, 17) Me.lblSaveDokart.TabIndex = 78 @@ -2798,7 +2814,7 @@ Partial Class frmAdministration Me.TBDD_DOKUMENTARTBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.TBDD_DOKUMENTARTBindingNavigator.Name = "TBDD_DOKUMENTARTBindingNavigator" Me.TBDD_DOKUMENTARTBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem - Me.TBDD_DOKUMENTARTBindingNavigator.Size = New System.Drawing.Size(1135, 25) + Me.TBDD_DOKUMENTARTBindingNavigator.Size = New System.Drawing.Size(1144, 25) Me.TBDD_DOKUMENTARTBindingNavigator.TabIndex = 2 Me.TBDD_DOKUMENTARTBindingNavigator.Text = "BindingNavigator1" ' @@ -3059,12 +3075,11 @@ Partial Class frmAdministration Me.XtraTabPage2.Controls.Add(Me.BindingNavigator1) Me.XtraTabPage2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1135, 604) + Me.XtraTabPage2.Size = New System.Drawing.Size(1144, 612) Me.XtraTabPage2.Text = "User-/Gruppenverwaltung" ' 'lblsaveUSer ' - Me.lblsaveUSer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblsaveUSer.AutoSize = True Me.lblsaveUSer.BackColor = System.Drawing.Color.Yellow Me.lblsaveUSer.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -3132,7 +3147,6 @@ Partial Class frmAdministration ' 'lblnewUserZuordnung ' - Me.lblnewUserZuordnung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblnewUserZuordnung.AutoSize = True Me.lblnewUserZuordnung.BackColor = System.Drawing.Color.Yellow Me.lblnewUserZuordnung.Font = New System.Drawing.Font("Segoe UI Semibold", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -3238,7 +3252,6 @@ Partial Class frmAdministration ' 'lblsaveTBDD_USER_GROUPS ' - Me.lblsaveTBDD_USER_GROUPS.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblsaveTBDD_USER_GROUPS.AutoSize = True Me.lblsaveTBDD_USER_GROUPS.BackColor = System.Drawing.Color.Yellow Me.lblsaveTBDD_USER_GROUPS.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -3606,7 +3619,7 @@ Partial Class frmAdministration Me.BindingNavigator1.MovePreviousItem = Me.ToolStripButton11 Me.BindingNavigator1.Name = "BindingNavigator1" Me.BindingNavigator1.PositionItem = Me.ToolStripTextBox2 - Me.BindingNavigator1.Size = New System.Drawing.Size(1135, 25) + Me.BindingNavigator1.Size = New System.Drawing.Size(1144, 25) Me.BindingNavigator1.TabIndex = 3 Me.BindingNavigator1.Text = "BindingNavigator1" ' @@ -3736,7 +3749,7 @@ Partial Class frmAdministration Me.XtraTabPage5.Controls.Add(Me.Button3) Me.XtraTabPage5.Controls.Add(Me.GroupBox1) Me.XtraTabPage5.Name = "XtraTabPage5" - Me.XtraTabPage5.Size = New System.Drawing.Size(1135, 604) + Me.XtraTabPage5.Size = New System.Drawing.Size(1144, 612) Me.XtraTabPage5.Text = "Andere Einstellungen" ' 'Button4 @@ -3831,11 +3844,10 @@ Partial Class frmAdministration ' 'lblsavezuordnungIndex ' - Me.lblsavezuordnungIndex.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblsavezuordnungIndex.AutoSize = True Me.lblsavezuordnungIndex.BackColor = System.Drawing.Color.Yellow Me.lblsavezuordnungIndex.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblsavezuordnungIndex.Location = New System.Drawing.Point(682, 105) + Me.lblsavezuordnungIndex.Location = New System.Drawing.Point(798, 172) Me.lblsavezuordnungIndex.Name = "lblsavezuordnungIndex" Me.lblsavezuordnungIndex.Size = New System.Drawing.Size(227, 17) Me.lblsavezuordnungIndex.TabIndex = 79 @@ -4095,7 +4107,7 @@ Partial Class frmAdministration ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1141, 654) + Me.ClientSize = New System.Drawing.Size(1150, 662) Me.Controls.Add(Me.XtraTabControl1) Me.Controls.Add(Me.StatusStrip1) Me.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -4464,4 +4476,6 @@ Partial Class frmAdministration Friend WithEvents lblWindowParameter As System.Windows.Forms.Label Friend WithEvents lbFileparameter As System.Windows.Forms.ListBox Friend WithEvents VARIANTComboBox As System.Windows.Forms.ComboBox + Friend WithEvents btnAddWindowsVariable As System.Windows.Forms.Button + Friend WithEvents ToolStripButton41 As System.Windows.Forms.ToolStripButton End Class diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index e72a2c6..15f0952 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -154,6 +154,10 @@ Private Sub TBDD_DOKUMENTARTBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBDD_DOKUMENTARTBindingSource.CurrentChanged lblSaveDokart.Visible = False + If DOKART_GUIDTextBox.Text <> String.Empty Then + CURRENT_DOKART_ID = DOKART_GUIDTextBox.Text + End If + End Sub Private Sub ToolStripComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ToolStripComboBox1.SelectedIndexChanged @@ -161,6 +165,7 @@ End Sub Private Sub TBDD_DOKUMENTARTBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_DOKUMENTARTBindingSource.AddingNew + Save_Dokumentart() MyDataset.TBDD_DOKUMENTART.ERSTELLTWERColumn.DefaultValue = Environment.UserName enableControls(XtraTabPage1) IsInsert = True @@ -263,6 +268,7 @@ If MyDataset.TBDD_INDEX_MAN.Rows.Count > 0 Then enableControls(XtraTabPage3) End If + lblSaveIndexMan.Visible = False Catch ex As System.Exception MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Load IndexeManuell: ") End Try @@ -287,6 +293,7 @@ If MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.Rows.Count > 0 Then enableControls(XtraTabPage6) End If + lblsavePostProcess.Visible = False Catch ex As System.Exception MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Load Postprocessing-Values: ") End Try @@ -306,6 +313,7 @@ End Sub Private Sub TBDD_INDEX_MANBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_INDEX_MANBindingSource.AddingNew Try + Save_Dokumentart() IsInsert = True MyDataset.TBDD_INDEX_MAN.ADDED_WHOColumn.DefaultValue = Environment.UserName MyDataset.TBDD_INDEX_MAN.DOK_IDColumn.DefaultValue = Me.DOKART_GUIDTextBox.Text @@ -539,6 +547,7 @@ Private Sub TBDD_INDEX_AUTOMBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_INDEX_AUTOMBindingSource.AddingNew Try + Save_Dokumentart() MyDataset.TBDD_INDEX_AUTOM.ADDED_WHOColumn.DefaultValue = Environment.UserName MyDataset.TBDD_INDEX_AUTOM.DOCTYPE_IDColumn.DefaultValue = Me.DOKART_GUIDTextBox.Text enableControls(XtraTabPage4) @@ -563,6 +572,7 @@ VALUETextBox.Text = "" lblWindowParameter.Visible = False lbFileparameter.Visible = False + Me.btnAddWindowsVariable.Visible = False Else Me.lblValue.Visible = True VALUETextBox.Visible = True @@ -570,6 +580,7 @@ btnSQLViewAuto.Visible = False lblWindowParameter.Visible = True lbFileparameter.Visible = True + Me.btnAddWindowsVariable.Visible = True End If If IsInsert = False Then Save_IndexAuto() @@ -628,8 +639,10 @@ Case "VBREPLACE" Me.Text1Label.Text = "Old Value:" Me.TEXT1TextBox.Visible = True + TEXT1TextBox.Width = 165 Me.Text2Label.Text = "New Value:" Me.TEXT2TextBox.Visible = True + Me.TEXT2TextBox.Width = 191 Me.Text3Label.Visible = False Me.TEXT3TextBox.Visible = False Me.FUNCTION1TextBox.Visible = False @@ -650,9 +663,10 @@ Me.TEXT1Label.Text = "Split-Zeichen:" Me.TEXT1TextBox.Visible = True - Me.Text2Label.Text = "Wähle Vorkommen: (Zahl) - Achtung Nullbasierend: Erstes Vorkommen = '0'" + TEXT1TextBox.Width = 50 + Me.Text2Label.Text = "Wähle Vorkommen: Achtung Nullbasierend - Erstes Vorkommen = '0'" Me.TEXT2TextBox.Visible = True - + Me.TEXT2TextBox.Width = 50 Me.TEXT3TextBox.Visible = False Me.Text3Label.Visible = False @@ -663,6 +677,7 @@ Case "REG. EXPRESSION" Me.Text1Label.Text = "Regulärer Ausdruck:" Me.TEXT1TextBox.Visible = True + TEXT1TextBox.Width = 537 Me.Text2Label.Visible = False Me.TEXT2TextBox.Visible = False Me.Text3Label.Visible = False @@ -701,7 +716,7 @@ End Sub Private Sub TBDD_INDEX_MAN_POSTPROCESSINGBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_INDEX_MAN_POSTPROCESSINGBindingSource.AddingNew - + Save_Dokumentart() enableControls(XtraTabPage6) MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.ADDED_WHOColumn.DefaultValue = Environment.UserName MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.SEQUENCEColumn.DefaultValue = 1 @@ -946,8 +961,7 @@ Try Dim copy = "exec PRDD_COPY_DOKPROFILE " & DOKART_GUIDTextBox.Text & ", 1" If ClassDatabase.Execute_non_Query(copy, True) Then - MsgBox("Die Dokumentart wurde erfolgreich kopiert und auf INAKTIV gesetzt." & vbNewLine & "Bitte beachten Sie:" & vbNewLine & "- Die manuelle Nachbearbeitung wurde nicht kopiert." _ - & vbNewLine & "- Die Dokumentart wurde keiner Usergruppe zugeordnet.", MsgBoxStyle.Information) + MsgBox("Die Dokumentart wurde erfolgreich kopiert und auf INAKTIV gesetzt." & vbNewLine & "Bitte beachten Sie:" & vbNewLine & "- Die Dokumentart wurde keiner Usergruppe zugeordnet.", MsgBoxStyle.Information) Dim str = "Global-Indexer Dokarten" If ToolStripComboBox1.Text <> "" Then str = ToolStripComboBox1.Text @@ -968,8 +982,12 @@ Private Sub XtraTabControl2_SelectedPageChanging(sender As Object, e As DevExpress.XtraTab.TabPageChangingEventArgs) Handles XtraTabControl2.SelectedPageChanging Save_Dokumentart() End Sub + Private Sub TBDD_USERBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_USERBindingSource.AddingNew + MyDataset.TBDD_USER.ADDED_WHOColumn.DefaultValue = Environment.UserName + enableControls(XtraTabPage2) + End Sub - Private Sub lblFileparameter_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lbFileparameter.SelectedIndexChanged + Private Sub btnAddWindowsVariable_Click(sender As Object, e As EventArgs) Handles btnAddWindowsVariable.Click If Not lbFileparameter.SelectedItem Is Nothing Then If GUIDAUTO_INDEXTextbox.Text <> "" Then Dim value As String @@ -995,7 +1013,11 @@ End If End Sub - Private Sub TBDD_USERBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_USERBindingSource.AddingNew - enableControls(XtraTabPage2) + Private Sub VARIANTComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles VARIANTComboBox.SelectedIndexChanged + + End Sub + + Private Sub ToolStripButton41_Click(sender As Object, e As EventArgs) Handles ToolStripButton41.Click + Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmConfig_Basic.designer.vb b/Global_Indexer/frmConfig_Basic.designer.vb index 690745e..01aa872 100644 --- a/Global_Indexer/frmConfig_Basic.designer.vb +++ b/Global_Indexer/frmConfig_Basic.designer.vb @@ -22,6 +22,7 @@ Partial Class frmConfig_Basic 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic)) Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() @@ -38,13 +39,18 @@ Partial Class frmConfig_Basic Me.txtPasswort = New System.Windows.Forms.TextBox() Me.BtnConnect = New System.Windows.Forms.Button() Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.CheckBox3 = New System.Windows.Forms.CheckBox() + Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.btnApplicationFolder = New System.Windows.Forms.Button() Me.btnopenlog = New System.Windows.Forms.Button() - Me.CheckBox1 = New System.Windows.Forms.CheckBox() + Me.chkLogErrorsOnly = New System.Windows.Forms.CheckBox() Me.Button1 = New System.Windows.Forms.Button() Me.txtuniversalViewer = New System.Windows.Forms.TextBox() Me.lblUniversalViewer = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.Label8 = New System.Windows.Forms.Label() + Me.btnSaveExclusionFiles = New System.Windows.Forms.Button() + Me.DataGridView1 = New System.Windows.Forms.DataGridView() Me.Button2 = New System.Windows.Forms.Button() Me.txtScanFolderWatch = New System.Windows.Forms.TextBox() Me.Label7 = New System.Windows.Forms.Label() @@ -56,12 +62,11 @@ Partial Class frmConfig_Basic Me.btnstartstop2 = New System.Windows.Forms.Button() Me.btnstartstop1 = New System.Windows.Forms.Button() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() - Me.CheckBox3 = New System.Windows.Forms.CheckBox() - Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() Me.TabPage3.SuspendLayout() + CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TabControl1 @@ -73,7 +78,7 @@ Partial Class frmConfig_Basic Me.TabControl1.Location = New System.Drawing.Point(0, 0) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(695, 261) + Me.TabControl1.Size = New System.Drawing.Size(695, 358) Me.TabControl1.TabIndex = 0 ' 'TabPage1 @@ -93,7 +98,7 @@ Partial Class frmConfig_Basic Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(687, 235) + Me.TabPage1.Size = New System.Drawing.Size(687, 332) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Datenbank-Verbindung" Me.TabPage1.UseVisualStyleBackColor = True @@ -215,18 +220,43 @@ Partial Class frmConfig_Basic Me.TabPage2.Controls.Add(Me.CheckBox2) Me.TabPage2.Controls.Add(Me.btnApplicationFolder) Me.TabPage2.Controls.Add(Me.btnopenlog) - Me.TabPage2.Controls.Add(Me.CheckBox1) + Me.TabPage2.Controls.Add(Me.chkLogErrorsOnly) Me.TabPage2.Controls.Add(Me.Button1) Me.TabPage2.Controls.Add(Me.txtuniversalViewer) Me.TabPage2.Controls.Add(Me.lblUniversalViewer) Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(687, 235) + Me.TabPage2.Size = New System.Drawing.Size(687, 332) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Diverse Einstellungen" Me.TabPage2.UseVisualStyleBackColor = True ' + 'CheckBox3 + ' + Me.CheckBox3.AutoSize = True + Me.CheckBox3.Checked = Global.Global_Indexer.My.MySettings.Default.DoNot_Show_Documents + Me.CheckBox3.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.Global_Indexer.My.MySettings.Default, "DoNot_Show_Documents", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.CheckBox3.Location = New System.Drawing.Point(11, 56) + Me.CheckBox3.Name = "CheckBox3" + Me.CheckBox3.Size = New System.Drawing.Size(249, 17) + Me.CheckBox3.TabIndex = 7 + Me.CheckBox3.Text = "Dokumente bei Indexierung nicht anzeigen" + Me.CheckBox3.UseVisualStyleBackColor = True + ' + 'CheckBox2 + ' + Me.CheckBox2.AutoSize = True + Me.CheckBox2.Checked = Global.Global_Indexer.My.MySettings.Default.Show_IndexResult + Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked + Me.CheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.Global_Indexer.My.MySettings.Default, "Show_IndexResult", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.CheckBox2.Location = New System.Drawing.Point(241, 96) + Me.CheckBox2.Name = "CheckBox2" + Me.CheckBox2.Size = New System.Drawing.Size(231, 17) + Me.CheckBox2.TabIndex = 6 + Me.CheckBox2.Text = "Meldungsfenster nach Erfolg anzeigen?" + Me.CheckBox2.UseVisualStyleBackColor = True + ' 'btnApplicationFolder ' Me.btnApplicationFolder.Image = Global.Global_Indexer.My.Resources.Resources.folder_go @@ -251,15 +281,15 @@ Partial Class frmConfig_Basic Me.btnopenlog.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnopenlog.UseVisualStyleBackColor = True ' - 'CheckBox1 + 'chkLogErrorsOnly ' - Me.CheckBox1.AutoSize = True - Me.CheckBox1.Location = New System.Drawing.Point(11, 96) - Me.CheckBox1.Name = "CheckBox1" - Me.CheckBox1.Size = New System.Drawing.Size(99, 17) - Me.CheckBox1.TabIndex = 3 - Me.CheckBox1.Text = "LogErrorsOnly" - Me.CheckBox1.UseVisualStyleBackColor = True + Me.chkLogErrorsOnly.AutoSize = True + Me.chkLogErrorsOnly.Location = New System.Drawing.Point(11, 96) + Me.chkLogErrorsOnly.Name = "chkLogErrorsOnly" + Me.chkLogErrorsOnly.Size = New System.Drawing.Size(99, 17) + Me.chkLogErrorsOnly.TabIndex = 3 + Me.chkLogErrorsOnly.Text = "LogErrorsOnly" + Me.chkLogErrorsOnly.UseVisualStyleBackColor = True ' 'Button1 ' @@ -288,6 +318,9 @@ Partial Class frmConfig_Basic ' 'TabPage3 ' + Me.TabPage3.Controls.Add(Me.Label8) + Me.TabPage3.Controls.Add(Me.btnSaveExclusionFiles) + Me.TabPage3.Controls.Add(Me.DataGridView1) Me.TabPage3.Controls.Add(Me.Button2) Me.TabPage3.Controls.Add(Me.txtScanFolderWatch) Me.TabPage3.Controls.Add(Me.Label7) @@ -301,11 +334,45 @@ Partial Class frmConfig_Basic Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(687, 235) + Me.TabPage3.Size = New System.Drawing.Size(687, 332) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Überwachte Ordner - Folderwatch" Me.TabPage3.UseVisualStyleBackColor = True ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Location = New System.Drawing.Point(8, 197) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(611, 13) + Me.Label8.TabIndex = 13 + Me.Label8.Text = "Definieren Sie hier Inhalte von Dateinamen welche von der Folderwatch-Überwachung" & _ + " ausgenommen werden sollen:" + ' + 'btnSaveExclusionFiles + ' + Me.btnSaveExclusionFiles.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG + Me.btnSaveExclusionFiles.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnSaveExclusionFiles.Location = New System.Drawing.Point(209, 213) + Me.btnSaveExclusionFiles.Name = "btnSaveExclusionFiles" + Me.btnSaveExclusionFiles.Size = New System.Drawing.Size(94, 29) + Me.btnSaveExclusionFiles.TabIndex = 12 + Me.btnSaveExclusionFiles.Text = "Speichern" + Me.btnSaveExclusionFiles.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnSaveExclusionFiles.UseVisualStyleBackColor = True + ' + 'DataGridView1 + ' + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.DataGridView1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.DataGridView1.Location = New System.Drawing.Point(11, 213) + Me.DataGridView1.Name = "DataGridView1" + Me.DataGridView1.Size = New System.Drawing.Size(192, 113) + Me.DataGridView1.TabIndex = 11 + ' 'Button2 ' Me.Button2.Location = New System.Drawing.Point(616, 142) @@ -406,36 +473,11 @@ Partial Class frmConfig_Basic ' Me.OpenFileDialog1.FileName = "OpenFileDialog1" ' - 'CheckBox3 - ' - Me.CheckBox3.AutoSize = True - Me.CheckBox3.Checked = Global.Global_Indexer.My.MySettings.Default.DoNot_Show_Documents - Me.CheckBox3.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.Global_Indexer.My.MySettings.Default, "DoNot_Show_Documents", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.CheckBox3.Location = New System.Drawing.Point(11, 56) - Me.CheckBox3.Name = "CheckBox3" - Me.CheckBox3.Size = New System.Drawing.Size(249, 17) - Me.CheckBox3.TabIndex = 7 - Me.CheckBox3.Text = "Dokumente bei Indexierung nicht anzeigen" - Me.CheckBox3.UseVisualStyleBackColor = True - ' - 'CheckBox2 - ' - Me.CheckBox2.AutoSize = True - Me.CheckBox2.Checked = Global.Global_Indexer.My.MySettings.Default.Show_IndexResult - Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.Global_Indexer.My.MySettings.Default, "Show_IndexResult", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.CheckBox2.Location = New System.Drawing.Point(241, 96) - Me.CheckBox2.Name = "CheckBox2" - Me.CheckBox2.Size = New System.Drawing.Size(231, 17) - Me.CheckBox2.TabIndex = 6 - Me.CheckBox2.Text = "Meldungsfenster nach Erfolg anzeigen?" - Me.CheckBox2.UseVisualStyleBackColor = True - ' 'frmConfig_Basic ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(695, 261) + Me.ClientSize = New System.Drawing.Size(695, 358) Me.Controls.Add(Me.TabControl1) Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -451,6 +493,7 @@ Partial Class frmConfig_Basic Me.TabPage2.PerformLayout() Me.TabPage3.ResumeLayout(False) Me.TabPage3.PerformLayout() + CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -480,7 +523,7 @@ Partial Class frmConfig_Basic Friend WithEvents btnFW_Desktop As System.Windows.Forms.Button Friend WithEvents btnstartstop1 As System.Windows.Forms.Button Friend WithEvents btnsetFW_Folder As System.Windows.Forms.Button - Friend WithEvents CheckBox1 As System.Windows.Forms.CheckBox + Friend WithEvents chkLogErrorsOnly As System.Windows.Forms.CheckBox Friend WithEvents btnopenlog As System.Windows.Forms.Button Friend WithEvents btnApplicationFolder As System.Windows.Forms.Button Friend WithEvents CheckBox2 As System.Windows.Forms.CheckBox @@ -489,4 +532,7 @@ Partial Class frmConfig_Basic Friend WithEvents Label7 As System.Windows.Forms.Label Friend WithEvents btnstartstop2 As System.Windows.Forms.Button Friend WithEvents CheckBox3 As System.Windows.Forms.CheckBox + Friend WithEvents DataGridView1 As System.Windows.Forms.DataGridView + Friend WithEvents btnSaveExclusionFiles As System.Windows.Forms.Button + Friend WithEvents Label8 As System.Windows.Forms.Label End Class diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index 4cff7d1..9ae66e7 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -82,21 +82,7 @@ Public Class frmConfig_Basic End Sub Private Sub frmConfig_Basic_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If Not MyConnectionString = String.Empty Then - Dim csb As New SqlClient.SqlConnectionStringBuilder - csb.ConnectionString = MyConnectionString - - Dim constr = MyConnectionString - constr = constr.Replace(csb.Password, "XXXXX") - Me.txtActualConnection.Text = constr - Me.txtuniversalViewer.Text = UniversalViewer - - 'Me.txtActualConnection.Text = MyConnectionString - CheckBox1.Checked = LogErrorsOnly - End If - If UniversalViewer = String.Empty Then - Me.TabControl1.SelectedIndex = 1 - End If + End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click @@ -116,10 +102,11 @@ Public Class frmConfig_Basic Private Sub Label6_Click(sender As Object, e As EventArgs) Handles Label6.Click End Sub - + Dim reload As Boolean = False Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged Select Case TabControl1.SelectedIndex Case 2 + reload = True Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & CURRENT_USERID, MyConnectionString) If Not folderwatch Is Nothing Then CURRENT_FOLDERWATCH = folderwatch @@ -157,7 +144,8 @@ Public Class frmConfig_Basic btnstartstop2.Text = "Überwachung starten" btnstartstop2.Image = My.Resources.bell_go End If - + reload = False + Me.DataGridView1.DataSource = DTEXCLUDE_FILES End Select End Sub @@ -167,9 +155,17 @@ Public Class frmConfig_Basic End Sub Sub CheckFolder(mypath As String, FOLDER_TYPE As String) Try - If (Not System.IO.Directory.Exists(mypath)) Then - System.IO.Directory.CreateDirectory(mypath) - End If + Try + If (Not System.IO.Directory.Exists(mypath)) Then + System.IO.Directory.CreateDirectory(mypath) + End If + Catch ex As Exception + ClassLogger.Add(" >> Fehler beim Erstellen des Folderwatchordners: " & mypath, False) + ClassLogger.Add(" >> " & ex.Message, False) + MsgBox("Fehler beim Erstellen des Folderwatchordners: " & mypath & vbNewLine & "Bitte überprüfen Sie die Rechte!" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + Exit Sub + End Try + Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & CURRENT_USERID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'", MyConnectionString) Dim sql As String If folderwatch Is Nothing Then @@ -183,16 +179,17 @@ Public Class frmConfig_Basic If FOLDER_TYPE = "SCAN" Then CURRENT_SCAN_FOLDERWATCH = folderwatch Me.txtScanFolderWatch.Text = CURRENT_SCAN_FOLDERWATCH - Else CURRENT_FOLDERWATCH = folderwatch Me.txtFolderWatch.Text = CURRENT_FOLDERWATCH End If - End If If FW_started = True And FOLDER_TYPE = "DEFAULT" Then ClassFolderWatcher.Restart_FolderWatch() End If + If FWSCAN_started = True And FOLDER_TYPE = "SCAN" Then + ClassFolderWatcher.Restart_FolderWatchSCAN() + End If Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in CheckFolder:") End Try @@ -239,16 +236,33 @@ Public Class frmConfig_Basic End If End Sub - Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.CheckedChanged + Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles chkLogErrorsOnly.CheckedChanged If formloaded = True Then - SaveConfigValue("LogErrorsOnly", CheckBox1.Checked) - ClassLogger.Add(" >> LogErrorsOnly auf '" & CheckBox1.Checked & "' umgestellt", False) - LogErrorsOnly = CheckBox1.Checked + SaveConfigValue("LogErrorsOnly", chkLogErrorsOnly.Checked) + ClassLogger.Add(" >> LogErrorsOnly auf '" & chkLogErrorsOnly.Checked & "' umgestellt", False) + LogErrorsOnly = chkLogErrorsOnly.Checked End If End Sub Private Sub frmConfig_Basic_Shown(sender As Object, e As EventArgs) Handles Me.Shown + If Not MyConnectionString = String.Empty Then + Dim csb As New SqlClient.SqlConnectionStringBuilder + csb.ConnectionString = MyConnectionString + + Dim constr = MyConnectionString + constr = constr.Replace(csb.Password, "XXXXX") + Me.txtActualConnection.Text = constr + End If + Me.txtuniversalViewer.Text = UniversalViewer + chkLogErrorsOnly.Checked = LogErrorsOnly + + If ERROR_STATE = "FAILED CONNECTION" Then + Me.TabControl1.SelectedIndex = 0 + ElseIf ERROR_STATE = "NO UV" Then + Me.TabControl1.SelectedIndex = 1 + End If formloaded = True + End Sub Private Sub btnopenlog_Click(sender As Object, e As EventArgs) Handles btnopenlog.Click Process.Start(ClassLogger.DateiSpeicherort) @@ -269,7 +283,7 @@ Public Class frmConfig_Basic End Sub Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnstartstop2.Click - If CURRENT_FOLDERWATCH <> "" Then + If CURRENT_SCAN_FOLDERWATCH <> "" Then CheckFWSCAN_State() End If End Sub @@ -277,4 +291,20 @@ Public Class frmConfig_Basic Private Sub CheckBox3_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox3.CheckedChanged My.Settings.Save() End Sub + + Private Sub txtScanFolderWatch_TextChanged(sender As Object, e As EventArgs) Handles txtScanFolderWatch.TextChanged + If reload = True Then Exit Sub + CheckFolder(txtScanFolderWatch.Text, "SCAN") + End Sub + + Private Sub txtFolderWatch_TextChanged(sender As Object, e As EventArgs) Handles txtFolderWatch.TextChanged + If reload = True Then Exit Sub + CheckFolder(txtFolderWatch.Text, "DEFAULT") + End Sub + + Private Sub btnSaveExclusionFiles_Click(sender As Object, e As EventArgs) Handles btnSaveExclusionFiles.Click + DTEXCLUDE_FILES.AcceptChanges() + DTEXCLUDE_FILES.WriteXml(PATH_FileExclusions) + MsgBox("Änderungen gespeichert!", MsgBoxStyle.Information) + End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmConnections.Designer.vb b/Global_Indexer/frmConnections.Designer.vb index eff23ac..c5ef429 100644 --- a/Global_Indexer/frmConnections.Designer.vb +++ b/Global_Indexer/frmConnections.Designer.vb @@ -127,7 +127,7 @@ Partial Class frmConnections 'ERSTELLTWERLabel ' ERSTELLTWERLabel.AutoSize = True - ERSTELLTWERLabel.Location = New System.Drawing.Point(186, 227) + ERSTELLTWERLabel.Location = New System.Drawing.Point(185, 251) ERSTELLTWERLabel.Name = "ERSTELLTWERLabel" ERSTELLTWERLabel.Size = New System.Drawing.Size(67, 13) ERSTELLTWERLabel.TabIndex = 19 @@ -136,7 +136,7 @@ Partial Class frmConnections 'ERSTELLTWANNLabel ' ERSTELLTWANNLabel.AutoSize = True - ERSTELLTWANNLabel.Location = New System.Drawing.Point(185, 268) + ERSTELLTWANNLabel.Location = New System.Drawing.Point(333, 251) ERSTELLTWANNLabel.Name = "ERSTELLTWANNLabel" ERSTELLTWANNLabel.Size = New System.Drawing.Size(77, 13) ERSTELLTWANNLabel.TabIndex = 21 @@ -145,7 +145,7 @@ Partial Class frmConnections 'GEANDERTWERLabel ' GEANDERTWERLabel.AutoSize = True - GEANDERTWERLabel.Location = New System.Drawing.Point(337, 227) + GEANDERTWERLabel.Location = New System.Drawing.Point(484, 251) GEANDERTWERLabel.Name = "GEANDERTWERLabel" GEANDERTWERLabel.Size = New System.Drawing.Size(80, 13) GEANDERTWERLabel.TabIndex = 23 @@ -154,7 +154,7 @@ Partial Class frmConnections 'GEAENDERTWANNLabel ' GEAENDERTWANNLabel.AutoSize = True - GEAENDERTWANNLabel.Location = New System.Drawing.Point(337, 268) + GEAENDERTWANNLabel.Location = New System.Drawing.Point(624, 251) GEAENDERTWANNLabel.Name = "GEAENDERTWANNLabel" GEAENDERTWANNLabel.Size = New System.Drawing.Size(90, 13) GEAENDERTWANNLabel.TabIndex = 25 @@ -188,6 +188,11 @@ Partial Class frmConnections Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBGI_CONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter = Nothing + Me.TableAdapterManager.TBHOTKEY_PATTERNS_REWORKTableAdapter = Nothing + Me.TableAdapterManager.TBHOTKEY_PATTERNSTableAdapter = Nothing + Me.TableAdapterManager.TBHOTKEY_PROFILETableAdapter = Nothing + Me.TableAdapterManager.TBHOTKEY_USER_PROFILETableAdapter = Nothing + Me.TableAdapterManager.TBHOTKEY_WINDOW_HOOKTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = Global_Indexer.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBDD_CONNECTIONBindingNavigator @@ -380,7 +385,7 @@ Partial Class frmConnections 'ERSTELLTWERTextBox ' Me.ERSTELLTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "ERSTELLTWER", True)) - Me.ERSTELLTWERTextBox.Location = New System.Drawing.Point(189, 243) + Me.ERSTELLTWERTextBox.Location = New System.Drawing.Point(188, 267) Me.ERSTELLTWERTextBox.Name = "ERSTELLTWERTextBox" Me.ERSTELLTWERTextBox.Size = New System.Drawing.Size(144, 22) Me.ERSTELLTWERTextBox.TabIndex = 20 @@ -388,7 +393,7 @@ Partial Class frmConnections 'ERSTELLTWANNTextBox ' Me.ERSTELLTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "ERSTELLTWANN", True)) - Me.ERSTELLTWANNTextBox.Location = New System.Drawing.Point(189, 284) + Me.ERSTELLTWANNTextBox.Location = New System.Drawing.Point(337, 267) Me.ERSTELLTWANNTextBox.Name = "ERSTELLTWANNTextBox" Me.ERSTELLTWANNTextBox.Size = New System.Drawing.Size(144, 22) Me.ERSTELLTWANNTextBox.TabIndex = 22 @@ -396,7 +401,7 @@ Partial Class frmConnections 'GEANDERTWERTextBox ' Me.GEANDERTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GEANDERTWER", True)) - Me.GEANDERTWERTextBox.Location = New System.Drawing.Point(340, 243) + Me.GEANDERTWERTextBox.Location = New System.Drawing.Point(487, 267) Me.GEANDERTWERTextBox.Name = "GEANDERTWERTextBox" Me.GEANDERTWERTextBox.Size = New System.Drawing.Size(134, 22) Me.GEANDERTWERTextBox.TabIndex = 24 @@ -404,7 +409,7 @@ Partial Class frmConnections 'GEAENDERTWANNTextBox ' Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GEAENDERTWANN", True)) - Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(340, 284) + Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(627, 267) Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox" Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(134, 22) Me.GEAENDERTWANNTextBox.TabIndex = 26 @@ -426,7 +431,7 @@ Partial Class frmConnections Me.ListBox1.FormattingEnabled = True Me.ListBox1.Location = New System.Drawing.Point(0, 22) Me.ListBox1.Name = "ListBox1" - Me.ListBox1.Size = New System.Drawing.Size(161, 290) + Me.ListBox1.Size = New System.Drawing.Size(161, 264) Me.ListBox1.TabIndex = 28 Me.ListBox1.ValueMember = "GUID" ' @@ -527,11 +532,10 @@ Partial Class frmConnections ' 'lblSave ' - Me.lblSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblSave.AutoSize = True Me.lblSave.BackColor = System.Drawing.Color.Yellow Me.lblSave.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblSave.Location = New System.Drawing.Point(557, 41) + Me.lblSave.Location = New System.Drawing.Point(484, 229) Me.lblSave.Name = "lblSave" Me.lblSave.Size = New System.Drawing.Size(228, 17) Me.lblSave.TabIndex = 79 @@ -542,7 +546,7 @@ Partial Class frmConnections ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(827, 326) + Me.ClientSize = New System.Drawing.Size(827, 300) Me.Controls.Add(Me.lblSave) Me.Controls.Add(Me.chkOR_ohne_TNS) Me.Controls.Add(Me.btnCheck_Con) diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 40993cd..a843836 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -344,16 +344,16 @@ Public Class frmIndex For Each DR In DT.Rows If DR.Item("INDEXNAME").ToString.ToLower = indexname.ToLower Then If DR.Item("Indexiert") = True Then - If LogErrorsOnly = False Then ClassLogger.Add(" ...Manueller Index: " & indexname, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>Manueller Index: " & indexname, False) Select Case RequestFor Case "FILE" If DR.Item("Indexwert_File").ToString <> String.Empty Then - If LogErrorsOnly = False Then ClassLogger.Add(" ...Es liegt ein separater nachbearbeiteter Wert für die Dateibenennung vor: " & DR.Item("Indexwert_File").ToString, False) - If LogErrorsOnly = False Then ClassLogger.Add(" ...Zurückgegebener NachbearbeitungsWert: " & DR.Item("Indexwert_File"), False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>Es liegt ein separater nachbearbeiteter Wert für die Dateibenennung vor: " & DR.Item("Indexwert_File").ToString, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>Zurückgegebener NachbearbeitungsWert: " & DR.Item("Indexwert_File"), False) Return DR.Item("Indexwert_File") Else If DR.Item("Indexwert").ToString <> String.Empty Then - If LogErrorsOnly = False Then ClassLogger.Add(" ...Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"), False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"), False) Console.WriteLine("Rückgabe manueller wert: " & DR.Item("Indexwert")) Return DR.Item("Indexwert") Else @@ -367,7 +367,7 @@ Public Class frmIndex End If Case Else If DR.Item("Indexwert").ToString <> String.Empty Then - If LogErrorsOnly = False Then ClassLogger.Add(" ...Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"), False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"), False) Return DR.Item("Indexwert") Else Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & indexname & "')", MyConnectionString, True) @@ -433,7 +433,7 @@ Public Class frmIndex End If If LogErrorsOnly = False Then - ClassLogger.Add(" ...SQL-ConnectionString: " & connectionString.Substring(0, connectionString.LastIndexOf("=")), False) + ClassLogger.Add(" >>SQL-ConnectionString: " & connectionString.Substring(0, connectionString.LastIndexOf("=")), False) End If If ergebnis Is Nothing Then @@ -489,7 +489,7 @@ Public Class frmIndex End If Else runinLZ = True - If LogErrorsOnly = False Then ClassLogger.Add(" ...sql enthält Platzhalter und wird erst während der Laufzeit gefüllt!", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>sql enthält Platzhalter und wird erst während der Laufzeit gefüllt!", False) End If @@ -673,7 +673,7 @@ Public Class frmIndex Function CheckWrite_IndexeMan(dokartid As Integer) '#### Zuerst manuelle Werte indexieren #### Try - If LogErrorsOnly = False Then ClassLogger.Add(" ...In CheckWrite_IndexeMan", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>In CheckWrite_IndexeMan", False) Dim result As Boolean = False For Each ctrl As Control In Me.pnlIndex.Controls ' ' MsgBox(ctrl.Name) @@ -859,7 +859,7 @@ Public Class frmIndex Select Case element.Value.Substring(2, 1).ToUpper 'Manueller Indexwert Case "M" - If LogErrorsOnly = False Then ClassLogger.Add(" ...Manueller Index wird geprüft...", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>Manueller Index wird geprüft...", False) Dim Indexname = element.Value.Substring(3, element.Value.Length - 4) Dim value As String = GetManIndex_Value(element.Value.Substring(3, element.Value.Length - 4), "FILE") If value <> String.Empty Then @@ -1012,7 +1012,7 @@ Public Class frmIndex - If LogErrorsOnly = False Then ClassLogger.Add(" ...Manueller Indexvalue: " & idxvalue.ToString, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Manueller Indexvalue: " & idxvalue.ToString, False) Count += 1 indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, idxvalue) If indexierung_erfolgreich = False Then @@ -1032,8 +1032,8 @@ Public Class frmIndex If CBool(row.Item("Indexiert")) = True And row.Item("Indexwert").ToString <> "" Then Dim indexname = row.Item("INDEXNAME").ToString Dim idxvalue = row.Item("Indexwert") - If LogErrorsOnly = False Then ClassLogger.Add(" ...Auto Indexvalue: " & idxvalue.ToString, False) - If LogErrorsOnly = False Then ClassLogger.Add(" ...Indexvalue: " & idxvalue.ToString, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Auto Indexvalue: " & idxvalue.ToString, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexvalue: " & idxvalue.ToString, False) Count += 1 indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, idxvalue) If indexierung_erfolgreich = False Then @@ -1068,7 +1068,7 @@ Public Class frmIndex End Function Private Function WriteIndex2File(indexname As String, indexvalue As String) Try - If LogErrorsOnly = False Then ClassLogger.Add(" ...Indexvalue: " & indexvalue.ToString, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexvalue: " & indexvalue.ToString, False) Return ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, indexvalue) Catch ex As Exception MsgBox("Error in WriteIndex2File:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -1095,6 +1095,8 @@ Public Class frmIndex Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & ClassWindream._WDObjekttyp & "'") If DT.Rows.Count = 1 Then + CURRENT_MESSAGEDATE = "" + CURRENT_MESSAGESUBJECT = "" 'Message-ID nur auswerten wenn vorher nicht gestzt wurde! If CURRENT_MESSAGEID = "" Then If Not msg.InternetMessageId Is Nothing Then @@ -1143,8 +1145,8 @@ Public Class frmIndex End If - If LogErrorsOnly = False Then ClassLogger.Add(" ...emailFrom: " & emailFrom, False) - If LogErrorsOnly = False Then ClassLogger.Add(" ...emailTo: " & emailTo, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> emailFrom: " & emailFrom, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> emailTo: " & emailTo, False) 'FROM If Not IsNothing(emailFrom) Then indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_FROM").ToString, emailFrom) @@ -1163,13 +1165,14 @@ Public Class frmIndex End If ' Dim subj As String = ClassFormFunctions.CleanInput(msg.Subject) - If LogErrorsOnly = False Then ClassLogger.Add(" ...subj: " & msg.Subject, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> subj: " & msg.Subject, False) indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_SUBJECT").ToString, msg.Subject) + CURRENT_MESSAGESUBJECT = msg.Subject If indexierung_erfolgreich = False Then MsgBox("Error in SetEmailIndices-Subject - See log", MsgBoxStyle.Critical) Return False End If - If LogErrorsOnly = False Then ClassLogger.Add(" ...MessageDeliveryTime: " & msg.MessageDeliveryTime, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> MessageDeliveryTime: " & msg.MessageDeliveryTime, False) indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_DATE_IN").ToString, msg.MessageDeliveryTime) CURRENT_MESSAGEDATE = msg.MessageDeliveryTime If indexierung_erfolgreich = False Then @@ -1195,40 +1198,36 @@ Public Class frmIndex Try Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & ClassWindream._WDObjekttyp & "'") If DT.Rows.Count = 1 Then + If Not CURRENT_MESSAGEID Is Nothing Then If CURRENT_MESSAGEID <> "" Then indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_ID").ToString, CURRENT_MESSAGEID) If indexierung_erfolgreich = False Then - MsgBox("Error in SetAttachmentIndices - See log", MsgBoxStyle.Critical) + MsgBox("Error in SetAttachmentIndices MESSAGE-ID - See log", MsgBoxStyle.Critical) Return False End If End If End If - 'indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_FROM").ToString, msg.SenderEmailAddress) - 'If indexierung_erfolgreich = False Then - ' MsgBox("Error in SetAttachmentIndices - See log", MsgBoxStyle.Critical) - ' Return False - 'End If - 'indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_TO").ToString, msg.ReceivedByEmailAddress) - 'If indexierung_erfolgreich = False Then - ' MsgBox("Error in SetAttachmentIndices - See log", MsgBoxStyle.Critical) - ' Return False - 'End If - 'indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_SUBJECT").ToString, msg.Subject) - 'If indexierung_erfolgreich = False Then - ' MsgBox("Error in SetAttachmentIndices - See log", MsgBoxStyle.Critical) - ' Return False - 'End If + 'Das Subject speichern + If CURRENT_MESSAGESUBJECT <> "" Then + indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_SUBJECT").ToString, CURRENT_MESSAGESUBJECT) + If indexierung_erfolgreich = False Then + MsgBox("Error in SetAttachmentIndices SUBJECT - See log", MsgBoxStyle.Critical) + Return False + End If + End If + 'Das MesageDate speichern If CURRENT_MESSAGEDATE <> "" Then indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_DATE_IN").ToString, CURRENT_MESSAGEDATE) If indexierung_erfolgreich = False Then - MsgBox("Error in SetAttachmentIndices - See log", MsgBoxStyle.Critical) + MsgBox("Error in SetAttachmentIndices DATE - See log", MsgBoxStyle.Critical) Return False End If End If + 'Kennzeichnen das es ein Anhang war! indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_CHECK_ATTACHMENT").ToString, True) If indexierung_erfolgreich = False Then - MsgBox("Error in SetAttachmentIndices - See log", MsgBoxStyle.Critical) + MsgBox("Error in SetAttachmentIndices ATTACHMENT Y/N - See log", MsgBoxStyle.Critical) Return False End If Return indexierung_erfolgreich @@ -1318,9 +1317,10 @@ Public Class frmIndex End Sub Sub CloseUniversalViewer() - If Not CURRENT_WORKFILE.EndsWith("msg") Then + Dim workfile = CURRENT_WORKFILE.ToLower + If Not workfile.EndsWith("msg") Then CURRENT_HTML_DOC = "" - If CURRENT_WORKFILE.EndsWith("pdf") Then + If workfile.EndsWith("pdf") Then Me.PdfViewer1.DocumentFilePath = "" My.Settings.SplitterDistance_Viewer = SplitContainer1.SplitterDistance Else @@ -1332,6 +1332,14 @@ Public Class frmIndex Else My.Settings.SplitterDistance_Viewer = SplitContainer1.SplitterDistance + Try + If File.Exists(CURRENT_HTML_DOC) Then + File.Delete(CURRENT_HTML_DOC) + End If + Catch ex As Exception + ClassLogger.Add(" - Fehler bei Delete HTML-Doc - Fehler: " & vbNewLine & ex.Message) + End Try + End If My.Settings.Save() @@ -1353,10 +1361,10 @@ Public Class frmIndex ElseIf DropType = "@OUTLOOK_MESSAGE@" Or DropType = "@FW_MSGONLY@" Then Select Case DropType Case "@FW_MSGONLY@" - If LogErrorsOnly = False Then ClassLogger.Add(" ....msg-file from folderwatch", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> .msg-file from folderwatch", False) Me.Text = "Indexierung der msg-Datei (ohne Anhang) - aus Folderwatch:" Case "@OUTLOOK_MESSAGE@" - If LogErrorsOnly = False Then ClassLogger.Add(" ....msg-file through dragdrop", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> .msg-file through dragdrop", False) Me.Text = "Indexierung der msg-Datei (ohne Anhang):" End Select @@ -1553,7 +1561,7 @@ Public Class frmIndex ' MsgBox(DT.Rows.Count.ToString) For Each DR_AUTOINDEX As DataRow In DT_INDEXAUTOM.Rows Dim indexname As String = DR_AUTOINDEX.Item("INDEXNAME") - If LogErrorsOnly = False Then ClassLogger.Add(" ...Build Automatischer Index '" & indexname & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Build Automatischer Index '" & indexname & "'", False) If DR_AUTOINDEX.Item("SQL_RESULT").ToString <> String.Empty And CBool(DR_AUTOINDEX.Item("SQL_ACTIVE")) = True Then ' Regulären Ausdruck zum Auslesen der windream-Indexe definieren Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" @@ -1566,26 +1574,26 @@ Public Class frmIndex ' alle Vorkommen der Indexe im SQL-String durchlaufen For Each element As System.Text.RegularExpressions.Match In elemente ' MsgBox(element.Value.ToUpper) - If LogErrorsOnly = False Then ClassLogger.Add(" ...Element: '" & element.Value & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Element: '" & element.Value & "'", False) '' wenn es sich nicht um dedizeirte Werte handelt (es sollen ja nur die Indexe ausgelesen werden) 'If Not element.Value.ToUpper = "[%SPALTE]" And Not element.Value.ToUpper = "[%VIEW]" Then 'die Zeichen [% und ] entfernen (liefert den wirklichen windream-Index) Dim elementOhneSonderzeichen As String = element.Value.Substring(2, element.Value.Length - 3) - If LogErrorsOnly = False Then ClassLogger.Add(" ...elementOhneSonderzeichen: '" & elementOhneSonderzeichen & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> elementOhneSonderzeichen: '" & elementOhneSonderzeichen & "'", False) 'den Platzhalter im SQL-String durch den Wert ersetzen Dim manIndexwert As String = GetManIndex_Value(elementOhneSonderzeichen, "IDX_AUTO") If manIndexwert <> "" Then SqlString = SqlString.Replace(element.Value, manIndexwert) - If LogErrorsOnly = False Then ClassLogger.Add(" ...zusammengesetzter SQL-String: " & SqlString, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> zusammengesetzter SQL-String: " & SqlString, False) Else ClassLogger.Add(" - ACHTUNG: manIndexwert = String.Empty - Funktion: FillIndexe_Autom", False) Return False End If Next - If LogErrorsOnly = False Then ClassLogger.Add(" ...Ausführen SQL....", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Ausführen SQL....", False) Dim automatischerValue As String = "" automatischerValue = Get_AutomatischerIndex_SQL(SqlString, DR_AUTOINDEX.Item("CONNECTION_ID"), DR_AUTOINDEX.Item("SQL_PROVIDER")) - If LogErrorsOnly = False Then ClassLogger.Add(" ...Ergebnis SQL: '" & automatischerValue & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Ergebnis SQL: '" & automatischerValue & "'", False) If automatischerValue <> String.Empty Then DR_AUTOINDEX.Item("Indexiert") = True DR_AUTOINDEX.Item("Indexwert") = automatischerValue @@ -1600,7 +1608,7 @@ Public Class frmIndex Dim DEFAULTVALUE As String = DR_AUTOINDEX.Item("VALUE") 'Indexierung mit WindowsVariable If DEFAULTVALUE.StartsWith("$") Then - If LogErrorsOnly = False Then ClassLogger.Add(" ...Indexierung mit einer Windowsvariable: '" & DEFAULTVALUE & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexierung mit einer Windowsvariable: '" & DEFAULTVALUE & "'", False) Select Case DEFAULTVALUE.ToUpper Case "$filename_ext".ToUpper DEFAULTVALUE = Path.GetFileName(CURRENT_WORKFILE) @@ -1619,9 +1627,9 @@ Public Class frmIndex Case "$DateDDMMYYY".ToUpper DEFAULTVALUE = System.DateTime.Now.ToShortDateString End Select - If LogErrorsOnly = False Then ClassLogger.Add(" ...Ergebnis der Windowsvariable: '" & DEFAULTVALUE & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Ergebnis der Windowsvariable: '" & DEFAULTVALUE & "'", False) Else - If LogErrorsOnly = False Then ClassLogger.Add(" ...Indexierung mit einem Festen Wert: '" & DEFAULTVALUE & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexierung mit einem Festen Wert: '" & DEFAULTVALUE & "'", False) End If 'Den Wert in der Zwischentabelle speichern DR_AUTOINDEX.Item("Indexiert") = True @@ -1653,9 +1661,10 @@ Public Class frmIndex Me.grpBetreff.Visible = False Me.pnlPDF.Visible = False CURRENT_HTML_DOC = "" - If Not CURRENT_WORKFILE.EndsWith("msg") Then + Dim workfile As String = CURRENT_WORKFILE.ToLower + If Not workfile.EndsWith("msg") Then CURRENT_HTML_DOC = "" - If CURRENT_WORKFILE.EndsWith("pdf") Then + If workfile.EndsWith("pdf") Then Me.SplitContainer1.Panel2Collapsed = False PdfViewer1.LoadDocument(CURRENT_WORKFILE) pnlPDF.Dock = DockStyle.Fill @@ -1695,35 +1704,41 @@ Public Class frmIndex End If Else - Me.grpBetreff.Dock = DockStyle.Top - Me.grpbxMailBody.Dock = DockStyle.Fill - Dim msg_email As New Msg.Message(CURRENT_WORKFILE) - 'Eine tempfile generieren Dim tempFilename = My.Computer.FileSystem.GetTempFileName() - Dim name = Path.GetFileNameWithoutExtension(tempFilename) - tempFilename = Path.Combine(Path.GetDirectoryName(tempFilename), name & ".html") - 'tempfile löschen - If My.Computer.FileSystem.FileExists(tempFilename) Then - My.Computer.FileSystem.DeleteFile(tempFilename) - End If - - Me.txtBetreff.Text = msg_email.Subject - 'Try - Dim wFile As System.IO.FileStream - Dim byteData() As Byte - byteData = msg_email.BodyHtml - - ' MsgBox(msg_email.InternetCodePage) - ' wFile = New FileStream(tempFilename, FileMode.Append) - ' wFile.Write(byteData, 0, byteData.Length) - ' wFile.Close() - 'Catch ex As IOException - ' MsgBox(ex.ToString) - 'End Try + Try + Me.grpBetreff.Dock = DockStyle.Top + Me.grpbxMailBody.Dock = DockStyle.Fill + Dim msg_email As New Msg.Message(CURRENT_WORKFILE) + 'Eine tempfile generieren + Dim name = Path.GetFileNameWithoutExtension(tempFilename) + tempFilename = Path.Combine(Path.GetDirectoryName(tempFilename), name & ".html") + If LogErrorsOnly = False Then ClassLogger.Add(" ...tempFilename: " & tempFilename, False) + 'tempfile löschen + If My.Computer.FileSystem.FileExists(tempFilename) Then + My.Computer.FileSystem.DeleteFile(tempFilename) + End If - Dim vIn() As Byte = msg_email.BodyHtml - Dim vOut As String = System.Text.Encoding.UTF8.GetString(vIn) - File.WriteAllText(tempFilename, vOut, System.Text.Encoding.UTF8) + Me.txtBetreff.Text = msg_email.Subject + 'Try + Dim wFile As System.IO.FileStream + Dim byteData() As Byte + byteData = msg_email.BodyHtml + If LogErrorsOnly = False Then ClassLogger.Add(" ...byteData HTML finished", False) + ' MsgBox(msg_email.InternetCodePage) + ' wFile = New FileStream(tempFilename, FileMode.Append) + ' wFile.Write(byteData, 0, byteData.Length) + ' wFile.Close() + 'Catch ex As IOException + ' MsgBox(ex.ToString) + 'End Try + + Dim vIn() As Byte = msg_email.BodyHtml + Dim vOut As String = System.Text.Encoding.UTF8.GetString(vIn) + If LogErrorsOnly = False Then ClassLogger.Add(" ...byteData finished. Now write to file", False) + File.WriteAllText(tempFilename, vOut, System.Text.Encoding.UTF8) + Catch ex As Exception + MsgBox("Unerwarteter Fehler bei getHTML from Email: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try CURRENT_HTML_DOC = tempFilename Me.tslblWebbrowser.Text = CURRENT_HTML_DOC @@ -1773,20 +1788,24 @@ Public Class frmIndex Private Function WORK_FILE() Try Me.VWDDINDEX_MANTableAdapter.Fill(Me.MyDataset.VWDDINDEX_MAN, CURRENT_DOKART_ID) - If LogErrorsOnly = False Then ClassLogger.Add(" ...Manuelle Indexe geladen", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Manuelle Indexe geladen", False) If MyDataset.VWDDINDEX_MAN.Rows.Count > 0 Then CURRENT_DOKART_ID = Me.cmbDokumentart.SelectedValue If CheckWrite_IndexeMan(Me.cmbDokumentart.SelectedValue) = True Then '##### Manuelle Indexe indexiert ##### - If LogErrorsOnly = False Then ClassLogger.Add(" ...Datei " & CURRENT_WORKFILE & " wird nun indexiert...", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Datei " & CURRENT_WORKFILE & " wird nun indexiert...", False) If FillIndexe_Autom(Me.cmbDokumentart.SelectedValue) = True Then + If LogErrorsOnly = False Then ClassLogger.Add(" ...FillIndexe_Autom durchlaufen", False) 'Den Zielnamen zusammenbauen If Name_Generieren() = True Then - + If LogErrorsOnly = False Then ClassLogger.Add(" ...Name_Generieren durchlaufen", False) + 'Dokumentenviewer ausblenden + CloseUniversalViewer() + If LogErrorsOnly = False Then ClassLogger.Add(" ...Viewer geschlossen", False) 'Die Datei verschieben If Move_File2_Target() = True Then - CloseUniversalViewer() + If LogErrorsOnly = False Then ClassLogger.Add(" ...Move_File2_Target durchlaufen", False) 'Die Originaldatei löschen If DropType = "@DROPFROMFSYSTEM@" Then If chkdelete_origin.Checked = True Then @@ -1892,7 +1911,7 @@ Public Class frmIndex exp2WD = SINGLEFILE_2_WINDREAM(CURR_DOKART_OBJECTTYPE) End If If exp2WD = True Then - 'Prüfen ob Sessiond a ist - wenn nicht nochmal neu initiieren + 'Prüfen ob Session da ist - wenn nicht nochmal neu initiieren If ClassWindream.oSession Is Nothing Then ClassWindream.Init() End If @@ -1998,24 +2017,24 @@ Public Class frmIndex '#### ' alle Vorkommen innerhalb des Ordnerstrings durchlaufen For Each element As System.Text.RegularExpressions.Match In elemente - If LogErrorsOnly = False Then ClassLogger.Add(" ...Elementname in FolderString: '" & element.ToString & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Elementname in FolderString: '" & element.ToString & "'", False) Select Case element.Value.Substring(2, 1).ToUpper 'Manueller Indexwert Case "M" Dim ManIndexname = element.Value.Substring(3, element.Value.Length - 4) - If LogErrorsOnly = False Then ClassLogger.Add(" ...Versuch den Indexwert aus '" & ManIndexname & "' auszulesen.", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch den Indexwert aus '" & ManIndexname & "' auszulesen.", False) Dim ManIndex_Value As String = GetManIndex_Value(ManIndexname, "FILE") - If LogErrorsOnly = False Then ClassLogger.Add(" ...Ergebnis/Wert für neuen Ordner: '" & ManIndexname & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Ergebnis/Wert für neuen Ordner: '" & ManIndexname & "'", False) If Not ManIndex_Value = String.Empty Then If IsDate(ManIndex_Value) Then ManIndex_Value = CDate(ManIndex_Value).ToString("yyyyMMdd") End If folderindex = folderindex.Replace(element.ToString, ManIndex_Value) - If LogErrorsOnly = False Then ClassLogger.Add(" ...FolderPattern: '" & folderindex & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPattern: '" & folderindex & "'", False) Else Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & ManIndexname & "')", MyConnectionString, True) If optional_index = True Then - If LogErrorsOnly = False Then ClassLogger.Add(" ...Optionaler Indexwert ist NICHT gefüllt", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Optionaler Indexwert ist NICHT gefüllt", False) Else ClassLogger.Add(" - Achtung Ausnahme in 'CrFolderForIndex': der Index ist leer!", True) Return True @@ -2023,12 +2042,12 @@ Public Class frmIndex End If Case "A" Dim AutoIndexname = element.Value.Substring(3, element.Value.Length - 4) - If LogErrorsOnly = False Then ClassLogger.Add(" ...Versuch den Auto-Indexwert aus '" & AutoIndexname & "' auszulesen.", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch den Auto-Indexwert aus '" & AutoIndexname & "' auszulesen.", False) Dim AutoIndex_Value As String = GetAutoIndex_Value(AutoIndexname) - If LogErrorsOnly = False Then ClassLogger.Add(" ...Ergebnis/Wert für neuen Ordner: '" & AutoIndexname & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Ergebnis/Wert für neuen Ordner: '" & AutoIndexname & "'", False) If Not AutoIndex_Value = String.Empty Then folderindex = folderindex.Replace(element.ToString, AutoIndex_Value) - If LogErrorsOnly = False Then ClassLogger.Add(" ...FolderPattern: '" & folderindex & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPattern: '" & folderindex & "'", False) Else ClassLogger.Add(" - Achtung Ausnahme in 'CrFolderForIndex': der Index ist leer!", True) End If @@ -2054,7 +2073,7 @@ Public Class frmIndex folder_temp = My.Computer.Clock.LocalTime.Year & "-" & _Month End Select folderindex = folderindex.Replace(element.ToString, folder_temp) - If LogErrorsOnly = False Then ClassLogger.Add(" ...FolderPatter nach V-Element: '" & folderindex & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPatter nach V-Element: '" & folderindex & "'", False) Case Else ClassLogger.Add(" - Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper) MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper, MsgBoxStyle.Exclamation, "Fehler bei Name generieren:") @@ -2137,10 +2156,10 @@ Public Class frmIndex 'Next - If LogErrorsOnly = False Then ClassLogger.Add(" ...Den Root-Folder zusammenfügen...", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Den Root-Folder zusammenfügen>> ", False) Dim fullpath As String = RootFolder & "\" & folderindex & "\" fullpath.Replace("\\", "\") - If LogErrorsOnly = False Then ClassLogger.Add(" ...Fullpath (mit evtl. Sonderzeichen (SZ)) '" & fullpath & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Fullpath (mit evtl. Sonderzeichen (SZ)) '" & fullpath & "'", False) Dim invalidPathChars() As Char = Path.GetInvalidPathChars() For Each sonderChar As Char In invalidPathChars 'Sonderzeichen ausser Whitespace entfernen @@ -2150,10 +2169,10 @@ Public Class frmIndex End If End If Next sonderChar - If LogErrorsOnly = False Then ClassLogger.Add(" ...Fullpath (ohne SZ) '" & fullpath & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Fullpath (ohne SZ) '" & fullpath & "'", False) If Directory.Exists(fullpath) = False Then Directory.CreateDirectory(fullpath) - If LogErrorsOnly = False Then ClassLogger.Add(" ...Folder '" & fullpath & "' wurde angelegt", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Folder '" & fullpath & "' wurde angelegt", False) End If 'Die aktuelle Datei soll gleichzeitig verschoben werden @@ -2161,13 +2180,13 @@ Public Class frmIndex Dim Dateiname As String = Path.GetFileName(fullfilename) Dim _Pfad, _WDLaufwerk, _Ziel As String _Ziel = fullpath & Dateiname - If LogErrorsOnly = False Then ClassLogger.Add(" ...Ziel: " & _Ziel, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Ziel: " & _Ziel, False) 'Nur verschieben und überprüfen wenn Pfad ungleich If Path.GetDirectoryName(fullfilename) <> Path.GetDirectoryName(_Ziel) Then Dim Stammname As String = _Ziel.Substring(0, _Ziel.LastIndexOf(".")) Dim version As Integer = 2 Do While File.Exists(_Ziel) = True - If LogErrorsOnly = False Then ClassLogger.Add(" ...Achtung: Datei ' " & Path.GetFileName(_Ziel) & "' existiert bereits!", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Achtung: Datei ' " & Path.GetFileName(_Ziel) & "' existiert bereits!", False) Dim neuername As String = Stammname & "~" & version & extension _Ziel = neuername version = version + 1 diff --git a/Global_Indexer/frmSQL-Result.Designer.vb b/Global_Indexer/frmSQL-Result.Designer.vb new file mode 100644 index 0000000..919ba41 --- /dev/null +++ b/Global_Indexer/frmSQL-Result.Designer.vb @@ -0,0 +1,219 @@ + _ +Partial Class frmSQL_Result + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQL_Result)) + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) + Me.BindingSource1 = New System.Windows.Forms.BindingSource(Me.components) + Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() + Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorSeparator = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorPositionItem = New System.Windows.Forms.ToolStripTextBox() + Me.BindingNavigatorSeparator1 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Label1 = New System.Windows.Forms.Label() + Me.txtSQLCommand = New System.Windows.Forms.TextBox() + Me.DataGridView1 = New System.Windows.Forms.DataGridView() + CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.BindingNavigator1.SuspendLayout() + CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() + CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'BindingNavigator1 + ' + Me.BindingNavigator1.AddNewItem = Nothing + Me.BindingNavigator1.BindingSource = Me.BindingSource1 + Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem + Me.BindingNavigator1.CountItemFormat = "von {0} Datensätzen" + Me.BindingNavigator1.DeleteItem = Nothing + Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2}) + Me.BindingNavigator1.Location = New System.Drawing.Point(0, 0) + Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem + Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem + Me.BindingNavigator1.MoveNextItem = Me.BindingNavigatorMoveNextItem + Me.BindingNavigator1.MovePreviousItem = Me.BindingNavigatorMovePreviousItem + Me.BindingNavigator1.Name = "BindingNavigator1" + Me.BindingNavigator1.PositionItem = Me.BindingNavigatorPositionItem + Me.BindingNavigator1.Size = New System.Drawing.Size(643, 25) + Me.BindingNavigator1.TabIndex = 0 + Me.BindingNavigator1.Text = "BindingNavigator1" + ' + 'BindingNavigatorCountItem + ' + Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem" + Me.BindingNavigatorCountItem.Size = New System.Drawing.Size(111, 22) + Me.BindingNavigatorCountItem.Text = "von {0} Datensätzen" + Me.BindingNavigatorCountItem.ToolTipText = "Die Gesamtanzahl der Elemente." + ' + 'BindingNavigatorMoveFirstItem + ' + Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorMoveFirstItem.Image = CType(resources.GetObject("BindingNavigatorMoveFirstItem.Image"), System.Drawing.Image) + Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem" + Me.BindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorMoveFirstItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorMoveFirstItem.Text = "Erste verschieben" + ' + 'BindingNavigatorMovePreviousItem + ' + Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorMovePreviousItem.Image = CType(resources.GetObject("BindingNavigatorMovePreviousItem.Image"), System.Drawing.Image) + Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem" + Me.BindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorMovePreviousItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorMovePreviousItem.Text = "Vorherige verschieben" + ' + 'BindingNavigatorSeparator + ' + Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator" + Me.BindingNavigatorSeparator.Size = New System.Drawing.Size(6, 25) + ' + 'BindingNavigatorPositionItem + ' + Me.BindingNavigatorPositionItem.AccessibleName = "Position" + Me.BindingNavigatorPositionItem.AutoSize = False + Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" + Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23) + Me.BindingNavigatorPositionItem.Text = "0" + Me.BindingNavigatorPositionItem.ToolTipText = "Aktuelle Position" + ' + 'BindingNavigatorSeparator1 + ' + Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator1" + Me.BindingNavigatorSeparator1.Size = New System.Drawing.Size(6, 25) + ' + 'BindingNavigatorMoveNextItem + ' + Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorMoveNextItem.Image = CType(resources.GetObject("BindingNavigatorMoveNextItem.Image"), System.Drawing.Image) + Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem" + Me.BindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorMoveNextItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorMoveNextItem.Text = "Nächste verschieben" + ' + 'BindingNavigatorMoveLastItem + ' + Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorMoveLastItem.Image = CType(resources.GetObject("BindingNavigatorMoveLastItem.Image"), System.Drawing.Image) + Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem" + Me.BindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorMoveLastItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorMoveLastItem.Text = "Letzte verschieben" + ' + 'BindingNavigatorSeparator2 + ' + Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2" + Me.BindingNavigatorSeparator2.Size = New System.Drawing.Size(6, 25) + ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.txtSQLCommand) + Me.Panel1.Controls.Add(Me.Label1) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel1.Location = New System.Drawing.Point(0, 25) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(643, 100) + Me.Panel1.TabIndex = 1 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(3, 6) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(85, 13) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "SQL-Command:" + ' + 'txtSQLCommand + ' + Me.txtSQLCommand.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSQLCommand.Location = New System.Drawing.Point(3, 22) + Me.txtSQLCommand.Multiline = True + Me.txtSQLCommand.Name = "txtSQLCommand" + Me.txtSQLCommand.ReadOnly = True + Me.txtSQLCommand.Size = New System.Drawing.Size(637, 75) + Me.txtSQLCommand.TabIndex = 1 + ' + 'DataGridView1 + ' + Me.DataGridView1.AllowUserToAddRows = False + Me.DataGridView1.AllowUserToDeleteRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.DataGridView1.Dock = System.Windows.Forms.DockStyle.Fill + Me.DataGridView1.Location = New System.Drawing.Point(0, 125) + Me.DataGridView1.Name = "DataGridView1" + Me.DataGridView1.ReadOnly = True + Me.DataGridView1.Size = New System.Drawing.Size(643, 331) + Me.DataGridView1.TabIndex = 2 + ' + 'frmSQL_Result + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(643, 456) + Me.Controls.Add(Me.DataGridView1) + Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.BindingNavigator1) + Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "frmSQL_Result" + Me.Text = "Ergebnisanzeige für SQL" + CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).EndInit() + Me.BindingNavigator1.ResumeLayout(False) + Me.BindingNavigator1.PerformLayout() + CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents BindingNavigator1 As System.Windows.Forms.BindingNavigator + Friend WithEvents BindingNavigatorCountItem As System.Windows.Forms.ToolStripLabel + Friend WithEvents BindingNavigatorMoveFirstItem As System.Windows.Forms.ToolStripButton + Friend WithEvents BindingNavigatorMovePreviousItem As System.Windows.Forms.ToolStripButton + Friend WithEvents BindingNavigatorSeparator As System.Windows.Forms.ToolStripSeparator + Friend WithEvents BindingNavigatorPositionItem As System.Windows.Forms.ToolStripTextBox + Friend WithEvents BindingNavigatorSeparator1 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents BindingNavigatorMoveNextItem As System.Windows.Forms.ToolStripButton + Friend WithEvents BindingNavigatorMoveLastItem As System.Windows.Forms.ToolStripButton + Friend WithEvents BindingNavigatorSeparator2 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents BindingSource1 As System.Windows.Forms.BindingSource + Friend WithEvents Panel1 As System.Windows.Forms.Panel + Friend WithEvents txtSQLCommand As System.Windows.Forms.TextBox + Friend WithEvents Label1 As System.Windows.Forms.Label + Friend WithEvents DataGridView1 As System.Windows.Forms.DataGridView +End Class diff --git a/Global_Indexer/frmSQL-Result.resx b/Global_Indexer/frmSQL-Result.resx new file mode 100644 index 0000000..e031ef0 --- /dev/null +++ b/Global_Indexer/frmSQL-Result.resx @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 171, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + AAABAAIAEBAQAAEABAAoAQAAJgAAABAQAAABAAgAaAUAAE4BAAAoAAAAEAAAACAAAAABAAQAAAAAAIAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAICAgADAwMAAAAD/AAD/ + AAAA//8A/wAAAP8A/wD//wAA////AAAA/////wAAAP93d3d3/wAPh3d3d3d48A93d3d3d3fwD3d3d3d3 + d/APd3d3d3d38A93d3d3d3fwD3d3d3d3d/APd3d3d3d38A93d3d3d3fwD3eI//+Id/APf//////38A9/ + //////fwD4eI//+IePAA/3d3d3f/AAAA/////wAA8A8AAMADAACAAQAAgAEAAIABAACAAQAAgAEAAIAB + AACAAQAAgAEAAIABAACAAQAAgAEAAIABAADAAwAA8A8AACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAA + AAAAAAAAAAEAAAABAAAAAAAAQkJCAE1NTQBZWVkAhoaGAKSjpACzs7MA29naAODg4ADm5OUA6+vrAPHv + 8AD29vYA+Pj4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///8AAAAAAA0MDAwMDAwNAAAAAAAADQgEAwEBAQEDBAgNAAAADQYBAQEBAQEB + AQEBBg0AAAwBAQEBAQEBAQEBAQEMAAAMAQEBAQEBAQEBAQEBDAAADAEBAQEBAQEBAQEBAQwAAAwBAQEB + AQEBAQEBAQEMAAAMAQEBAQEBAQEBAQEBDAAADAEBAQEBAQEBAQEBAQwAAAwBAQEBAQICAQEBAQEMAAAM + AQIFBwsLCwsHBQIBDAAACgIICwsLCwsLCwsIAQwAAAoCCAsLCwsLCwsLCAEMAAANBgIFBwsLCwsHBQIG + DQAAAA0IBAMBAQEBAwQIDQAAAAAAAA0MDAwMDAwNAAAAAPAPAADAAwAAgAEAAIABAACAAQAAgAEAAIAB + AACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAwAMAAPAPAAA= + + + \ No newline at end of file diff --git a/Global_Indexer/frmSQL-Result.vb b/Global_Indexer/frmSQL-Result.vb new file mode 100644 index 0000000..fef8edc --- /dev/null +++ b/Global_Indexer/frmSQL-Result.vb @@ -0,0 +1,8 @@ +Public Class frmSQL_Result + + Private Sub frmSQL_Result_Load(sender As Object, e As EventArgs) Handles Me.Load + txtSQLCommand.Text = CURRENT_SQLRESULT + Me.BindingSource1.DataSource = DTSQL_RESULT + DataGridView1.DataSource = DTSQL_RESULT + End Sub +End Class \ No newline at end of file diff --git a/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb b/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb index 411ad50..3a3140b 100644 --- a/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb +++ b/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb @@ -24,6 +24,8 @@ Partial Class SQLConfigAutoIndex Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim SQL_ERGEBNISLabel As System.Windows.Forms.Label + Dim Label3 As System.Windows.Forms.Label + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.btnVorschlag = New System.Windows.Forms.Button() Me.SQL_ERGEBNISTextBox = New System.Windows.Forms.TextBox() Me.cmbConnection = New System.Windows.Forms.ComboBox() @@ -34,29 +36,64 @@ Partial Class SQLConfigAutoIndex Me.Button1 = New System.Windows.Forms.Button() Me.btnsave = New System.Windows.Forms.Button() Me.lblSave = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.cmbManualIDX = New System.Windows.Forms.ComboBox() + Me.TBDD_INDEX_MANBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_INDEX_MANTableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_MANTableAdapter() + Me.btnaddManualIdx = New System.Windows.Forms.Button() + Me.Label2 = New System.Windows.Forms.Label() + Me.dgvPlaceholders = New System.Windows.Forms.DataGridView() + Me.colPlaceholder = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colReplace = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.GroupBox4 = New System.Windows.Forms.GroupBox() + Me.radioView = New System.Windows.Forms.RadioButton() + Me.radioTable = New System.Windows.Forms.RadioButton() + Me.Label4 = New System.Windows.Forms.Label() + Me.txtCondition = New System.Windows.Forms.TextBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.cmbSelectColumns = New System.Windows.Forms.ComboBox() + Me.Label7 = New System.Windows.Forms.Label() + Me.cmbWhereOperator = New System.Windows.Forms.ComboBox() + Me.cmbFromTables = New System.Windows.Forms.ComboBox() + Me.cmbWhereColumns = New System.Windows.Forms.ComboBox() + Me.Label8 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() SQL_ERGEBNISLabel = New System.Windows.Forms.Label() + Label3 = New System.Windows.Forms.Label() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBDD_INDEX_MANBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox4.SuspendLayout() Me.SuspendLayout() ' 'SQL_ERGEBNISLabel ' SQL_ERGEBNISLabel.AutoSize = True - SQL_ERGEBNISLabel.Location = New System.Drawing.Point(12, 66) + SQL_ERGEBNISLabel.Location = New System.Drawing.Point(12, 161) SQL_ERGEBNISLabel.Name = "SQL_ERGEBNISLabel" SQL_ERGEBNISLabel.Size = New System.Drawing.Size(157, 13) SQL_ERGEBNISLabel.TabIndex = 50 SQL_ERGEBNISLabel.Text = "SQL für automatischen Index:" ' + 'Label3 + ' + Label3.AutoSize = True + Label3.Location = New System.Drawing.Point(9, 8) + Label3.Name = "Label3" + Label3.Size = New System.Drawing.Size(93, 13) + Label3.TabIndex = 87 + Label3.Text = "SQL-Connection:" + ' 'btnVorschlag ' Me.btnVorschlag.Image = Global.Global_Indexer.My.Resources.Resources.database_go Me.btnVorschlag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVorschlag.Location = New System.Drawing.Point(675, 79) + Me.btnVorschlag.Location = New System.Drawing.Point(646, 177) Me.btnVorschlag.Name = "btnVorschlag" - Me.btnVorschlag.Size = New System.Drawing.Size(151, 25) + Me.btnVorschlag.Size = New System.Drawing.Size(177, 37) Me.btnVorschlag.TabIndex = 48 - Me.btnVorschlag.Text = "Teste SQL" + Me.btnVorschlag.Text = "Teste SQL (BETA)" Me.btnVorschlag.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnVorschlag.UseVisualStyleBackColor = True ' @@ -65,11 +102,11 @@ Partial Class SQLConfigAutoIndex Me.SQL_ERGEBNISTextBox.AcceptsReturn = True Me.SQL_ERGEBNISTextBox.AcceptsTab = True Me.SQL_ERGEBNISTextBox.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.SQL_ERGEBNISTextBox.Location = New System.Drawing.Point(15, 82) + Me.SQL_ERGEBNISTextBox.Location = New System.Drawing.Point(15, 177) Me.SQL_ERGEBNISTextBox.Multiline = True Me.SQL_ERGEBNISTextBox.Name = "SQL_ERGEBNISTextBox" Me.SQL_ERGEBNISTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both - Me.SQL_ERGEBNISTextBox.Size = New System.Drawing.Size(654, 136) + Me.SQL_ERGEBNISTextBox.Size = New System.Drawing.Size(616, 136) Me.SQL_ERGEBNISTextBox.TabIndex = 47 ' 'cmbConnection @@ -77,7 +114,7 @@ Partial Class SQLConfigAutoIndex Me.cmbConnection.DataSource = Me.TBDD_CONNECTIONBindingSource Me.cmbConnection.DisplayMember = "BEZEICHNUNG" Me.cmbConnection.FormattingEnabled = True - Me.cmbConnection.Location = New System.Drawing.Point(15, 24) + Me.cmbConnection.Location = New System.Drawing.Point(12, 24) Me.cmbConnection.Name = "cmbConnection" Me.cmbConnection.Size = New System.Drawing.Size(268, 21) Me.cmbConnection.TabIndex = 53 @@ -122,19 +159,20 @@ Partial Class SQLConfigAutoIndex ' Me.Button1.Image = Global.Global_Indexer.My.Resources.Resources.database_connect Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(289, 22) + Me.Button1.Location = New System.Drawing.Point(286, 17) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(122, 23) + Me.Button1.Size = New System.Drawing.Size(189, 32) Me.Button1.TabIndex = 54 - Me.Button1.Text = "SQL-Connections" + Me.Button1.Text = "Verwaltung SQL-Connections" Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button1.UseVisualStyleBackColor = True ' 'btnsave ' + Me.btnsave.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnsave.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG Me.btnsave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnsave.Location = New System.Drawing.Point(736, 187) + Me.btnsave.Location = New System.Drawing.Point(733, 282) Me.btnsave.Name = "btnsave" Me.btnsave.Size = New System.Drawing.Size(90, 31) Me.btnsave.TabIndex = 55 @@ -144,22 +182,245 @@ Partial Class SQLConfigAutoIndex ' 'lblSave ' - Me.lblSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblSave.AutoSize = True Me.lblSave.BackColor = System.Drawing.Color.Yellow - Me.lblSave.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblSave.Location = New System.Drawing.Point(445, 221) + Me.lblSave.Font = New System.Drawing.Font("Segoe UI Semibold", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblSave.Location = New System.Drawing.Point(643, 217) Me.lblSave.Name = "lblSave" - Me.lblSave.Size = New System.Drawing.Size(224, 17) + Me.lblSave.Size = New System.Drawing.Size(180, 13) Me.lblSave.TabIndex = 79 Me.lblSave.Text = "SQL-Daten erfolgreich gespeichert!" Me.lblSave.Visible = False ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(12, 316) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(151, 13) + Me.Label1.TabIndex = 80 + Me.Label1.Text = "Platzhalter manuelle Indexe:" + ' + 'cmbManualIDX + ' + Me.cmbManualIDX.DataSource = Me.TBDD_INDEX_MANBindingSource + Me.cmbManualIDX.DisplayMember = "NAME" + Me.cmbManualIDX.FormattingEnabled = True + Me.cmbManualIDX.Location = New System.Drawing.Point(15, 332) + Me.cmbManualIDX.Name = "cmbManualIDX" + Me.cmbManualIDX.Size = New System.Drawing.Size(171, 21) + Me.cmbManualIDX.TabIndex = 81 + Me.cmbManualIDX.ValueMember = "GUID" + ' + 'TBDD_INDEX_MANBindingSource + ' + Me.TBDD_INDEX_MANBindingSource.DataMember = "TBDD_INDEX_MAN" + Me.TBDD_INDEX_MANBindingSource.DataSource = Me.MyDataset + ' + 'TBDD_INDEX_MANTableAdapter + ' + Me.TBDD_INDEX_MANTableAdapter.ClearBeforeFill = True + ' + 'btnaddManualIdx + ' + Me.btnaddManualIdx.Image = Global.Global_Indexer.My.Resources.Resources.action_add_16xMD + Me.btnaddManualIdx.Location = New System.Drawing.Point(192, 332) + Me.btnaddManualIdx.Name = "btnaddManualIdx" + Me.btnaddManualIdx.Size = New System.Drawing.Size(27, 21) + Me.btnaddManualIdx.TabIndex = 82 + Me.btnaddManualIdx.UseVisualStyleBackColor = True + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.Label2.Location = New System.Drawing.Point(316, 316) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(132, 15) + Me.Label2.TabIndex = 84 + Me.Label2.Text = "Platzhalter Ersetzungen:" + ' + 'dgvPlaceholders + ' + Me.dgvPlaceholders.AllowUserToAddRows = False + Me.dgvPlaceholders.AllowUserToDeleteRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan + Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace}) + Me.dgvPlaceholders.Enabled = False + Me.dgvPlaceholders.Location = New System.Drawing.Point(319, 334) + Me.dgvPlaceholders.Name = "dgvPlaceholders" + Me.dgvPlaceholders.Size = New System.Drawing.Size(312, 132) + Me.dgvPlaceholders.TabIndex = 83 + ' + 'colPlaceholder + ' + Me.colPlaceholder.HeaderText = "Platzhalter" + Me.colPlaceholder.Name = "colPlaceholder" + Me.colPlaceholder.ReadOnly = True + ' + 'colReplace + ' + Me.colReplace.HeaderText = "Ersetzung" + Me.colReplace.Name = "colReplace" + ' + 'GroupBox4 + ' + Me.GroupBox4.Controls.Add(Me.Label5) + Me.GroupBox4.Controls.Add(Me.radioView) + Me.GroupBox4.Controls.Add(Me.radioTable) + Me.GroupBox4.Controls.Add(Me.Label4) + Me.GroupBox4.Controls.Add(Me.txtCondition) + Me.GroupBox4.Controls.Add(Me.Label6) + Me.GroupBox4.Controls.Add(Me.cmbSelectColumns) + Me.GroupBox4.Controls.Add(Me.Label7) + Me.GroupBox4.Controls.Add(Me.cmbWhereOperator) + Me.GroupBox4.Controls.Add(Me.cmbFromTables) + Me.GroupBox4.Controls.Add(Me.cmbWhereColumns) + Me.GroupBox4.Controls.Add(Me.Label8) + Me.GroupBox4.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GroupBox4.Location = New System.Drawing.Point(15, 51) + Me.GroupBox4.Name = "GroupBox4" + Me.GroupBox4.Size = New System.Drawing.Size(808, 107) + Me.GroupBox4.TabIndex = 86 + Me.GroupBox4.TabStop = False + Me.GroupBox4.Text = "SQL-Befehl generieren (BETA)" + ' + 'radioView + ' + Me.radioView.AutoSize = True + Me.radioView.Location = New System.Drawing.Point(241, 19) + Me.radioView.Name = "radioView" + Me.radioView.Size = New System.Drawing.Size(55, 17) + Me.radioView.TabIndex = 25 + Me.radioView.Text = "Views" + Me.radioView.UseVisualStyleBackColor = True + ' + 'radioTable + ' + Me.radioTable.AutoSize = True + Me.radioTable.Checked = True + Me.radioTable.Location = New System.Drawing.Point(154, 19) + Me.radioTable.Name = "radioTable" + Me.radioTable.Size = New System.Drawing.Size(68, 17) + Me.radioTable.TabIndex = 24 + Me.radioTable.TabStop = True + Me.radioTable.Text = "Tabellen" + Me.radioTable.UseVisualStyleBackColor = True + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(6, 21) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(126, 13) + Me.Label4.TabIndex = 86 + Me.Label4.Text = "Tabellenart auswählen:" + ' + 'txtCondition + ' + Me.txtCondition.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtCondition.Location = New System.Drawing.Point(363, 75) + Me.txtCondition.Name = "txtCondition" + Me.txtCondition.Size = New System.Drawing.Size(234, 20) + Me.txtCondition.TabIndex = 29 + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.Location = New System.Drawing.Point(6, 50) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(43, 13) + Me.Label6.TabIndex = 19 + Me.Label6.Text = "SELECT" + ' + 'cmbSelectColumns + ' + Me.cmbSelectColumns.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cmbSelectColumns.Enabled = False + Me.cmbSelectColumns.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbSelectColumns.FormattingEnabled = True + Me.cmbSelectColumns.Location = New System.Drawing.Point(63, 47) + Me.cmbSelectColumns.Name = "cmbSelectColumns" + Me.cmbSelectColumns.Size = New System.Drawing.Size(233, 21) + Me.cmbSelectColumns.TabIndex = 20 + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label7.Location = New System.Drawing.Point(302, 50) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(31, 13) + Me.Label7.TabIndex = 21 + Me.Label7.Text = "FROM" + ' + 'cmbWhereOperator + ' + Me.cmbWhereOperator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cmbWhereOperator.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbWhereOperator.FormattingEnabled = True + Me.cmbWhereOperator.Items.AddRange(New Object() {"=", "<>", "<", ">"}) + Me.cmbWhereOperator.Location = New System.Drawing.Point(304, 75) + Me.cmbWhereOperator.Name = "cmbWhereOperator" + Me.cmbWhereOperator.Size = New System.Drawing.Size(47, 21) + Me.cmbWhereOperator.TabIndex = 28 + ' + 'cmbFromTables + ' + Me.cmbFromTables.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cmbFromTables.Enabled = False + Me.cmbFromTables.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbFromTables.FormattingEnabled = True + Me.cmbFromTables.Location = New System.Drawing.Point(363, 47) + Me.cmbFromTables.Name = "cmbFromTables" + Me.cmbFromTables.Size = New System.Drawing.Size(234, 21) + Me.cmbFromTables.TabIndex = 22 + ' + 'cmbWhereColumns + ' + Me.cmbWhereColumns.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cmbWhereColumns.Enabled = False + Me.cmbWhereColumns.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbWhereColumns.FormattingEnabled = True + Me.cmbWhereColumns.Location = New System.Drawing.Point(63, 75) + Me.cmbWhereColumns.Name = "cmbWhereColumns" + Me.cmbWhereColumns.Size = New System.Drawing.Size(233, 21) + Me.cmbWhereColumns.TabIndex = 27 + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.Location = New System.Drawing.Point(6, 78) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(37, 13) + Me.Label8.TabIndex = 23 + Me.Label8.Text = "WHERE" + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(628, 47) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(217, 52) + Me.Label5.TabIndex = 87 + Me.Label5.Text = "Hinweis:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Definieren Sie den SQL-Befehl indem Sie " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "1. Tabelle/View" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "2" + ' 'SQLConfigAutoIndex ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(833, 251) + Me.ClientSize = New System.Drawing.Size(858, 477) + Me.Controls.Add(Label3) + Me.Controls.Add(Me.GroupBox4) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.dgvPlaceholders) + Me.Controls.Add(Me.btnaddManualIdx) + Me.Controls.Add(Me.cmbManualIDX) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.lblSave) Me.Controls.Add(Me.btnsave) Me.Controls.Add(Me.Button1) @@ -172,9 +433,13 @@ Partial Class SQLConfigAutoIndex Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "SQLConfigAutoIndex" - Me.Text = "Konfiguration SQL" + Me.Text = "SQL-Editor für automatischen Index" CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBDD_INDEX_MANBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupBox4.ResumeLayout(False) + Me.GroupBox4.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -189,4 +454,26 @@ Partial Class SQLConfigAutoIndex Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents btnsave As System.Windows.Forms.Button Friend WithEvents lblSave As System.Windows.Forms.Label + Friend WithEvents Label1 As System.Windows.Forms.Label + Friend WithEvents cmbManualIDX As System.Windows.Forms.ComboBox + Friend WithEvents TBDD_INDEX_MANBindingSource As System.Windows.Forms.BindingSource + Friend WithEvents TBDD_INDEX_MANTableAdapter As Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_MANTableAdapter + Friend WithEvents btnaddManualIdx As System.Windows.Forms.Button + Friend WithEvents Label2 As System.Windows.Forms.Label + Friend WithEvents dgvPlaceholders As System.Windows.Forms.DataGridView + Friend WithEvents colPlaceholder As System.Windows.Forms.DataGridViewTextBoxColumn + Friend WithEvents colReplace As System.Windows.Forms.DataGridViewTextBoxColumn + Friend WithEvents GroupBox4 As System.Windows.Forms.GroupBox + Friend WithEvents txtCondition As System.Windows.Forms.TextBox + Friend WithEvents Label6 As System.Windows.Forms.Label + Friend WithEvents cmbSelectColumns As System.Windows.Forms.ComboBox + Friend WithEvents Label7 As System.Windows.Forms.Label + Friend WithEvents cmbWhereOperator As System.Windows.Forms.ComboBox + Friend WithEvents cmbFromTables As System.Windows.Forms.ComboBox + Friend WithEvents cmbWhereColumns As System.Windows.Forms.ComboBox + Friend WithEvents Label8 As System.Windows.Forms.Label + Friend WithEvents radioTable As System.Windows.Forms.RadioButton + Friend WithEvents radioView As System.Windows.Forms.RadioButton + Friend WithEvents Label4 As System.Windows.Forms.Label + Friend WithEvents Label5 As System.Windows.Forms.Label End Class diff --git a/Global_Indexer/frmSQLConfigAutoIndex.resx b/Global_Indexer/frmSQLConfigAutoIndex.resx index 7edc170..8794a1a 100644 --- a/Global_Indexer/frmSQLConfigAutoIndex.resx +++ b/Global_Indexer/frmSQLConfigAutoIndex.resx @@ -120,6 +120,9 @@ False + + False + 127, 17 @@ -132,4 +135,16 @@ 609, 17 + + 782, 17 + + + 1017, 17 + + + True + + + True + \ No newline at end of file diff --git a/Global_Indexer/frmSQLConfigAutoIndex.vb b/Global_Indexer/frmSQLConfigAutoIndex.vb index 706abd0..88124db 100644 --- a/Global_Indexer/frmSQLConfigAutoIndex.vb +++ b/Global_Indexer/frmSQLConfigAutoIndex.vb @@ -1,66 +1,115 @@ Imports Oracle.ManagedDataAccess.Client +Imports System.Text.RegularExpressions + Public Class SQLConfigAutoIndex + Dim CurrentPosition As Integer = 0 + Dim CurrentTableType As String + Private Sub btnVorschlag_Click(sender As Object, e As EventArgs) Handles btnVorschlag.Click TestSQL(cmbConnection.SelectedValue, SQL_ERGEBNISTextBox.Text) End Sub - Private Sub TestSQL(conid As Integer, sql_Vorschlag As String) + Private Sub TestSQL(conid As Integer, sql_command As String) Try - Dim connectionString As String - - Dim i As Integer - - connectionString = ClassFormFunctions.GetConnectionString(conid) - If connectionString <> "" Then - If connectionString.Contains("Initial Catalog=") Then - Dim sqlCnn As SqlClient.SqlConnection - Dim sqlCmd As SqlClient.SqlCommand - Dim adapter As New SqlClient.SqlDataAdapter - Dim NewDataset As New DataSet - sqlCnn = New SqlClient.SqlConnection(connectionString) - sqlCnn.Open() - sqlCmd = New SqlClient.SqlCommand(sql_Vorschlag, sqlCnn) - adapter.SelectCommand = sqlCmd - adapter.Fill(NewDataset) - Dim msg As String - For i = 0 To NewDataset.Tables(0).Rows.Count - 1 - msg &= NewDataset.Tables(0).Rows(i).Item(0) & vbNewLine - If i = 30 Then - Exit For - End If - Next - adapter.Dispose() - sqlCmd.Dispose() - sqlCnn.Close() - MsgBox("Folgende Daten wurden erfolgreich abgerufen: " & vbNewLine & vbNewLine & msg & vbNewLine & vbNewLine & "Das Ergebnis wurd auf 30 Zeilen eingeschränkt!", MsgBoxStyle.Information) - - ElseIf connectionString.StartsWith("Data Source=") And connectionString.Contains(";Persist Security Info=True;User Id=") Then - Dim sqlCnn As OracleConnection - Dim sqlCmd As OracleCommand - Dim adapter As OracleDataAdapter - Dim NewDataset As DataSet - sqlCnn = New OracleConnection(connectionString) - ' Try - sqlCnn.Open() - sqlCmd = New OracleCommand(sql_Vorschlag, sqlCnn) - adapter.SelectCommand = sqlCmd - adapter.Fill(NewDataset) - Dim msg As String - For i = 0 To NewDataset.Tables(0).Rows.Count - 1 - msg &= NewDataset.Tables(0).Rows(i).Item(0) & vbNewLine - If i = 30 Then - Exit For - End If - Next - adapter.Dispose() - sqlCmd.Dispose() - sqlCnn.Close() - MsgBox("Folgende Daten wurden erfolgreich abgerufen: " & vbNewLine & vbNewLine & msg & vbNewLine & vbNewLine & "Das Ergebnis wurd auf 30 Zeilen eingeschränkt!", MsgBoxStyle.Information) + Dim query As String = sql_command + + For Each row As DataGridViewRow In dgvPlaceholders.Rows + Dim placeholder As String = row.Cells(0).Value + Dim replacement As String = row.Cells(1).Value + + ' Wenn Ersetzung ausgefüllt wurde, Platzhalter damit ersetzen + If Not String.IsNullOrEmpty(replacement) Then + query = query.Replace(placeholder, replacement) + Else + MsgBox("Bitte geben Sie für den Platzhalter " & placeholder & " einen Wert an!", MsgBoxStyle.Exclamation, "Fehlende Platzhalter Ersetzung") + Exit Sub + End If + Next + + Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True) + Dim dt As DataTable + If typeCS.Length > 0 Then + Dim CS As String + CS = ClassFormFunctions.GetConnectionString(cmbConnection.SelectedValue) + If typeCS.ToUpper = "Oracle".ToUpper Then + dt = ClassDatabase.Oracle_Return_Datatable(query, CS, True) + Else + dt = ClassDatabase.Return_Datatable_CS(query, CS, True) End If - Else - MsgBox("Keine gültige ConnectionID", MsgBoxStyle.Exclamation) End If + If Not IsNothing(dt) Then + If dt.Rows.Count = 1 Then + MsgBox("Es wurde genau 1 Datensatz zurückgegeben!", MsgBoxStyle.Information) + End If + CURRENT_SQLRESULT = sql_command + DTSQL_RESULT = dt + frmSQL_Result.ShowDialog() + End If + + 'If ds IsNot Nothing Then + ' dgvResult.DataSource = ds.Tables(0) + 'End If + + + + + 'Try + ' Dim connectionString As String + + ' Dim i As Integer + + ' connectionString = ClassFormFunctions.GetConnectionString(conid) + ' If connectionString <> "" Then + ' If connectionString.Contains("Initial Catalog=") Then + ' Dim sqlCnn As SqlClient.SqlConnection + ' Dim sqlCmd As SqlClient.SqlCommand + ' Dim adapter As New SqlClient.SqlDataAdapter + ' Dim NewDataset As New DataSet + ' sqlCnn = New SqlClient.SqlConnection(connectionString) + ' sqlCnn.Open() + ' sqlCmd = New SqlClient.SqlCommand(sql_Vorschlag, sqlCnn) + ' adapter.SelectCommand = sqlCmd + ' adapter.Fill(NewDataset) + ' Dim msg As String + ' For i = 0 To NewDataset.Tables(0).Rows.Count - 1 + ' msg &= NewDataset.Tables(0).Rows(i).Item(0) & vbNewLine + ' If i = 30 Then + ' Exit For + ' End If + ' Next + ' adapter.Dispose() + ' sqlCmd.Dispose() + ' sqlCnn.Close() + ' MsgBox("Folgende Daten wurden erfolgreich abgerufen: " & vbNewLine & vbNewLine & msg & vbNewLine & vbNewLine & "Das Ergebnis wurd auf 30 Zeilen eingeschränkt!", MsgBoxStyle.Information) + + ' ElseIf connectionString.StartsWith("Data Source=") And connectionString.Contains(";Persist Security Info=True;User Id=") Then + ' Dim sqlCnn As OracleConnection + ' Dim sqlCmd As OracleCommand + ' Dim adapter As OracleDataAdapter + ' Dim NewDataset As DataSet + ' sqlCnn = New OracleConnection(connectionString) + ' ' Try + ' sqlCnn.Open() + ' sqlCmd = New OracleCommand(sql_Vorschlag, sqlCnn) + ' adapter.SelectCommand = sqlCmd + ' adapter.Fill(NewDataset) + ' Dim msg As String + ' For i = 0 To NewDataset.Tables(0).Rows.Count - 1 + ' msg &= NewDataset.Tables(0).Rows(i).Item(0) & vbNewLine + ' If i = 30 Then + ' Exit For + ' End If + ' Next + ' adapter.Dispose() + ' sqlCmd.Dispose() + ' sqlCnn.Close() + ' MsgBox("Folgende Daten wurden erfolgreich abgerufen: " & vbNewLine & vbNewLine & msg & vbNewLine & vbNewLine & "Das Ergebnis wurd auf 30 Zeilen eingeschränkt!", MsgBoxStyle.Information) + ' End If + ' Else + ' MsgBox("Keine gültige ConnectionID", MsgBoxStyle.Exclamation) + ' End If + Catch ex As Exception ClassLogger.Add(" - Unvorhergesehener Fehler bei TestSQL - Fehler: " & vbNewLine & ex.Message) MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei TestSQL:") @@ -68,14 +117,25 @@ Public Class SQLConfigAutoIndex End Sub Private Sub frmSQLSuggestion_Load(sender As Object, e As EventArgs) Handles Me.Load - 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen. - Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBDD_CONNECTIONTableAdapter.Fill(Me.MyDataset.TBDD_CONNECTION) - Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO) - If DT.Rows.Count = 1 Then - Me.cmbConnection.SelectedValue = DT.Rows(0).Item("CONNECTION_ID") - SQL_ERGEBNISTextBox.Text = DT.Rows(0).Item("SQL_RESULT") - End If + Try + 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen. + Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_CONNECTIONTableAdapter.Fill(Me.MyDataset.TBDD_CONNECTION) + Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO) + If DT.Rows.Count = 1 Then + Me.cmbConnection.SelectedValue = DT.Rows(0).Item("CONNECTION_ID") + SQL_ERGEBNISTextBox.Text = DT.Rows(0).Item("SQL_RESULT") + End If + Try + Me.TBDD_INDEX_MANTableAdapter.Fill(Me.MyDataset.TBDD_INDEX_MAN, CURRENT_DOKART_ID) + Catch ex As System.Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Load Manual Indices:") + End Try + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in LoadFormData:") + End Try + End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click @@ -93,10 +153,10 @@ Public Class SQLConfigAutoIndex Dim insresultstring = SQL_ERGEBNISTextBox.Text.Replace("'", "''") If insresultstring <> origresultstring Then Dim cmd As String - cmd = "UPDATE TBDD_INDEX_AUTOM SET CONNECTION_ID = " & cmbConnection.SelectedValue & ",SQL_RESULT = '" & insresultstring & "',CHANGED_WHO = '" & _ + cmd = "UPDATE TBDD_INDEX_AUTOM SET CONNECTION_ID = " & cmbConnection.SelectedValue & ", SQL_RESULT = '" & insresultstring & "', CHANGED_WHO = '" & _ Environment.UserName & "' WHERE GUID = " & CURRENT_INDEXAUTO If ClassDatabase.Execute_non_Query(cmd, True) = True Then - lblSave.Text = "SQL-Daten erfolgreich gespeichert - " & Now + lblSave.Text = "SQL-Daten gespeichert - " & Now Me.lblSave.Visible = True Else Me.lblSave.Visible = False @@ -117,4 +177,194 @@ Public Class SQLConfigAutoIndex e.Handled = True End If End Sub + + Private Sub btnaddManualIdx_Click(sender As Object, e As EventArgs) Handles btnaddManualIdx.Click + If cmbManualIDX.SelectedIndex <> -1 Then + If Not cmbManualIDX.Text = String.Empty Then + Dim placeholder As String = "[%" & cmbManualIDX.Text & "]" + SQL_ERGEBNISTextBox.Text = SQL_ERGEBNISTextBox.Text.Insert(CurrentPosition, placeholder) + End If + End If + End Sub + Dim AtPlaceholderPattern As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" + + Private Sub SQL_ERGEBNISTextBox_KeyUp(sender As Object, e As KeyEventArgs) Handles SQL_ERGEBNISTextBox.KeyUp + CurrentPosition = SQL_ERGEBNISTextBox.SelectionStart + End Sub + + Private Sub SQL_ERGEBNISTextBox_MouseUp(sender As Object, e As MouseEventArgs) Handles SQL_ERGEBNISTextBox.MouseUp + CurrentPosition = SQL_ERGEBNISTextBox.SelectionStart + End Sub + Private Sub SQL_ERGEBNISTextBox_TextChanged(sender As Object, e As EventArgs) Handles SQL_ERGEBNISTextBox.TextChanged + CurrentPosition = SQL_ERGEBNISTextBox.SelectionStart + If SQL_ERGEBNISTextBox.Text.Trim().Count = 0 Then + dgvPlaceholders.Enabled = False + Else + dgvPlaceholders.Enabled = True + End If + CheckForPlaceholders() + End Sub + Public Property Value() As String + Get + Return SQL_ERGEBNISTextBox.Text + End Get + Set(value As String) + SQL_ERGEBNISTextBox.Text = value + End Set + End Property + Private Sub CheckForPlaceholders() + Dim count As Integer = 0 + Dim text As String = Me.Value + Dim atPlaceholderRegex = New Regex(AtPlaceholderPattern, RegexOptions.IgnoreCase) + Dim matches As MatchCollection = atPlaceholderRegex.Matches(text) + + dgvPlaceholders.Rows.Clear() + + For Each match As Match In matches + dgvPlaceholders.Rows.Add({match.Value, ""}) + Next + End Sub + + Private Sub cmbSelectConditions_Changed(sender As Object, e As EventArgs) Handles cmbSelectColumns.SelectedIndexChanged, cmbFromTables.SelectedIndexChanged, cmbWhereColumns.SelectedIndexChanged, cmbWhereOperator.SelectedIndexChanged, txtCondition.TextChanged + Try + Dim sql = "" + Dim column, table, column2, op, condition As String + Dim isNumberRegex = New Regex("^\d+$") + + column = cmbSelectColumns.Text + table = cmbFromTables.Text + column2 = cmbWhereColumns.Text + op = cmbWhereOperator.Text + condition = txtCondition.Text + + If column <> "" And table <> "" Then + sql = String.Format("SELECT [{0}] FROM [{1}]", column, table) + + If column2 <> "" And op <> "" And condition <> "" Then + + If isNumberRegex.Match(condition).Success = False Then + condition = String.Format("'{0}'", condition) + End If + + sql &= String.Format(" WHERE [{0}] {1} {2}", column2, op, condition) + ElseIf column2 <> "" And op <> "" And condition = "" Then + sql &= String.Format(" WHERE [{0}] {1}", column2, op) + ElseIf column2 <> "" And op = "" And condition = "" Then + sql &= String.Format(" WHERE '{0}'", column2) + End If + + End If + + SQL_ERGEBNISTextBox.Text = sql + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in cmbSelectConditions_Changed:") + End Try + + End Sub + + Private Sub radioTable_CheckedChanged(sender As Object, e As EventArgs) Handles radioTable.CheckedChanged + If radioTable.Checked Then + CurrentTableType = "TABLE" + End If + EnableTables() + End Sub + + Private Sub radioView_CheckedChanged(sender As Object, e As EventArgs) Handles radioView.CheckedChanged + If radioView.Checked Then + CurrentTableType = "VIEW" + End If + EnableTables() + End Sub + Private Sub cmbFromTables_SelectedIndexChanged() Handles cmbFromTables.SelectedIndexChanged + If cmbFromTables.Text <> "" Then + EnableColumns() + Else + EnableColumns(False) + End If + End Sub + Private Sub EnableTables() + cmbFromTables.Enabled = True + End Sub + Private Sub EnableColumns(Optional enabled = True) + cmbSelectColumns.Enabled = enabled + cmbWhereColumns.Enabled = enabled + End Sub + Private Sub cmbTables_DropDown(sender As Object, e As EventArgs) Handles cmbFromTables.DropDown + Try + Dim type As String + + If CurrentTableType = "TABLE" Then + type = "'BASE TABLE'" + ElseIf CurrentTableType = "VIEW" Then + type = "'VIEW'" + End If + + Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True) + Dim dt As DataTable + If typeCS.Length > 0 Then + Dim SQL As String = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME" + Dim CS As String + CS = ClassFormFunctions.GetConnectionString(cmbConnection.SelectedValue) + If typeCS.ToUpper = "Oracle".ToUpper Then + + + If type = "'VIEW'" Then + 'DB-Abfrage für alle Views definieren + SQL = "select VIEW_NAME from USER_VIEWS" + Else + 'DB-Abfrage für alle Tables definieren + SQL = "select TABLE_NAME from USER_TABLES" + End If + dt = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True) + Else + SQL = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME" + dt = ClassDatabase.Return_Datatable_CS(SQL, CS, True) + End If + If dt IsNot Nothing Then + cmbFromTables.Items.Clear() + For Each row As DataRow In dt.Rows + cmbFromTables.Items.Add(row.Item(0)) + Next + End If + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in cmbTables_DropDown:") + End Try + + End Sub + Private Sub cmbColumns_DropDown(sender As Object, e As EventArgs) Handles cmbSelectColumns.DropDown + Dim table = cmbFromTables.Text + GetColumns(table, cmbSelectColumns) + End Sub + Private Sub GetColumns(tableName As String, ByRef combobox As ComboBox) + Try + Dim CS As String + CS = ClassFormFunctions.GetConnectionString(cmbConnection.SelectedValue) + Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True) + Dim SQL As String + Dim DT As DataTable + If typeCS.ToUpper = "Oracle".ToUpper Then + SQL = "select COLUMN_NAME from USER_TAB_COLS where TABLE_NAME='" & tableName & "' order by COLUMN_NAME" + DT = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True) + Else + SQL = "SELECT name FROM sys.columns WHERE object_id = OBJECT_ID('" & tableName & "') ORDER BY name" + DT = ClassDatabase.Return_Datatable_CS(SQL, CS, True) + End If + + If DT IsNot Nothing Then + combobox.Items.Clear() + For Each row As DataRow In DT.Rows + combobox.Items.Add(row.Item(0)) + Next + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in GetColumns:") + End Try + + End Sub + + Private Sub cmbWhereColumns_DropDown(sender As Object, e As EventArgs) Handles cmbWhereColumns.DropDown + Dim table = cmbFromTables.Text + GetColumns(table, cmbWhereColumns) + End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmSQLSuggestion.Designer.vb b/Global_Indexer/frmSQLSuggestion.Designer.vb index 1883958..e977c5f 100644 --- a/Global_Indexer/frmSQLSuggestion.Designer.vb +++ b/Global_Indexer/frmSQLSuggestion.Designer.vb @@ -61,9 +61,11 @@ Partial Class frmSQLSuggestion SQL_UEBERPRUEFUNGLabel.AutoSize = True SQL_UEBERPRUEFUNGLabel.Location = New System.Drawing.Point(533, 66) SQL_UEBERPRUEFUNGLabel.Name = "SQL_UEBERPRUEFUNGLabel" - SQL_UEBERPRUEFUNGLabel.Size = New System.Drawing.Size(207, 13) + SQL_UEBERPRUEFUNGLabel.Size = New System.Drawing.Size(437, 39) SQL_UEBERPRUEFUNGLabel.TabIndex = 51 - SQL_UEBERPRUEFUNGLabel.Text = "SQL-Überprüfung für manuellen Index:" + SQL_UEBERPRUEFUNGLabel.Text = "SQL-Überprüfung für manuellen Index:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Definieren Sie hier einen SQL-Befehl der di" & _ + "e Auswahl auf VORHANDEN überprüft." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(SELECT COUNT(*) FROM IHRE_KEY_TABLE WHERE I" & _ + "HRE_WERT_SPALTE = INPUTVALUE)" ' 'GroupBox1 ' @@ -72,18 +74,18 @@ Partial Class frmSQLSuggestion Me.GroupBox1.Controls.Add(Me.Label2) Me.GroupBox1.Location = New System.Drawing.Point(15, 229) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(351, 77) + Me.GroupBox1.Size = New System.Drawing.Size(351, 93) Me.GroupBox1.TabIndex = 52 Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Rückgabewert testen:" + Me.GroupBox1.Text = "Nachbearbeitung testen:" ' 'btnTestNachbearbeitung ' Me.btnTestNachbearbeitung.Image = Global.Global_Indexer.My.Resources.Resources.database_go Me.btnTestNachbearbeitung.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTestNachbearbeitung.Location = New System.Drawing.Point(227, 43) + Me.btnTestNachbearbeitung.Location = New System.Drawing.Point(227, 59) Me.btnTestNachbearbeitung.Name = "btnTestNachbearbeitung" - Me.btnTestNachbearbeitung.Size = New System.Drawing.Size(103, 28) + Me.btnTestNachbearbeitung.Size = New System.Drawing.Size(103, 27) Me.btnTestNachbearbeitung.TabIndex = 1 Me.btnTestNachbearbeitung.Text = "Test" Me.btnTestNachbearbeitung.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -91,7 +93,7 @@ Partial Class frmSQLSuggestion ' 'txtTest_idxMan ' - Me.txtTest_idxMan.Location = New System.Drawing.Point(9, 46) + Me.txtTest_idxMan.Location = New System.Drawing.Point(9, 63) Me.txtTest_idxMan.Name = "txtTest_idxMan" Me.txtTest_idxMan.Size = New System.Drawing.Size(212, 22) Me.txtTest_idxMan.TabIndex = 0 @@ -101,9 +103,10 @@ Partial Class frmSQLSuggestion Me.Label2.AutoSize = True Me.Label2.Location = New System.Drawing.Point(6, 21) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(324, 13) + Me.Label2.Size = New System.Drawing.Size(324, 39) Me.Label2.TabIndex = 0 - Me.Label2.Text = "Geben Sie hier den Ausgangswert des manuellen Indexes ein:" + Me.Label2.Text = "Geben Sie hier den Ausgangswert des manuellen Indexes ein." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Die Nachbearbeitung w" & _ + "ird durchlaufen und Ihnen wird der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Ergebniswert angezeigt." ' 'btnVorschlag ' @@ -130,10 +133,10 @@ Partial Class frmSQLSuggestion 'SQL_UEBERPRUEFUNGTextBox ' Me.SQL_UEBERPRUEFUNGTextBox.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.SQL_UEBERPRUEFUNGTextBox.Location = New System.Drawing.Point(536, 82) + Me.SQL_UEBERPRUEFUNGTextBox.Location = New System.Drawing.Point(536, 112) Me.SQL_UEBERPRUEFUNGTextBox.Multiline = True Me.SQL_UEBERPRUEFUNGTextBox.Name = "SQL_UEBERPRUEFUNGTextBox" - Me.SQL_UEBERPRUEFUNGTextBox.Size = New System.Drawing.Size(351, 137) + Me.SQL_UEBERPRUEFUNGTextBox.Size = New System.Drawing.Size(434, 106) Me.SQL_UEBERPRUEFUNGTextBox.TabIndex = 49 ' 'cmbConnection @@ -195,7 +198,7 @@ Partial Class frmSQLSuggestion ' Me.Button2.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(797, 275) + Me.Button2.Location = New System.Drawing.Point(880, 229) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(90, 31) Me.Button2.TabIndex = 55 @@ -205,11 +208,10 @@ Partial Class frmSQLSuggestion ' 'lblSave ' - Me.lblSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblSave.AutoSize = True Me.lblSave.BackColor = System.Drawing.Color.Yellow Me.lblSave.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblSave.Location = New System.Drawing.Point(533, 250) + Me.lblSave.Location = New System.Drawing.Point(679, 237) Me.lblSave.Name = "lblSave" Me.lblSave.Size = New System.Drawing.Size(195, 15) Me.lblSave.TabIndex = 79 @@ -220,7 +222,7 @@ Partial Class frmSQLSuggestion ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(907, 326) + Me.ClientSize = New System.Drawing.Size(973, 326) Me.Controls.Add(Me.lblSave) Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.Button1) diff --git a/Global_Indexer/frmSQL_Admin.vb b/Global_Indexer/frmSQL_Admin.vb index a6d3c79..0679295 100644 --- a/Global_Indexer/frmSQL_Admin.vb +++ b/Global_Indexer/frmSQL_Admin.vb @@ -10,10 +10,8 @@ Public Class frmSQL_Admin If txtSQL.Text.ToLower.StartsWith("select") Then Dim dt As DataTable = ClassDatabase.Return_Datatable(txtSQL.Text, True) If Not dt Is Nothing Then - If dt.Rows.Count > 0 Then - XtraTabControl1.SelectedTabPageIndex = 1 - BindingSource1.DataSource = dt - End If + XtraTabControl1.SelectedTabPageIndex = 1 + BindingSource1.DataSource = dt End If Else Dim result As MsgBoxResult = MsgBox("Bitte bestätigen Sie das Ausführen des SQL-Befehls?", MsgBoxStyle.YesNo, "Bestätigung erforderlich:") @@ -36,7 +34,7 @@ Public Class frmSQL_Admin End If End If - + End Sub Sub Load_ConString(constr As String) Dim csb As New SqlClient.SqlConnectionStringBuilder diff --git a/Global_Indexer/frmStart.Designer.vb b/Global_Indexer/frmStart.Designer.vb index 9b8e1fe..b801b7c 100644 --- a/Global_Indexer/frmStart.Designer.vb +++ b/Global_Indexer/frmStart.Designer.vb @@ -33,6 +33,7 @@ Partial Class frmStart Me.GrundeinstellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FrmHotkeyAddToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HistoryIndexierteDateienToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tslblstatus = New System.Windows.Forms.ToolStripStatusLabel() Me.tslblFW = New System.Windows.Forms.ToolStripStatusLabel() @@ -43,7 +44,6 @@ Partial Class frmStart Me.TimerFolderWatch = New System.Windows.Forms.Timer(Me.components) Me.TimerClose3Minutes = New System.Windows.Forms.Timer(Me.components) Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) - Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MenuStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() @@ -55,7 +55,7 @@ Partial Class frmStart Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KonfigurationToolStripMenuItem}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(265, 24) + Me.MenuStrip1.Size = New System.Drawing.Size(305, 24) Me.MenuStrip1.TabIndex = 5 Me.MenuStrip1.Text = "MenuStrip1" ' @@ -114,13 +114,19 @@ Partial Class frmStart Me.HistoryIndexierteDateienToolStripMenuItem.Size = New System.Drawing.Size(217, 22) Me.HistoryIndexierteDateienToolStripMenuItem.Text = "History - Indexierte Dateien" ' + 'InfoToolStripMenuItem + ' + Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem" + Me.InfoToolStripMenuItem.Size = New System.Drawing.Size(217, 22) + Me.InfoToolStripMenuItem.Text = "Info" + ' 'StatusStrip1 ' Me.StatusStrip1.AllowDrop = True Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblstatus, Me.tslblFW}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 111) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 99) Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(265, 22) + Me.StatusStrip1.Size = New System.Drawing.Size(305, 22) Me.StatusStrip1.TabIndex = 6 Me.StatusStrip1.Text = "StatusStrip1" ' @@ -189,19 +195,13 @@ Partial Class frmStart Me.NotifyIcon1.Icon = CType(resources.GetObject("NotifyIcon1.Icon"), System.Drawing.Icon) Me.NotifyIcon1.Text = "GlobalIndexer" ' - 'InfoToolStripMenuItem - ' - Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem" - Me.InfoToolStripMenuItem.Size = New System.Drawing.Size(217, 22) - Me.InfoToolStripMenuItem.Text = "Info" - ' 'frmStart ' Me.AllowDrop = True Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.SystemColors.ActiveCaption - Me.ClientSize = New System.Drawing.Size(265, 133) + Me.ClientSize = New System.Drawing.Size(305, 121) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.MenuStrip1) Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index ad049c1..d24e4ee 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -432,6 +432,9 @@ /+AAH/////////////////////////////////////////////8= + + 203 + AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEAAABILAAASCwAAAAAAAAAA diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 1b6c9ad..116f8c4 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -105,7 +105,7 @@ Public Class frmStart Dim sql As String = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')" DTACTUAL_FILES = Nothing DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True) - + ABORT_INDEXING = False If DTACTUAL_FILES.Rows.Count > 1 Then frmIndexFileList.ShowDialog() DTACTUAL_FILES = Nothing @@ -142,20 +142,29 @@ Public Class frmStart Dim result As MsgBoxResult result = MessageBox.Show("Sie brechen nun zum zweiten Mal den Indexierungsvorgang ab!" & vbNewLine & "Wollen Sie die Indexierung aller Dateien abbrechen?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then + Dim containsfw_file As Boolean = False Try - 'Zuerst die Daten des Ablaufs löschen - ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) + ABORT_INDEXING = True For Each Filerow As DataRow In DTACTUAL_FILES.Rows Dim filestring As String = Filerow.Item("FILENAME2WORK") Dim handletype As String = Filerow.Item("HANDLE_TYPE") + If handletype = "@MSGONLY@" Or handletype = "@ATTMNTEXTRACTED@" Then System.IO.File.Delete(filestring) + ElseIf handletype.StartsWith("@FW") Then + containsfw_file = True End If Next + 'Zuerst die Daten des Ablaufs löschen + ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) + If containsfw_file = True Then + MsgBox("Der Indexierungsprozess beinhaltete (auch) Dateien per Folderwatch!" & vbNewLine & "Diese Dateien wurden nicht gelöscht und verbleiben im Folderwatch-Verzeichnis!" & vbNewLine & "Bitte verschieben Sie die Dateien ggfls.", MsgBoxStyle.Information, "Achtung - Hinweis:") + End If + Catch ex As Exception MsgBox("Fehler bei Abbruch der Indexierung: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - + CURRENT_ABBRUCH = 0 Exit Sub @@ -237,11 +246,15 @@ Public Class frmStart ClassLogger.Add(">> Programmstart: " & Now, False) ClassLogger.Add(">> Username: " & Environment.UserName, False) LoadMyConfig() + If LoadFileExclusion() = False Then + MsgBox("Dies Ausschlusskriterien für Dateien in Folderwatch konnten nicht angelegt werden!", MsgBoxStyle.Information) + End If If MyConnectionString = String.Empty Then frmConfig_Basic.ShowDialog() End If If ClassDatabase.Init() = False Then + ERROR_STATE = "FAILED CONNECTION" MsgBox("Es konnte keine Datenbankverbindung aufgebaut werden!" & vbNewLine & "Bitte prüfen Sie die Konfiguration der Datenbankverbindung und ggfls. den Datenbankserver", MsgBoxStyle.Critical) frmConfig_Basic.ShowDialog() End If @@ -250,16 +263,11 @@ Public Class frmStart START_INCOMPLETE = True Exit Sub End If - If UniversalViewer = String.Empty And My.Settings.DoNot_Show_Documents = False Then - frmConfig_Basic.ShowDialog() - End If - If MyConnectionString = String.Empty Then ClassLogger.Add(" >> Kein Connection-String definiert - Global Indexer wird geschlossen!", False) START_INCOMPLETE = True Exit Sub End If - Refresh_Licence() USER_GUID = ClassDatabase.Execute_Scalar(sql, MyConnectionString) If USER_GUID Is Nothing Then ClassLogger.Add(" - ACHTUNG: User '" & Environment.UserName & "' nicht in der Userverwaltung hinterlegt!", False) @@ -268,18 +276,34 @@ Public Class frmStart START_INCOMPLETE = True Exit Sub Else + Refresh_Licence() CURRENT_USERID = USER_GUID - Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & CURRENT_USERID, MyConnectionString) + If UniversalViewer = String.Empty And My.Settings.DoNot_Show_Documents = False Then + ERROR_STATE = "NO UV" + frmConfig_Basic.ShowDialog() + End If + + + 'Die FolderWatch starten + Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & CURRENT_USERID, MyConnectionString) + Dim folderwatch_SCAN = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & CURRENT_USERID, MyConnectionString) If Not folderwatch Is Nothing Then CURRENT_FOLDERWATCH = folderwatch If FW_started = True Then tslblFW.Visible = True ClassFolderWatcher.StartStop_FolderWatch() End If - If CURRENT_FOLDERWATCH <> "" Then - TimerFolderWatch.Start() + End If + If Not folderwatch_SCAN Is Nothing Then + CURRENT_SCAN_FOLDERWATCH = folderwatch_SCAN + If FWSCAN_started = True Then + tslblFW.Visible = True + ClassFolderWatcher.StartStop_FolderWatchSCAN() End If End If + If CURRENT_FOLDERWATCH <> "" Or CURRENT_SCAN_FOLDERWATCH <> "" Then + TimerFolderWatch.Start() + End If sql = "SELECT MODULE_GI FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))" sql = sql.Replace("@user", Environment.UserName) If ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) = False Then @@ -298,7 +322,11 @@ Public Class frmStart Exit Sub End If sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Global-Indexer'" - ClassDatabase.Execute_non_Query(sql, True) + If ClassDatabase.Execute_non_Query(sql, True) = True Then + + End If + + sql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE) VALUES (" & USER_GUID & ",'Global-Indexer')" ClassDatabase.Execute_non_Query(sql, True) @@ -322,11 +350,15 @@ Public Class frmStart TimerClose3Minutes.Start() End If 'Anzahl der eingeloggten User - UserLoggedin = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBDD_USER_MODULE_LOG_IN WHERE MODULE = 'Global-Indexer'", MyConnectionString) + UserLoggedin = ClassDatabase.Execute_Scalar("select count(*) from TBDD_USER_MODULE_LOG_IN where MODULE = 'Global-Indexer'", MyConnectionString, True) If License_Anzahl < UserLoggedin Then MsgBox("Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & License_Anzahl.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") - ClassLogger.Add(" - Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der Lizenzen für Process-Manager!", False) + ClassLogger.Add(" >> Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der Lizenzen (" & License_Anzahl & ") für Process-Manager!", False) If ISUserAdmin = False Then + 'Anmeldung wieder herausnehmen + sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Global-Indexer'" + ClassDatabase.Execute_non_Query(sql, True) + ClassLogger.Add(" - Wieder abgemeldet", False) START_INCOMPLETE = True Exit Sub Else @@ -339,7 +371,7 @@ Public Class frmStart sql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE MODULE = 'Global-Indexer'" Dim anzahl = ClassDatabase.Execute_Scalar(sql, MyConnectionString) ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) - If LogErrorsOnly = False Then ClassLogger.Add(" - Anzahl Angemeldete User: " & anzahl.ToString, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl Angemeldete User: " & anzahl.ToString, False) If Load_BasicConfig() = False Then START_INCOMPLETE = True Exit Sub @@ -372,7 +404,7 @@ Public Class frmStart Try Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT HOTKEY1, HOTKEY2, ABS(CONVERT(INT, CONVERT(binary(4), NEWID()))) AS HOTKEY_ID FROM TBHOTKEY_USER_PROFILE WHERE USER_ID = " & CURRENT_USERID & " GROUP BY HOTKEY1, HOTKEY2", True) If DT.Rows.Count > 0 Then - If LogErrorsOnly = False Then ClassLogger.Add(" ... " & DT.Rows.Count & " Hotkeys", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> " & DT.Rows.Count & " Hotkey-Profile", False) Dim i As Integer = 0 For Each row As DataRow In DT.Rows i += 1 @@ -391,21 +423,21 @@ Public Class frmStart Select Case row.Item("HOTKEY1") Case "Strg" - If LogErrorsOnly = False Then ClassLogger.Add(" ..." & i.ToString + "|Strg " & row.Item("HOTKEY2").ToString.ToUpper, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Strg " & row.Item("HOTKEY2").ToString.ToUpper, False) HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_CONTROL, row.Item("HOTKEY_ID")) Case "Shift" - If LogErrorsOnly = False Then ClassLogger.Add(" ..." & i.ToString + "|Shift " & row.Item("HOTKEY2").ToString.ToUpper, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Shift " & row.Item("HOTKEY2").ToString.ToUpper, False) HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_SHIFT, row.Item("HOTKEY_ID")) Case "Alt" - If LogErrorsOnly = False Then ClassLogger.Add(" ..." & i.ToString + "|Alt " & row.Item("HOTKEY2").ToString.ToUpper, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Alt " & row.Item("HOTKEY2").ToString.ToUpper, False) HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_ALT, row.Item("HOTKEY_ID")) Case "win" - If LogErrorsOnly = False Then ClassLogger.Add(" ..." & i.ToString + "|Win " & row.Item("HOTKEY2").ToString.ToUpper, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Win " & row.Item("HOTKEY2").ToString.ToUpper, False) HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_WIN, row.Item("HOTKEY_ID")) End Select Next Else - If LogErrorsOnly = False Then ClassLogger.Add(" ... Keine Hotkeys!", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Keine Hotkeys!", False) End If Catch ex As Exception MsgBox("Error in Load_Hotkeys:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -444,20 +476,32 @@ Public Class frmStart If FW_started = True Then 'Prüfen ob alle Files abgearbeitet wurden Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%@FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')" - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True) - If DT.Rows.Count > 0 Then + DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True) + If DTACTUAL_FILES.Rows.Count > 0 Then + ABORT_INDEXING = False ' Dim fil As String Me.TimerFolderWatch.Stop() - For Each row As DataRow In DT.Rows - If ClassFilehandle.IsFileInUse(row.Item(1)) = True Then - CURRENT_WORKFILE = row.Item(1) - CURRENT_FILENAME = row.Item(1) - CURRENT_WORKFILE_GUID = row.Item("GUID") - Open_IndexDialog() + For Each row As DataRow In DTACTUAL_FILES.Rows + If ABORT_INDEXING = True Then + Exit For + End If + Dim FileForWork As String = row.Item(1) + If LogErrorsOnly = False Then ClassLogger.Add(">> In Timer Folderwatch - File: " & FileForWork, False) + Dim fileInUse As Boolean = ClassFilehandle.IsFileInUse(FileForWork) + Dim fileexists As Boolean = System.IO.File.Exists(FileForWork) + If fileInUse = False Then + If fileexists = True Then + CURRENT_WORKFILE = FileForWork + CURRENT_FILENAME = FileForWork + CURRENT_WORKFILE_GUID = row.Item("GUID") + Open_IndexDialog() + Else + ClassLogger.Add(">> Datei existiert (noch) nicht - fileexists?!", False) + End If Else - ClassLogger.Add(">> Datei '" & row.Item(1) & "' kann nicht exclusiv geöffnet werden!", False) + ClassLogger.Add(">> Datei '" & row.Item(1) & "' kann nicht exclusiv geöffnet werden - fileInUse!", False) End If - + Next Me.TimerFolderWatch.Start() End If diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs index 087402c..897b192 100644 --- a/SetupWix/Product.wxs +++ b/SetupWix/Product.wxs @@ -1,7 +1,7 @@ - + @@ -136,9 +136,7 @@ - - - +