From cfeec0d25742fd0ec3793d4618fa856f7d1561c6 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 23 Sep 2019 10:08:42 +0200 Subject: [PATCH] MoveRename, InvalidPaths --- ToolCollection/ClassMO_RE.vb | 6 +- ToolCollection/DS_More.Designer.vb | 14 +-- ToolCollection/DS_More.xsc | 31 +------ ToolCollection/DS_More.xsd | 40 ++++---- .../My Project/Resources.Designer.vb | 10 ++ ToolCollection/My Project/Resources.resx | 55 +++++------ .../My Project/Settings.Designer.vb | 45 +++------ ToolCollection/My Project/Settings.settings | 26 ++---- ToolCollection/MyDataset.Designer.vb | 4 +- ToolCollection/MyDataset.xsd | 18 ++-- ToolCollection/MyDataset.xss | 2 +- .../Resources/folder_Closed_16xMD.png | Bin 0 -> 219 bytes ToolCollection/ToolCollection.vbproj | 1 + ToolCollection/app.config | 9 +- ToolCollection/clsNIFulltext.vb | 39 ++++---- ToolCollection/frmNIHauptseite.vb | 22 ++++- ToolCollection/frmNIMoveRename.Designer.vb | 84 ++++++++++------- ToolCollection/frmNIMoveRename.resx | 3 + ToolCollection/frmNIMoveRename.vb | 33 ++++++- ...frmNIMoveRenameNamenkonvention.designer.vb | 2 +- .../frmNIMoveRenameNamenkonvention.resx | 2 +- ToolCollection/frmNIProfileigenschaften.vb | 6 ++ .../frmNIVerknuepfungen.Designer.vb | 87 +++++++++--------- ToolCollection/frmNIVerknuepfungen.vb | 51 ++++------ ToolCollection/frmStart.vb | 2 +- 25 files changed, 297 insertions(+), 295 deletions(-) create mode 100644 ToolCollection/Resources/folder_Closed_16xMD.png diff --git a/ToolCollection/ClassMO_RE.vb b/ToolCollection/ClassMO_RE.vb index fa75d1f..7984402 100644 --- a/ToolCollection/ClassMO_RE.vb +++ b/ToolCollection/ClassMO_RE.vb @@ -2,7 +2,7 @@ Imports System.IO Imports WINDREAMLib Imports DigitalData.Modules.Logging -Public Class ClassMO_RE +Public Class ClassMO_REOld Private Shared _Logger As DigitalData.Modules.Logging.Logger Private Shared _windreamNI As ClassNIWindream Sub New(LogConfig As LogConfig) @@ -12,7 +12,7 @@ Public Class ClassMO_RE Public Shared Function Return_Datatable(Select_anweisung As String) Try Dim sw As New ClassStopwatch("Return_Datatable") - Dim SQLconnection As New SqlClient.SqlConnection(My.Settings.DD_DMSConnectionString) + Dim SQLconnection As New SqlClient.SqlConnection(My.Settings.DDECMConString) Dim SQLcommand As New SqlCommand(Select_anweisung, SQLconnection) SQLconnection.Open() @@ -33,7 +33,7 @@ Public Class ClassMO_RE Public Shared Function Execute_Command(ExecuteCMD As String) Try Dim sw As New ClassStopwatch("Execute_MSSQL_Command") - Dim SQLconnection As New SqlClient.SqlConnection(My.Settings.DD_DMSConnectionString) + Dim SQLconnection As New SqlClient.SqlConnection(My.Settings.DDECMConString) Dim SQLcommand As New SqlCommand(ExecuteCMD, SQLconnection) SQLconnection.Open() SQLcommand.ExecuteNonQuery() diff --git a/ToolCollection/DS_More.Designer.vb b/ToolCollection/DS_More.Designer.vb index 631ec97..ecbba8d 100644 --- a/ToolCollection/DS_More.Designer.vb +++ b/ToolCollection/DS_More.Designer.vb @@ -4524,7 +4524,7 @@ Namespace DS_MoreTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DD_DMSConnectionString + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DD_DMSConnectionString + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DD_DMSConnectionString + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DD_DMSConnectionString + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DD_DMSConnectionString + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DD_DMSConnectionString + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DD_DMSConnectionString + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString End Sub --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/ToolCollection/DS_More.xsd b/ToolCollection/DS_More.xsd index ce912cd..5004509 100644 --- a/ToolCollection/DS_More.xsd +++ b/ToolCollection/DS_More.xsd @@ -4,12 +4,12 @@ - + - + DELETE FROM [TBMO_RE_KUNDEN] WHERE (([GUID] = @Original_GUID) AND ([KUNDEN_NAME] = @Original_KUNDEN_NAME) AND ((@IsNull_KUNDE_KURZ = 1 AND [KUNDE_KURZ] IS NULL) OR ([KUNDE_KURZ] = @Original_KUNDE_KURZ)) AND ([AKTIV] = @Original_AKTIV) AND ([ERSTELLTWER] = @Original_ERSTELLTWER) AND ([ERSTELLTWANN] = @Original_ERSTELLTWANN) AND ((@IsNull_GEAENDERTWER = 1 AND [GEAENDERTWER] IS NULL) OR ([GEAENDERTWER] = @Original_GEAENDERTWER)) AND ((@IsNull_GEAENDERTWANN = 1 AND [GEAENDERTWANN] IS NULL) OR ([GEAENDERTWANN] = @Original_GEAENDERTWANN))) @@ -81,7 +81,7 @@ SELECT GUID, KUNDEN_NAME, KUNDE_KURZ, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEAENDER - + DELETE FROM [TBMO_RE_DOKART_KUNDE] WHERE (([GUID] = @Original_GUID) AND ([KUNDEN_ID] = @Original_KUNDEN_ID) AND ([DA_ID] = @Original_DA_ID) AND ((@IsNull_ZIELORDNER = 1 AND [ZIELORDNER] IS NULL) OR ([ZIELORDNER] = @Original_ZIELORDNER)) AND ([ERFASSTWER] = @Original_ERFASSTWER) AND ([ERFASSTWANN] = @Original_ERFASSTWANN) AND ((@IsNull_GEAENDERTWER = 1 AND [GEAENDERTWER] IS NULL) OR ([GEAENDERTWER] = @Original_GEAENDERTWER)) AND ((@IsNull_GEAENDERTWANN = 1 AND [GEAENDERTWANN] IS NULL) OR ([GEAENDERTWANN] = @Original_GEAENDERTWANN))) @@ -168,7 +168,7 @@ SELECT GUID, KUNDEN_ID, DA_ID, ZIELORDNER, ERFASSTWER, ERFASSTWANN, GEAENDERTWER - + SELECT GUID, BEZEICHNUNG @@ -187,7 +187,7 @@ WHERE (AKTIV = 1) - + SELECT GUID, KUNDEN_NAME, KUNDE_KURZ @@ -207,7 +207,7 @@ WHERE (AKTIV = 1) - + SELECT GUID, DOKUMENTART_ID, DOKUMENTART, KUNDEN_ID, KUNDEN_NAME, DOKUMENTARTORDNER, PRAEFIX, INDEXNAME, UO_IDX1, UO_IDX2, UO_IDX3, UO_IDX4, UO_IDX5 @@ -233,7 +233,7 @@ FROM VWMO_RE_DOKUMENTARTZUORDNUNG - + DELETE FROm TBMO_RE_DOKART_KUNDE WHERE GUID = @GUID @@ -243,7 +243,7 @@ FROM VWMO_RE_DOKUMENTARTZUORDNUNG - + SELECT DOKUMENTART, DOKUMENTARTORDNER, DOKUMENTART_ID, GUID, INDEXNAME, KUNDEN_ID, KUNDEN_NAME, PRAEFIX, UO_IDX1, UO_IDX2, UO_IDX3, UO_IDX4, UO_IDX5 FROM VWMO_RE_DOKUMENTARTZUORDNUNG WHERE (DOKUMENTART = @DOKART) AND (UPPER(KUNDEN_NAME) = UPPER(@KUNDEN_NAME)) @@ -258,7 +258,7 @@ FROM VWMO_RE_DOKUMENTARTZUORDNUNG - + DELETE FROM [TBMO_RE_DOKART] WHERE (([GUID] = @Original_GUID) AND ([BEZEICHNUNG] = @Original_BEZEICHNUNG) AND ([PRAEFIX] = @Original_PRAEFIX) AND ((@IsNull_INDEXNAME = 1 AND [INDEXNAME] IS NULL) OR ([INDEXNAME] = @Original_INDEXNAME)) AND ([AKTIV] = @Original_AKTIV) AND ([ERFASSTWER] = @Original_ERFASSTWER) AND ([ERFASSTWANN] = @Original_ERFASSTWANN) AND ((@IsNull_GEAENDERTWER = 1 AND [GEAENDERTWER] IS NULL) OR ([GEAENDERTWER] = @Original_GEAENDERTWER)) AND ((@IsNull_GEAENDERTWANN = 1 AND [GEAENDERTWANN] IS NULL) OR ([GEAENDERTWANN] = @Original_GEAENDERTWANN))) @@ -334,7 +334,7 @@ SELECT GUID, BEZEICHNUNG, PRAEFIX, INDEXNAME, AKTIV, ERFASSTWER, ERFASSTWANN, GE - + DELETE FROM [TBMO_RE_HISTORY] WHERE (([GUID] = @Original_GUID) AND ([FILE_ORIGINAL] = @Original_FILE_ORIGINAL) AND ([FILE_NEW] = @Original_FILE_NEW) AND ((@IsNull_KUNDE_KURZ = 1 AND [KUNDE_KURZ] IS NULL) OR ([KUNDE_KURZ] = @Original_KUNDE_KURZ)) AND ((@IsNull_INDEX1 = 1 AND [INDEX1] IS NULL) OR ([INDEX1] = @Original_INDEX1)) AND ((@IsNull_INDEX2 = 1 AND [INDEX2] IS NULL) OR ([INDEX2] = @Original_INDEX2)) AND ([ERSTELLTWER] = @Original_ERSTELLTWER) AND ([ERSTELLTWANN] = @Original_ERSTELLTWANN)) @@ -425,7 +425,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E - + @@ -463,7 +463,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E - + @@ -495,7 +495,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E - + @@ -509,7 +509,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E - + @@ -530,7 +530,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E - + @@ -609,7 +609,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E - + @@ -654,7 +654,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E - + @@ -734,9 +734,9 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E - - - + + + \ No newline at end of file diff --git a/ToolCollection/My Project/Resources.Designer.vb b/ToolCollection/My Project/Resources.Designer.vb index 82a70e1..54bde05 100644 --- a/ToolCollection/My Project/Resources.Designer.vb +++ b/ToolCollection/My Project/Resources.Designer.vb @@ -530,6 +530,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property folder_Closed_16xMD() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("folder_Closed_16xMD", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/ToolCollection/My Project/Resources.resx b/ToolCollection/My Project/Resources.resx index 4d5e8c1..db0a407 100644 --- a/ToolCollection/My Project/Resources.resx +++ b/ToolCollection/My Project/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\cross1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\user_edit3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -139,9 +142,6 @@ ..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Untitled (640).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Aktualisieren.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -163,6 +163,9 @@ ..\Resources\table_edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.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 + ..\Resources\Untitled (1055).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -172,6 +175,9 @@ ..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,6 +196,9 @@ ..\Resources\Untitled (882).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\stiftlineal_transparent3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\puzzle4.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -229,24 +238,15 @@ ..\Resources\Untitled (209).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Untitled (219).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\resultset_next.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Untitled (142).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\asterisk_orange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\link_break.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\table_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Untitled (1015).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,8 +295,8 @@ ..\Resources\mail_write.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\puzzle3.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Untitled (218).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -325,6 +325,9 @@ ..\Resources\database_connect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\page_edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\clock_run.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -367,8 +370,8 @@ ..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cross1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Untitled (640).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\f5.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -391,8 +394,8 @@ ..\Resources\info_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\stiftlineal_transparent3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\puzzle3.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\book_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -400,8 +403,8 @@ ..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Untitled (219).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\control_rewind.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -415,16 +418,16 @@ ..\Resources\rosette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Untitled (142).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\page_edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\table_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\user_edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.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 + + ..\Resources\folder_Closed_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/ToolCollection/My Project/Settings.Designer.vb b/ToolCollection/My Project/Settings.Designer.vb index cf19441..08fde1d 100644 --- a/ToolCollection/My Project/Settings.Designer.vb +++ b/ToolCollection/My Project/Settings.Designer.vb @@ -494,16 +494,6 @@ Namespace My End Set End Property - _ - Public ReadOnly Property DD_DMSConnectionString() As String - Get - Return CType(Me("DD_DMSConnectionString"),String) - End Get - End Property - _ - Public ReadOnly Property DD_ECMConnString() As String - Get - Return CType(Me("DD_ECMConnString"),String) - End Get - End Property - _ - Public Property IIDConfig_ConString() As String - Get - Return CType(Me("IIDConfig_ConString"),String) - End Get - Set - Me("IIDConfig_ConString") = value - End Set - End Property - _ @@ -924,6 +890,17 @@ Namespace My Return CType(Me("DIOpt_CheckLength"),Boolean) End Get End Property + + _ + Public ReadOnly Property DDECMConString() As String + Get + Return CType(Me("DDECMConString"),String) + End Get + End Property End Class End Namespace diff --git a/ToolCollection/My Project/Settings.settings b/ToolCollection/My Project/Settings.settings index bf7b577..4a1d12b 100644 --- a/ToolCollection/My Project/Settings.settings +++ b/ToolCollection/My Project/Settings.settings @@ -113,14 +113,6 @@ modMoReConfig.xml - - <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=172.24.12.41\tests;Initial Catalog=DD_DMS;User ID=sa;Password=dd</ConnectionString> - <ProviderName>System.Data.SqlClient</ProviderName> -</SerializableConnectionString> - Data Source=172.24.12.41\tests;Initial Catalog=DD_DMS;User ID=sa;Password=dd - modMoReBasConfig.xml @@ -190,14 +182,6 @@ 25 - - <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> - <ProviderName>System.Data.SqlClient</ProviderName> -</SerializableConnectionString> - Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd - False @@ -207,9 +191,6 @@ DigitalData\windream_VFS_RESTART - - Data Source=172.24.12.41\tests;Initial Catalog=DD_DMS;User ID=sa;Password=dd - 0 @@ -237,5 +218,12 @@ False + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <ConnectionString>Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> +</SerializableConnectionString> + Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd + \ No newline at end of file diff --git a/ToolCollection/MyDataset.Designer.vb b/ToolCollection/MyDataset.Designer.vb index a84eccf..8cf0c2e 100644 --- a/ToolCollection/MyDataset.Designer.vb +++ b/ToolCollection/MyDataset.Designer.vb @@ -2833,7 +2833,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DD_ECMConnString + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DD_ECMConnString + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString End Sub - + - + DELETE FROM [TBDD_REPORTING_IMPORT] WHERE (([IMPORT_ID] = @Original_IMPORT_ID) AND ((@IsNull_FILE_NAME = 1 AND [FILE_NAME] IS NULL) OR ([FILE_NAME] = @Original_FILE_NAME)) AND ([PROFILE_NAME] = @Original_PROFILE_NAME) AND ((@IsNull_VOLUME = 1 AND [VOLUME] IS NULL) OR ([VOLUME] = @Original_VOLUME)) AND ((@IsNull_PAGE_COUNT = 1 AND [PAGE_COUNT] IS NULL) OR ([PAGE_COUNT] = @Original_PAGE_COUNT)) AND ((@IsNull_EXTENSION = 1 AND [EXTENSION] IS NULL) OR ([EXTENSION] = @Original_EXTENSION)) AND ([ADDED_WHEN] = @Original_ADDED_WHEN)) @@ -91,7 +91,7 @@ SELECT IMPORT_ID, FILE_NAME, PROFILE_NAME, VOLUME, PAGE_COUNT, EXTENSION, ADDED_ - + DELETE FROM TBTC_MOVE_RENAME @@ -157,7 +157,7 @@ SELECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO - + SELECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN @@ -179,7 +179,7 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 - + @@ -187,14 +187,14 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 - + - + @@ -202,7 +202,7 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 - + @@ -233,7 +233,7 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 - + diff --git a/ToolCollection/MyDataset.xss b/ToolCollection/MyDataset.xss index fe42316..04a76b2 100644 --- a/ToolCollection/MyDataset.xss +++ b/ToolCollection/MyDataset.xss @@ -7,7 +7,7 @@ - + diff --git a/ToolCollection/Resources/folder_Closed_16xMD.png b/ToolCollection/Resources/folder_Closed_16xMD.png new file mode 100644 index 0000000000000000000000000000000000000000..3773698bddab1d18a15ca5ac06db0483a2e6abe0 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP_Wn2 z#WAEJ?(Jk-z7_?6)^r|TS@(}zQI}U-zp%SNaO*;qo6#3{dN42c>$y4MjoEJ@BTo7E zsXq=2Fily}TM@GFC&Y2~)tkBDiD~VAh>Wjg7<`qZZ$2_)gP`SbVJ7E9+UTX;nouy^H25CTt OF?hQAxvX22OAQ literal 0 HcmV?d00001 diff --git a/ToolCollection/ToolCollection.vbproj b/ToolCollection/ToolCollection.vbproj index 3aad54e..42b3ee1 100644 --- a/ToolCollection/ToolCollection.vbproj +++ b/ToolCollection/ToolCollection.vbproj @@ -823,6 +823,7 @@ + Always diff --git a/ToolCollection/app.config b/ToolCollection/app.config index a2fb211..e43e43e 100644 --- a/ToolCollection/app.config +++ b/ToolCollection/app.config @@ -11,11 +11,7 @@
- - + @@ -209,9 +205,6 @@ DigitalData\windream_VFS_RESTART - - Data Source=172.24.12.41\tests;Initial Catalog=DD_DMS;User ID=sa;Password=dd - diff --git a/ToolCollection/clsNIFulltext.vb b/ToolCollection/clsNIFulltext.vb index 2c012dd..3d2cde4 100644 --- a/ToolCollection/clsNIFulltext.vb +++ b/ToolCollection/clsNIFulltext.vb @@ -24,7 +24,7 @@ Public Class clsNIFulltext ' die Vorkommen im Volltext auslesen Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(fulltext) ' alle Vorkommen der windream-Indexe im SQL-String durchlaufen - Dim Gesamtanzahl As Integer = 0 + Dim oCountMatchedElements As Integer = 0 Dim Exit_For = False 'ClassLoggerNI.Add("Matches-Count fürm Regex is 0") @@ -51,7 +51,7 @@ Public Class clsNIFulltext Else If (regexMatch.Groups.Count - 1) >= 1 Then _Logger.Info($"{filename} # Using RegexGroups....MatchCount(" & regexMatch.Groups.Count - 1 & ")") - Gesamtanzahl = regexMatch.Groups.Count - 1 + oCountMatchedElements = regexMatch.Groups.Count - 1 For y = 1 To regexMatch.Groups.Count - 1 Dim g As Group = regexMatch.Groups(y) g.ToString() @@ -69,7 +69,7 @@ Public Class clsNIFulltext ' Next _Logger.Debug($"{filename} # Group" & i & "='" & g.ToString() & "'") - If Pos_From = 0 And Gesamtanzahl = 1 Then + If Pos_From = 0 And oCountMatchedElements = 1 Then 'Das Ende ist erreicht - Ausstieg ReDim Preserve Ergebnis(0) Ergebnis(0) = Convert.ToString(g.ToString) @@ -79,15 +79,15 @@ Public Class clsNIFulltext If Pos_From <> 10000 Then If Pos_To <> 0 And Pos_From >= Pos_From Then ' den übergebenen/gefundenen IndexWert, eintragen - ReDim Preserve Ergebnis(Gesamtanzahl - 1) - Ergebnis(Gesamtanzahl - 1) = Convert.ToString(g.ToString) + ReDim Preserve Ergebnis(oCountMatchedElements - 1) + Ergebnis(oCountMatchedElements - 1) = Convert.ToString(g.ToString) 'Das Ende ist erreicht - Ausstieg - If Pos_To = Gesamtanzahl Then + If Pos_To = oCountMatchedElements Then Exit_For = True End If Else 'Es gibt nur From, also auch nur einen Wert - If Pos_From = Gesamtanzahl Then + If Pos_From = oCountMatchedElements Then 'Das Ende ist erreicht - Ausstieg ReDim Preserve Ergebnis(0) Ergebnis(0) = Convert.ToString(g.ToString) @@ -95,9 +95,9 @@ Public Class clsNIFulltext End If End If Else - ReDim Preserve Ergebnis(Gesamtanzahl - 1) + ReDim Preserve Ergebnis(oCountMatchedElements - 1) ' den übergebenen/gefundenen IndexWert, eintragen - Ergebnis(Gesamtanzahl - 1) = Convert.ToString(g.ToString) + Ergebnis(oCountMatchedElements - 1) = Convert.ToString(g.ToString) End If If Exit_For = True Then Exit For @@ -119,22 +119,25 @@ Public Class clsNIFulltext For Each element As System.Text.RegularExpressions.Match In elemente element.ToString() Next + If Pos_To = 0 And Pos_From > elemente.Count Then + _Logger.Info($"ATTENTION: Regex found less elements [{elemente.Count}] than the specified position [{Pos_From}]. The last found element will be used as indexvalue.") + End If For Each element As System.Text.RegularExpressions.Match In elemente - Gesamtanzahl += 1 + oCountMatchedElements += 1 'MsgBox(element.ToString) 'filling the row with values. Item property is used to set the field value. If Pos_From <> 10000 Then If Pos_To <> 0 And Pos_From >= Pos_From Then ' den übergebenen/gefundenen IndexWert, eintragen - ReDim Preserve Ergebnis(Gesamtanzahl - 1) - Ergebnis(Gesamtanzahl - 1) = Convert.ToString(element.ToString) + ReDim Preserve Ergebnis(oCountMatchedElements - 1) + Ergebnis(oCountMatchedElements - 1) = Convert.ToString(element.ToString) 'Das Ende ist erreicht - Ausstieg - If Pos_To = Gesamtanzahl Then + If Pos_To = oCountMatchedElements Then Exit_For = True End If Else 'Es gibt nur From, also auch nur einen Wert - If Pos_From = Gesamtanzahl Then + If Pos_From = oCountMatchedElements Then 'Das Ende ist erreicht - Ausstieg ReDim Preserve Ergebnis(0) Ergebnis(0) = Convert.ToString(element.ToString) @@ -142,13 +145,13 @@ Public Class clsNIFulltext Else ReDim Preserve Ergebnis(0) Ergebnis(0) = Convert.ToString(element.ToString) - Exit_For = True + End If End If Else - ReDim Preserve Ergebnis(Gesamtanzahl - 1) + ReDim Preserve Ergebnis(oCountMatchedElements - 1) ' den übergebenen/gefundenen IndexWert, eintragen - Ergebnis(Gesamtanzahl - 1) = Convert.ToString(element.ToString) + Ergebnis(oCountMatchedElements - 1) = Convert.ToString(element.ToString) End If If Exit_For = True Then Exit For @@ -158,7 +161,7 @@ Public Class clsNIFulltext End If End If - If Gesamtanzahl > 0 Then + If oCountMatchedElements > 0 Then If Ergebnis.Length >= 1 Then Return Ergebnis Else diff --git a/ToolCollection/frmNIHauptseite.vb b/ToolCollection/frmNIHauptseite.vb index fdbd247..51ae4c3 100644 --- a/ToolCollection/frmNIHauptseite.vb +++ b/ToolCollection/frmNIHauptseite.vb @@ -12,7 +12,7 @@ Public Class frmNIHauptseite '####Variablen für Nachindexierung Private _windreamNI As ClassNIWindream Private _clsWorkfile As clsNI_WorkFile - Private _clsMoRe As ClassMO_RE + 'Private _clsMoRe As ClassMO_RE 'Private _windreamNI As ClassNIWindream = Me.ParentClass.Windream Private bwProfil As New BackgroundWorker Private bwDatei As New BackgroundWorker @@ -121,7 +121,7 @@ Public Class frmNIHauptseite Private Sub frmNIHauptseite_Load(sender As Object, e As System.EventArgs) Handles Me.Load Try LoadAllModules() - TBTC_MOVE_RENAMETableAdapter.Connection.ConnectionString = My.Settings.DD_ECMConnString + TBTC_MOVE_RENAMETableAdapter.Connection.ConnectionString = My.Settings.DDECMConString Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei frmNIHauptseite_Load") _Logger.Warn("Fehler bei frmNIHauptseite_Load: " & ex.Message) @@ -313,7 +313,7 @@ Public Class frmNIHauptseite Me.aktivesProfil = profil _clsWorkfile = New clsNI_WorkFile(_MyLogger) _clsWorkfile.aktivesProfil = profil - _clsMoRe = New ClassMO_RE(_MyLogger) + '_clsMoRe = New ClassMO_RE(_MyLogger) ' Profilname aktualisieren (in lblProfilname) bwProfil.ReportProgress(-3) @@ -1664,6 +1664,10 @@ Public Class frmNIHauptseite oFolderTemp = My.Computer.Clock.LocalTime.Year Case "YYYY-MM" oFolderTemp = My.Computer.Clock.LocalTime.Year & "-" & oMonth + Case "MM" + oFolderTemp = oMonth + Case "DD" + oFolderTemp = oDay End Select oDynamicFolder = oDynamicFolder.Replace(oMatchElement.ToString, oFolderTemp) _Logger.Debug("FolderPatter after V-element: '" & oDynamicFolder & "'", False) @@ -1706,7 +1710,7 @@ Public Class frmNIHauptseite Try Dim oReturnString As String Dim oActWMPath As String = "\\windream\objects" & myWMDocument.aPath - TBTC_MOVE_RENAMETableAdapter.Connection.ConnectionString = My.Settings.DD_ECMConnString + TBTC_MOVE_RENAMETableAdapter.Connection.ConnectionString = My.Settings.DDECMConString Me.TBTC_MOVE_RENAMETableAdapter.FillByActive(Me.MyDataset.TBTC_MOVE_RENAME, aktivesProfil.Profilname) If MyDataset.TBTC_MOVE_RENAME.Rows.Count = 1 Then Dim oExtension As String = System.IO.Path.GetExtension(oActWMPath) @@ -1835,6 +1839,16 @@ Public Class frmNIHauptseite Else oReturnString = oActWMPath End If + Dim oCleanFileName As String = String.Join("", oReturnString.Split(Path.GetInvalidFileNameChars())) + If oCleanFileName <> oReturnString Then + _Logger.Info($"Cleaned the filename with GetInvalidFileNameChars from [{oReturnString}] to [{oCleanFileName}]") + oReturnString = oCleanFileName + End If + Dim oCleanPathName As String = String.Join("", oReturnString.Split(Path.GetInvalidPathChars())) + If oCleanPathName <> oReturnString Then + _Logger.Info($"Cleaned the path with GetInvalidPathChars from [{oReturnString}] to [{oCleanPathName}]") + oReturnString = oCleanPathName + End If If _windreamNI.NEW_MOVE_FILE(oReturnString, oActWMPath, "MO_RE") = True Then Return False diff --git a/ToolCollection/frmNIMoveRename.Designer.vb b/ToolCollection/frmNIMoveRename.Designer.vb index e4d7a1c..90d8163 100644 --- a/ToolCollection/frmNIMoveRename.Designer.vb +++ b/ToolCollection/frmNIMoveRename.Designer.vb @@ -47,11 +47,13 @@ Partial Class frmNIMoveRename Me.CREATED_WHENTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() - Me.tsbtnAdd = New System.Windows.Forms.ToolStripButton() - Me.tsbtnsave = New System.Windows.Forms.ToolStripButton() Me.Button1 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() + Me.Button3 = New System.Windows.Forms.Button() + Me.tsbtnAdd = New System.Windows.Forms.ToolStripButton() + Me.tsbtnsave = New System.Windows.Forms.ToolStripButton() Me.tsbtndelete = New System.Windows.Forms.ToolStripButton() + Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() GUIDLabel = New System.Windows.Forms.Label() PROFILE_NAMELabel = New System.Windows.Forms.Label() FOLDER_FOR_INDEXLabel = New System.Windows.Forms.Label() @@ -104,7 +106,7 @@ Partial Class frmNIMoveRename 'CREATED_WHOLabel ' CREATED_WHOLabel.AutoSize = True - CREATED_WHOLabel.Location = New System.Drawing.Point(12, 175) + CREATED_WHOLabel.Location = New System.Drawing.Point(13, 147) CREATED_WHOLabel.Name = "CREATED_WHOLabel" CREATED_WHOLabel.Size = New System.Drawing.Size(67, 13) CREATED_WHOLabel.TabIndex = 14 @@ -113,7 +115,7 @@ Partial Class frmNIMoveRename 'CREATED_WHENLabel ' CREATED_WHENLabel.AutoSize = True - CREATED_WHENLabel.Location = New System.Drawing.Point(236, 175) + CREATED_WHENLabel.Location = New System.Drawing.Point(237, 147) CREATED_WHENLabel.Name = "CREATED_WHENLabel" CREATED_WHENLabel.Size = New System.Drawing.Size(75, 13) CREATED_WHENLabel.TabIndex = 16 @@ -122,7 +124,7 @@ Partial Class frmNIMoveRename 'CHANGED_WHOLabel ' CHANGED_WHOLabel.AutoSize = True - CHANGED_WHOLabel.Location = New System.Drawing.Point(12, 215) + CHANGED_WHOLabel.Location = New System.Drawing.Point(13, 187) CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" CHANGED_WHOLabel.Size = New System.Drawing.Size(79, 13) CHANGED_WHOLabel.TabIndex = 18 @@ -131,7 +133,7 @@ Partial Class frmNIMoveRename 'CHANGED_WHENLabel ' CHANGED_WHENLabel.AutoSize = True - CHANGED_WHENLabel.Location = New System.Drawing.Point(236, 215) + CHANGED_WHENLabel.Location = New System.Drawing.Point(237, 187) CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" CHANGED_WHENLabel.Size = New System.Drawing.Size(87, 13) CHANGED_WHENLabel.TabIndex = 20 @@ -139,7 +141,7 @@ Partial Class frmNIMoveRename ' 'StatusStrip1 ' - Me.StatusStrip1.Location = New System.Drawing.Point(0, 266) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 233) Me.StatusStrip1.Name = "StatusStrip1" Me.StatusStrip1.Size = New System.Drawing.Size(800, 22) Me.StatusStrip1.TabIndex = 0 @@ -199,7 +201,7 @@ Partial Class frmNIMoveRename Me.FOLDER_FOR_INDEXTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_MOVE_RENAMEBindingSource, "FOLDER_FOR_INDEX", True)) Me.FOLDER_FOR_INDEXTextBox.Location = New System.Drawing.Point(15, 81) Me.FOLDER_FOR_INDEXTextBox.Name = "FOLDER_FOR_INDEXTextBox" - Me.FOLDER_FOR_INDEXTextBox.Size = New System.Drawing.Size(738, 21) + Me.FOLDER_FOR_INDEXTextBox.Size = New System.Drawing.Size(714, 21) Me.FOLDER_FOR_INDEXTextBox.TabIndex = 9 ' 'NAMECONVENTIONTextBox @@ -207,13 +209,13 @@ Partial Class frmNIMoveRename Me.NAMECONVENTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_MOVE_RENAMEBindingSource, "NAMECONVENTION", True)) Me.NAMECONVENTIONTextBox.Location = New System.Drawing.Point(15, 121) Me.NAMECONVENTIONTextBox.Name = "NAMECONVENTIONTextBox" - Me.NAMECONVENTIONTextBox.Size = New System.Drawing.Size(738, 21) + Me.NAMECONVENTIONTextBox.Size = New System.Drawing.Size(714, 21) Me.NAMECONVENTIONTextBox.TabIndex = 11 ' 'ACTIVECheckBox ' Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBTC_MOVE_RENAMEBindingSource, "ACTIVE", True)) - Me.ACTIVECheckBox.Location = New System.Drawing.Point(15, 148) + Me.ACTIVECheckBox.Location = New System.Drawing.Point(389, 39) Me.ACTIVECheckBox.Name = "ACTIVECheckBox" Me.ACTIVECheckBox.Size = New System.Drawing.Size(104, 24) Me.ACTIVECheckBox.TabIndex = 13 @@ -223,7 +225,7 @@ Partial Class frmNIMoveRename 'CREATED_WHOTextBox ' Me.CREATED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_MOVE_RENAMEBindingSource, "CREATED_WHO", True)) - Me.CREATED_WHOTextBox.Location = New System.Drawing.Point(15, 191) + Me.CREATED_WHOTextBox.Location = New System.Drawing.Point(16, 163) Me.CREATED_WHOTextBox.Name = "CREATED_WHOTextBox" Me.CREATED_WHOTextBox.ReadOnly = True Me.CREATED_WHOTextBox.Size = New System.Drawing.Size(215, 21) @@ -232,7 +234,7 @@ Partial Class frmNIMoveRename 'CREATED_WHENTextBox ' Me.CREATED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_MOVE_RENAMEBindingSource, "CREATED_WHEN", True)) - Me.CREATED_WHENTextBox.Location = New System.Drawing.Point(239, 191) + Me.CREATED_WHENTextBox.Location = New System.Drawing.Point(240, 163) Me.CREATED_WHENTextBox.Name = "CREATED_WHENTextBox" Me.CREATED_WHENTextBox.ReadOnly = True Me.CREATED_WHENTextBox.Size = New System.Drawing.Size(191, 21) @@ -241,7 +243,7 @@ Partial Class frmNIMoveRename 'CHANGED_WHOTextBox ' Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_MOVE_RENAMEBindingSource, "CHANGED_WHO", True)) - Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(15, 231) + Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(16, 203) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.ReadOnly = True Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(215, 21) @@ -250,31 +252,15 @@ Partial Class frmNIMoveRename 'CHANGED_WHENTextBox ' Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_MOVE_RENAMEBindingSource, "CHANGED_WHEN", True)) - Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(239, 231) + Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(240, 203) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.ReadOnly = True Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(191, 21) Me.CHANGED_WHENTextBox.TabIndex = 21 ' - 'tsbtnAdd - ' - Me.tsbtnAdd.Image = Global.ToolCollection.My.Resources.Resources.action_add_16xMD - Me.tsbtnAdd.ImageTransparentColor = System.Drawing.Color.Magenta - Me.tsbtnAdd.Name = "tsbtnAdd" - Me.tsbtnAdd.Size = New System.Drawing.Size(163, 22) - Me.tsbtnAdd.Text = "Konfiguration hinzufügen" - ' - 'tsbtnsave - ' - Me.tsbtnsave.Image = Global.ToolCollection.My.Resources.Resources.save - Me.tsbtnsave.ImageTransparentColor = System.Drawing.Color.Magenta - Me.tsbtnsave.Name = "tsbtnsave" - Me.tsbtnsave.Size = New System.Drawing.Size(79, 22) - Me.tsbtnsave.Text = "Speichern" - ' 'Button1 ' - Me.Button1.Location = New System.Drawing.Point(759, 121) + Me.Button1.Location = New System.Drawing.Point(764, 120) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(29, 21) Me.Button1.TabIndex = 22 @@ -283,13 +269,38 @@ Partial Class frmNIMoveRename ' 'Button2 ' - Me.Button2.Location = New System.Drawing.Point(759, 80) + Me.Button2.Location = New System.Drawing.Point(764, 80) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(29, 21) Me.Button2.TabIndex = 23 Me.Button2.Text = "..." Me.Button2.UseVisualStyleBackColor = True ' + 'Button3 + ' + Me.Button3.Image = Global.ToolCollection.My.Resources.Resources.folder_Closed_16xMD + Me.Button3.Location = New System.Drawing.Point(735, 81) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(23, 23) + Me.Button3.TabIndex = 24 + Me.Button3.UseVisualStyleBackColor = True + ' + 'tsbtnAdd + ' + Me.tsbtnAdd.Image = Global.ToolCollection.My.Resources.Resources.action_add_16xMD + Me.tsbtnAdd.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tsbtnAdd.Name = "tsbtnAdd" + Me.tsbtnAdd.Size = New System.Drawing.Size(163, 22) + Me.tsbtnAdd.Text = "Konfiguration hinzufügen" + ' + 'tsbtnsave + ' + Me.tsbtnsave.Image = Global.ToolCollection.My.Resources.Resources.save + Me.tsbtnsave.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tsbtnsave.Name = "tsbtnsave" + Me.tsbtnsave.Size = New System.Drawing.Size(79, 22) + Me.tsbtnsave.Text = "Speichern" + ' 'tsbtndelete ' Me.tsbtndelete.Image = Global.ToolCollection.My.Resources.Resources.delete @@ -298,11 +309,16 @@ Partial Class frmNIMoveRename Me.tsbtndelete.Size = New System.Drawing.Size(71, 22) Me.tsbtndelete.Text = "Löschen" ' + 'FolderBrowserDialog1 + ' + Me.FolderBrowserDialog1.RootFolder = System.Environment.SpecialFolder.MyComputer + ' 'frmNIMoveRename ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 288) + Me.ClientSize = New System.Drawing.Size(800, 255) + Me.Controls.Add(Me.Button3) Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.Button1) Me.Controls.Add(GUIDLabel) @@ -359,4 +375,6 @@ Partial Class frmNIMoveRename Friend WithEvents Button1 As Button Friend WithEvents Button2 As Button Friend WithEvents tsbtndelete As ToolStripButton + Friend WithEvents Button3 As Button + Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog End Class diff --git a/ToolCollection/frmNIMoveRename.resx b/ToolCollection/frmNIMoveRename.resx index db82105..4258258 100644 --- a/ToolCollection/frmNIMoveRename.resx +++ b/ToolCollection/frmNIMoveRename.resx @@ -159,6 +159,9 @@ 847, 17 + + 17, 56 + diff --git a/ToolCollection/frmNIMoveRename.vb b/ToolCollection/frmNIMoveRename.vb index 452c9b0..f45aaed 100644 --- a/ToolCollection/frmNIMoveRename.vb +++ b/ToolCollection/frmNIMoveRename.vb @@ -9,6 +9,11 @@ Me.MyDataset.TBTC_MOVE_RENAME.CREATED_WHOColumn.DefaultValue = Environment.UserName Me.MyDataset.TBTC_MOVE_RENAME.PROFILE_NAMEColumn.DefaultValue = CURRENT_PROFILENAME TBTC_MOVE_RENAMEBindingSource.AddNew() + FOLDER_FOR_INDEXTextBox.Enabled = True + NAMECONVENTIONTextBox.Enabled = True + ACTIVECheckBox.Enabled = True + Button1.Enabled = True + Button2.Enabled = True Catch ex As Exception MsgBox("Unexpected error in tsbtnAdd.Click: " & ex.Message, MsgBoxStyle.Critical) End Try @@ -20,14 +25,24 @@ End Sub Sub LoadData() Try - TBTC_MOVE_RENAMETableAdapter.Connection.ConnectionString = My.Settings.DD_ECMConnString + TBTC_MOVE_RENAMETableAdapter.Connection.ConnectionString = My.Settings.DDECMConString Me.TBTC_MOVE_RENAMETableAdapter.Fill(Me.MyDataset.TBTC_MOVE_RENAME, CURRENT_PROFILENAME) If Me.MyDataset.TBTC_MOVE_RENAME.Rows.Count = 1 Then tsbtnAdd.Enabled = False tsbtndelete.Enabled = True + FOLDER_FOR_INDEXTextBox.Enabled = True + NAMECONVENTIONTextBox.Enabled = True + ACTIVECheckBox.Enabled = True + Button1.Enabled = True + Button2.Enabled = True Else tsbtnAdd.Enabled = True tsbtndelete.Enabled = False + FOLDER_FOR_INDEXTextBox.Enabled = False + NAMECONVENTIONTextBox.Enabled = False + ACTIVECheckBox.Enabled = False + Button1.Enabled = False + Button2.Enabled = False End If Catch ex As System.Exception MsgBox("Unexpected error in Loading MoveRename: " & ex.Message, MsgBoxStyle.Critical) @@ -67,4 +82,20 @@ TBTC_MOVE_RENAMETableAdapter.Delete(GUIDTextBox.Text) LoadData() End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + If FOLDER_FOR_INDEXTextBox.Text <> "" Then + FolderBrowserDialog1.SelectedPath = FOLDER_FOR_INDEXTextBox.Text.Replace("\\windream\objects", "W:") + Else + FolderBrowserDialog1.SelectedPath = "W:" + End If + FolderBrowserDialog1.Description = "Select a rootfolder in ECM-path ..." + + + ' wenn im Formular der OK-Button geklickt wurde + If Me.FolderBrowserDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then + ' den Speicherort der windream-Suche in die TextBox eintragen + Me.FOLDER_FOR_INDEXTextBox.Text = Me.FolderBrowserDialog1.SelectedPath.Replace("W:", "\\windream\objects") + End If + End Sub End Class \ No newline at end of file diff --git a/ToolCollection/frmNIMoveRenameNamenkonvention.designer.vb b/ToolCollection/frmNIMoveRenameNamenkonvention.designer.vb index 6f3cbfa..ea61ae6 100644 --- a/ToolCollection/frmNIMoveRenameNamenkonvention.designer.vb +++ b/ToolCollection/frmNIMoveRenameNamenkonvention.designer.vb @@ -114,7 +114,7 @@ Partial Class frmNIMoveRenameNamenkonvention ' 'btnOK ' - Me.btnOK.Image = Global.ToolCollection.My.Resources.Resources.save + Me.btnOK.Image = Global.ToolCollection.My.Resources.Resources.arrow_right resources.ApplyResources(Me.btnOK, "btnOK") Me.btnOK.Name = "btnOK" Me.btnOK.UseVisualStyleBackColor = True diff --git a/ToolCollection/frmNIMoveRenameNamenkonvention.resx b/ToolCollection/frmNIMoveRenameNamenkonvention.resx index 540d607..c10835b 100644 --- a/ToolCollection/frmNIMoveRenameNamenkonvention.resx +++ b/ToolCollection/frmNIMoveRenameNamenkonvention.resx @@ -450,7 +450,7 @@ Indizes und Textbausteinen zusammenzustellen. 12, 259 - 172, 36 + 115, 36 5 diff --git a/ToolCollection/frmNIProfileigenschaften.vb b/ToolCollection/frmNIProfileigenschaften.vb index cfcf025..5e3ca54 100644 --- a/ToolCollection/frmNIProfileigenschaften.vb +++ b/ToolCollection/frmNIProfileigenschaften.vb @@ -548,9 +548,11 @@ Public Class frmNIProfileigenschaften End Sub Private Sub txtProfilname_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtProfilname.TextChanged + CURRENT_PROFILENAME = "" If Me._selectedProfile IsNot Nothing Then Me._selectedProfile.Profilname = Me.txtProfilname.Text CURRENT_PROFILENAME = Me._selectedProfile.Profilname + If Not Me.txtProfilname.Text = Me._selectedProfile.OriginalProfilname Then Me.btnSpeichern.Enabled = True Else @@ -1426,6 +1428,10 @@ Public Class frmNIProfileigenschaften End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + If CURRENT_PROFILENAME = "" Then + MsgBox("Please choose a Profile!", MsgBoxStyle.Exclamation) + Exit Sub + End If CURRENT_IndexList = INDEX_LIST frmNIMoveRename.ShowDialog() End Sub diff --git a/ToolCollection/frmNIVerknuepfungen.Designer.vb b/ToolCollection/frmNIVerknuepfungen.Designer.vb index 72bad25..c2876be 100644 --- a/ToolCollection/frmNIVerknuepfungen.Designer.vb +++ b/ToolCollection/frmNIVerknuepfungen.Designer.vb @@ -163,13 +163,13 @@ Partial Class frmNIVerknuepfungen Me.btnLink = New System.Windows.Forms.Button() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.pnlZielQuelle = New System.Windows.Forms.Panel() + Me.rbFunctionsTb = New System.Windows.Forms.RadioButton() + Me.rbFunctionsSc = New System.Windows.Forms.RadioButton() Me.lblsave = New System.Windows.Forms.Label() Me.chkvkt_Dublette = New System.Windows.Forms.CheckBox() Me.rbvkt_add = New System.Windows.Forms.RadioButton() Me.rbvkt_overwrite = New System.Windows.Forms.RadioButton() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.rbFunctionsSc = New System.Windows.Forms.RadioButton() - Me.rbFunctionsTb = New System.Windows.Forms.RadioButton() Me.StatusStrip1.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -217,7 +217,7 @@ Partial Class frmNIVerknuepfungen Me.cmbDatenbankSpalten.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cmbDatenbankSpalten.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.cmbDatenbankSpalten.FormattingEnabled = True - Me.cmbDatenbankSpalten.Location = New System.Drawing.Point(1019, 119) + Me.cmbDatenbankSpalten.Location = New System.Drawing.Point(996, 119) Me.cmbDatenbankSpalten.Name = "cmbDatenbankSpalten" Me.cmbDatenbankSpalten.RightToLeft = System.Windows.Forms.RightToLeft.No Me.cmbDatenbankSpalten.Size = New System.Drawing.Size(191, 21) @@ -230,7 +230,7 @@ Partial Class frmNIVerknuepfungen Me.Label8.AutoSize = True Me.Label8.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.Label8.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label8.Location = New System.Drawing.Point(903, 122) + Me.Label8.Location = New System.Drawing.Point(880, 122) Me.Label8.Name = "Label8" Me.Label8.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Label8.Size = New System.Drawing.Size(105, 13) @@ -359,7 +359,7 @@ Partial Class frmNIVerknuepfungen Me.btnZurücksetzen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnZurücksetzen.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.btnZurücksetzen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnZurücksetzen.Location = New System.Drawing.Point(1019, 32) + Me.btnZurücksetzen.Location = New System.Drawing.Point(996, 32) Me.btnZurücksetzen.Name = "btnZurücksetzen" Me.btnZurücksetzen.RightToLeft = System.Windows.Forms.RightToLeft.No Me.btnZurücksetzen.Size = New System.Drawing.Size(89, 21) @@ -378,7 +378,7 @@ Partial Class frmNIVerknuepfungen Me.Label6.AutoSize = True Me.Label6.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.Label6.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label6.Location = New System.Drawing.Point(902, 149) + Me.Label6.Location = New System.Drawing.Point(879, 149) Me.Label6.Name = "Label6" Me.Label6.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Label6.Size = New System.Drawing.Size(99, 13) @@ -402,7 +402,7 @@ Partial Class frmNIVerknuepfungen Me.cmbWindreamIndexe.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cmbWindreamIndexe.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.cmbWindreamIndexe.FormattingEnabled = True - Me.cmbWindreamIndexe.Location = New System.Drawing.Point(1019, 146) + Me.cmbWindreamIndexe.Location = New System.Drawing.Point(996, 146) Me.cmbWindreamIndexe.Name = "cmbWindreamIndexe" Me.cmbWindreamIndexe.RightToLeft = System.Windows.Forms.RightToLeft.No Me.cmbWindreamIndexe.Size = New System.Drawing.Size(191, 21) @@ -467,7 +467,7 @@ Partial Class frmNIVerknuepfungen Me.btnStandardSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnStandardSQL.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.btnStandardSQL.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnStandardSQL.Location = New System.Drawing.Point(903, 32) + Me.btnStandardSQL.Location = New System.Drawing.Point(880, 32) Me.btnStandardSQL.Name = "btnStandardSQL" Me.btnStandardSQL.Size = New System.Drawing.Size(110, 21) Me.btnStandardSQL.TabIndex = 42 @@ -506,7 +506,7 @@ Partial Class frmNIVerknuepfungen Me.btnEindIndex.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.btnEindIndex.ForeColor = System.Drawing.Color.OrangeRed Me.btnEindIndex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnEindIndex.Location = New System.Drawing.Point(903, 59) + Me.btnEindIndex.Location = New System.Drawing.Point(880, 59) Me.btnEindIndex.Name = "btnEindIndex" Me.btnEindIndex.RightToLeft = System.Windows.Forms.RightToLeft.No Me.btnEindIndex.Size = New System.Drawing.Size(89, 21) @@ -521,7 +521,7 @@ Partial Class frmNIVerknuepfungen Me.Panel1.Controls.Add(Me.lblSQLTest) Me.Panel1.Controls.Add(Me.txtTestwert) Me.Panel1.Controls.Add(Me.btnTestSQL) - Me.Panel1.Location = New System.Drawing.Point(1019, 59) + Me.Panel1.Location = New System.Drawing.Point(996, 59) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(200, 52) Me.Panel1.TabIndex = 48 @@ -745,7 +745,7 @@ Partial Class frmNIVerknuepfungen Me.grbFilterDB.Location = New System.Drawing.Point(10, 304) Me.grbFilterDB.Name = "grbFilterDB" Me.grbFilterDB.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.grbFilterDB.Size = New System.Drawing.Size(1266, 214) + Me.grbFilterDB.Size = New System.Drawing.Size(1243, 214) Me.grbFilterDB.TabIndex = 23 Me.grbFilterDB.TabStop = False Me.grbFilterDB.Text = " Einschränkung der Datenbankansicht zum Auslesen des windream-Indexes " @@ -757,7 +757,7 @@ Partial Class frmNIVerknuepfungen Me.btnAddNI_Objekt.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.btnAddNI_Objekt.Image = Global.ToolCollection.My.Resources.Resources.add Me.btnAddNI_Objekt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddNI_Objekt.Location = New System.Drawing.Point(1216, 175) + Me.btnAddNI_Objekt.Location = New System.Drawing.Point(1193, 175) Me.btnAddNI_Objekt.Name = "btnAddNI_Objekt" Me.btnAddNI_Objekt.RightToLeft = System.Windows.Forms.RightToLeft.No Me.btnAddNI_Objekt.Size = New System.Drawing.Size(33, 22) @@ -770,7 +770,7 @@ Partial Class frmNIVerknuepfungen Me.Label40.AutoSize = True Me.Label40.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.Label40.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label40.Location = New System.Drawing.Point(900, 175) + Me.Label40.Location = New System.Drawing.Point(877, 175) Me.Label40.Name = "Label40" Me.Label40.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Label40.Size = New System.Drawing.Size(97, 13) @@ -785,7 +785,7 @@ Partial Class frmNIVerknuepfungen Me.cmbNI_Objekte.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.cmbNI_Objekte.FormattingEnabled = True Me.cmbNI_Objekte.Items.AddRange(New Object() {"Dokument - Dateiname.Endung", "Dokument - Dateiname", "Dokument - Pfad", "Dokument - Pfad\Dateiname.Endung", "Datum - heute"}) - Me.cmbNI_Objekte.Location = New System.Drawing.Point(1019, 174) + Me.cmbNI_Objekte.Location = New System.Drawing.Point(996, 174) Me.cmbNI_Objekte.Name = "cmbNI_Objekte" Me.cmbNI_Objekte.RightToLeft = System.Windows.Forms.RightToLeft.No Me.cmbNI_Objekte.Size = New System.Drawing.Size(191, 21) @@ -799,7 +799,7 @@ Partial Class frmNIVerknuepfungen Me.btnsave_select.Image = Global.ToolCollection.My.Resources.Resources.save Me.btnsave_select.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnsave_select.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnsave_select.Location = New System.Drawing.Point(1114, 32) + Me.btnsave_select.Location = New System.Drawing.Point(1091, 32) Me.btnsave_select.Name = "btnsave_select" Me.btnsave_select.Size = New System.Drawing.Size(89, 23) Me.btnsave_select.TabIndex = 47 @@ -813,7 +813,7 @@ Partial Class frmNIVerknuepfungen Me.btnSpalteEinfügen.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.btnSpalteEinfügen.Image = Global.ToolCollection.My.Resources.Resources.add Me.btnSpalteEinfügen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnSpalteEinfügen.Location = New System.Drawing.Point(1216, 118) + Me.btnSpalteEinfügen.Location = New System.Drawing.Point(1193, 118) Me.btnSpalteEinfügen.Name = "btnSpalteEinfügen" Me.btnSpalteEinfügen.Size = New System.Drawing.Size(33, 22) Me.btnSpalteEinfügen.TabIndex = 36 @@ -826,7 +826,7 @@ Partial Class frmNIVerknuepfungen Me.btnWindreamIndexEinfügen.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.btnWindreamIndexEinfügen.Image = Global.ToolCollection.My.Resources.Resources.add Me.btnWindreamIndexEinfügen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnWindreamIndexEinfügen.Location = New System.Drawing.Point(1216, 146) + Me.btnWindreamIndexEinfügen.Location = New System.Drawing.Point(1193, 146) Me.btnWindreamIndexEinfügen.Name = "btnWindreamIndexEinfügen" Me.btnWindreamIndexEinfügen.RightToLeft = System.Windows.Forms.RightToLeft.No Me.btnWindreamIndexEinfügen.Size = New System.Drawing.Size(33, 22) @@ -860,7 +860,7 @@ Partial Class frmNIVerknuepfungen Me.txtSelectAnweisung.Name = "txtSelectAnweisung" Me.txtSelectAnweisung.RightToLeft = System.Windows.Forms.RightToLeft.No Me.txtSelectAnweisung.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtSelectAnweisung.Size = New System.Drawing.Size(888, 175) + Me.txtSelectAnweisung.Size = New System.Drawing.Size(865, 175) Me.txtSelectAnweisung.TabIndex = 28 ' 'Label5 @@ -1284,9 +1284,9 @@ Partial Class frmNIVerknuepfungen Me.pnlfulltext.Controls.Add(Me.txtregex) Me.pnlfulltext.Controls.Add(Me.Label27) Me.pnlfulltext.Enabled = False - Me.pnlfulltext.Location = New System.Drawing.Point(886, 242) + Me.pnlfulltext.Location = New System.Drawing.Point(503, 291) Me.pnlfulltext.Name = "pnlfulltext" - Me.pnlfulltext.Size = New System.Drawing.Size(313, 59) + Me.pnlfulltext.Size = New System.Drawing.Size(313, 220) Me.pnlfulltext.TabIndex = 47 Me.pnlfulltext.Visible = False ' @@ -1465,10 +1465,11 @@ Partial Class frmNIVerknuepfungen Me.RichTextBox_RegEx.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.RichTextBox_RegEx.AutoWordSelection = True Me.RichTextBox_RegEx.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.RichTextBox_RegEx.Location = New System.Drawing.Point(10, 88) Me.RichTextBox_RegEx.Name = "RichTextBox_RegEx" - Me.RichTextBox_RegEx.Size = New System.Drawing.Size(60, 0) + Me.RichTextBox_RegEx.Size = New System.Drawing.Size(60, 122) Me.RichTextBox_RegEx.TabIndex = 24 Me.RichTextBox_RegEx.Text = "" ' @@ -1847,6 +1848,28 @@ Partial Class frmNIVerknuepfungen Me.pnlZielQuelle.Size = New System.Drawing.Size(1265, 521) Me.pnlZielQuelle.TabIndex = 50 ' + 'rbFunctionsTb + ' + Me.rbFunctionsTb.AutoSize = True + Me.rbFunctionsTb.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rbFunctionsTb.Location = New System.Drawing.Point(322, 8) + Me.rbFunctionsTb.Name = "rbFunctionsTb" + Me.rbFunctionsTb.Size = New System.Drawing.Size(111, 17) + Me.rbFunctionsTb.TabIndex = 81 + Me.rbFunctionsTb.Text = "Functions (Table)" + Me.rbFunctionsTb.UseVisualStyleBackColor = True + ' + 'rbFunctionsSc + ' + Me.rbFunctionsSc.AutoSize = True + Me.rbFunctionsSc.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rbFunctionsSc.Location = New System.Drawing.Point(205, 8) + Me.rbFunctionsSc.Name = "rbFunctionsSc" + Me.rbFunctionsSc.Size = New System.Drawing.Size(114, 17) + Me.rbFunctionsSc.TabIndex = 80 + Me.rbFunctionsSc.Text = "Functions (scalar)" + Me.rbFunctionsSc.UseVisualStyleBackColor = True + ' 'lblsave ' Me.lblsave.AutoSize = True @@ -1910,28 +1933,6 @@ Partial Class frmNIVerknuepfungen Me.SplitContainer1.SplitterDistance = 521 Me.SplitContainer1.TabIndex = 51 ' - 'rbFunctionsSc - ' - Me.rbFunctionsSc.AutoSize = True - Me.rbFunctionsSc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rbFunctionsSc.Location = New System.Drawing.Point(205, 8) - Me.rbFunctionsSc.Name = "rbFunctionsSc" - Me.rbFunctionsSc.Size = New System.Drawing.Size(114, 17) - Me.rbFunctionsSc.TabIndex = 80 - Me.rbFunctionsSc.Text = "Functions (scalar)" - Me.rbFunctionsSc.UseVisualStyleBackColor = True - ' - 'rbFunctionsTb - ' - Me.rbFunctionsTb.AutoSize = True - Me.rbFunctionsTb.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rbFunctionsTb.Location = New System.Drawing.Point(322, 8) - Me.rbFunctionsTb.Name = "rbFunctionsTb" - Me.rbFunctionsTb.Size = New System.Drawing.Size(111, 17) - Me.rbFunctionsTb.TabIndex = 81 - Me.rbFunctionsTb.Text = "Functions (Table)" - Me.rbFunctionsTb.UseVisualStyleBackColor = True - ' 'frmNIVerknuepfungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/ToolCollection/frmNIVerknuepfungen.vb b/ToolCollection/frmNIVerknuepfungen.vb index 7285d88..5c5a9eb 100644 --- a/ToolCollection/frmNIVerknuepfungen.vb +++ b/ToolCollection/frmNIVerknuepfungen.vb @@ -381,7 +381,7 @@ Public Class frmNIVerknuepfungen Me.pnlfulltext.Visible = True pnlfulltext.Enabled = False pnlfulltext.Location = New Point(9, 317) - pnlfulltext.Size = New Size(1000, 260) + pnlfulltext.Size = New Size(1000, 200) pnlfulltext.Anchor = AnchorStyles.Top Or AnchorStyles.Bottom Or AnchorStyles.Left Or AnchorStyles.Right lvwVerknuepfungen.Columns(1).Text = "Regular Expression" @@ -2823,6 +2823,7 @@ Public Class frmNIVerknuepfungen pos_von = 10000 End If Volltext_indexer(txtregex.Text, RichTextBox_RegEx.Text, pos_von, pos_bis, chkboxWhitespace.Checked) + RichTextBox_RegEx.ScrollBars = RichTextBoxScrollBars.ForcedBoth End If End Sub @@ -2842,10 +2843,10 @@ Public Class frmNIVerknuepfungen ' die Vorkommen im SQL-String auslesen Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(fulltext) ' alle Vorkommen der windream-Indexe im SQL-String durchlaufen - Dim Anzahl As Integer = 0 + Dim MatchedElements As Integer = 0 Dim Exit_For = False For Each element As System.Text.RegularExpressions.Match In elemente - Anzahl += 1 + MatchedElements += 1 Index += 1 'MsgBox(element.ToString) 'filling the row with values. Item property is used to set the field value. @@ -2853,18 +2854,20 @@ Public Class frmNIVerknuepfungen If Pos_To <> 0 And Pos_From >= Pos_From Then findTextAndHighlight(element.ToString, Color.Orange) ' den übergebenen/gefundenen IndexWert, eintragen - ReDim Preserve Ergebnis(Anzahl - 1) - Ergebnis(Anzahl - 1) = Convert.ToString(element.ToString) + ReDim Preserve Ergebnis(MatchedElements - 1) + Ergebnis(MatchedElements - 1) = Convert.ToString(element.ToString) 'Das Ende ist erreicht - Ausstieg - If Pos_To = Anzahl Then + If Pos_To = MatchedElements Then Exit_For = True End If Else 'Es gibt nur From, also auch nur einen Wert - If Pos_From <> Anzahl Then + If Pos_From <> MatchedElements Then + ReDim Preserve Ergebnis(0) + Ergebnis(0) = Convert.ToString(element.ToString) findTextAndHighlight(element.ToString, Color.Yellow) - ElseIf Pos_From = Anzahl Then - findTextAndHighlight(element.ToString, Color.Orange) + ElseIf Pos_From = MatchedElements Then + findTextAndHighlight(element.ToString, Color.OrangeRed) 'Das Ende ist erreicht - Ausstieg ReDim Preserve Ergebnis(0) Ergebnis(0) = Convert.ToString(element.ToString) @@ -2873,30 +2876,10 @@ Public Class frmNIVerknuepfungen End If Else findTextAndHighlight(element.ToString, Color.Yellow) - ReDim Preserve Ergebnis(Anzahl - 1) + ReDim Preserve Ergebnis(MatchedElements - 1) ' den übergebenen/gefundenen IndexWert, eintragen - Ergebnis(Anzahl - 1) = Convert.ToString(element.ToString) + Ergebnis(MatchedElements - 1) = Convert.ToString(element.ToString) End If - 'If Pos_From <> 9999 Then - ' If Anzahl = Pos_From Then - - ' ReDim Preserve Ergebnis(Anzahl - 1) - ' ' den übergebenen/gefundenen IndexWert, eintragen - ' Ergebnis(Anzahl) = Convert.ToString(element.ToString) - ' If Pos_To = Anzahl Then - ' Exit_For = True - ' End If - ' Else - ' Index += 1 - ' End If - 'Else - ' findTextAndHighlight(element.ToString) - ' ReDim Preserve Ergebnis(Anzahl) - ' ' den, übergebenen/gefundenen IndexWert, eintragen - ' Ergebnis(Anzahl) = Convert.ToString(element.ToString) - ' Index += 1 - ' Anzahl += 1 - 'End If If Exit_For = True Then Exit For @@ -2911,16 +2894,16 @@ Public Class frmNIVerknuepfungen End If End If - If Anzahl > 0 Then + If MatchedElements > 0 Then If Ergebnis.Length > 1 Then 'If Pos_From <> 10000 And Pos_To <> 0 Then ' Meldung = "Es konnten " & Anzahl & " Vorkommen/Werte gelesen/ausgewertet werden!" & vbNewLine & "Bitte achten Sie darauf einen VEKTOR-INDEX als Ziel zu wählen" & vbNewLine & "Die Ergebnisse wurden gehighlighted!" 'Else - Meldung = "Es konnten " & Anzahl & " Vorkommen/Werte gelesen/ausgewertet werden!" & vbNewLine & "Bitte achten Sie darauf einen VEKTOR-INDEX als Ziel zu wählen" & vbNewLine & "Die Ergebnisse wurden gehighlighted!" + Meldung = "Es konnten " & MatchedElements & " Vorkommen/Werte gelesen/ausgewertet werden!" & vbNewLine & "Bitte achten Sie darauf einen VEKTOR-INDEX als Ziel zu wählen" & vbNewLine & "Die Ergebnisse wurden gehighlighted!" 'End If ElseIf Ergebnis.Length = 1 Then - Meldung = "Es konnte genau 1 Wert gelesen/ausgewertet werden!" & vbNewLine & "Es handelte sich um das " & Anzahl & ". Vorkommen im Text!" & vbNewLine & "ALLE bisherigen Ergebnisse wurden gehighlighted!" + Meldung = "Es konnte genau 1 Wert gelesen/ausgewertet werden!" & vbNewLine & "Es handelte sich um das " & MatchedElements & ". Vorkommen im Text!" & vbNewLine & "ALLE bisherigen Ergebnisse wurden gehighlighted!" End If MsgBox(Meldung, MsgBoxStyle.Information, "Erfolgsmeldung:") Else diff --git a/ToolCollection/frmStart.vb b/ToolCollection/frmStart.vb index 0469ec3..a58dafc 100644 --- a/ToolCollection/frmStart.vb +++ b/ToolCollection/frmStart.vb @@ -162,7 +162,7 @@ Public Class frmStart Case "MerkatorIntegration" Me.GroupBoxIntegration.Visible = True Case "MoveandRename" - Me.grbxMoRe.Visible = True + 'Me.grbxMoRe.Visible = True licMore = True Case "NachbearbeitungAD" btnNachbearbeitungAD.Visible = True