From 52966dcc4719023e77746f92b2902937fc80e7fc Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 29 Oct 2018 13:26:57 +0100 Subject: [PATCH] jj: Write Vector fields \o/ --- .vs/Global_Indexer/DesignTimeBuild/.dtbcache | Bin 196 -> 196 bytes Global_Indexer/ClassWindream.vb | 89 ++++----- Global_Indexer/MyDataset.Designer.vb | 33 +++- Global_Indexer/MyDataset.xsd | 102 +++++----- Global_Indexer/MyDataset.xss | 82 ++++---- Global_Indexer/frmIndex.resx | 189 +++++++------------ Global_Indexer/frmIndex.vb | 39 +++- Global_Indexer/frmLookupGrid.Designer.vb | 10 +- Global_Indexer/frmLookupGrid.vb | 7 +- Global_Indexer/frmStart.vb | 3 +- 10 files changed, 290 insertions(+), 264 deletions(-) diff --git a/.vs/Global_Indexer/DesignTimeBuild/.dtbcache b/.vs/Global_Indexer/DesignTimeBuild/.dtbcache index 5c6a9ff87862297a1da9db3907fe0405ae55d3d0..c9d054da3e4fccdac2943f23a78a9adac720c6f8 100644 GIT binary patch delta 47 zcmX@Yc!Y6+h^Pw#1A{Ar6+;Yz7egvT9uTH7cuh1^Der Wert/die Werte die dem Index zugewiesen werden sollen ''' Liefert True wenn das Indexieren erfolgreich war, sonst False ''' - Private Shared Function Indexiere(ByVal filenameZiel As String, ByVal index As String, ByVal werte As Object) + Public Shared Function Indexiere(ByVal filenameZiel As String, ByVal index As String, ByVal werte As Object) As Boolean If LogErrorsOnly = False Then ClassLogger.Add(" - In Indexierungsvorgang für: " & filenameZiel, False) Try Dim WMObject As WINDREAMLib.WMObject = Nothing '= CreateObject("WINDREAMLib.WMObject") '= New WINDREAMLib.WMObject 'CreateObject("WINDREAMLib.WMObject") 'MsgBox("Indexiere: " & vbNewLine & filenameZiel) 'werte Is Nothing Or _ ' überprüfen ob alle notwendigen Informationen angegeben wurden (sonst abbrechen) - If filenameZiel Is Nothing Or _ - filenameZiel = "" Or _ - index Is Nothing Or _ - index = "" Or _ + If filenameZiel Is Nothing Or + filenameZiel = "" Or + index Is Nothing Or + index = "" Or Not ExistIndexInObjekttyp(_WDObjekttyp, index) Then If LogErrorsOnly = False Then ClassLogger.Add("=> Hinweis: Die Datei wurde auf Grund eines Problems in der Initialisierung nicht vollständig indexiert.", False) Return False @@ -1624,23 +1624,36 @@ Public Class ClassWindream ' wenn es sich um einen TypVektorIndex handelt If TypDesIndexes >= 4096 And TypDesIndexes < 8192 Then If LogErrorsOnly = False Then ClassLogger.Add("- Es handelt sich um einen Vektorindex", False) - Dim temp_arr As New ArrayList + 'Dim temp_arr As New ArrayList + + Dim arrayIndex = 0 + Dim temp_arr As Object + Dim arrayLength As Integer = 0 + For Each element In werte + arrayLength = arrayLength + 1 + Next + + ReDim temp_arr(arrayLength - 1) Select Case (TypDesIndexes - WMObjectVariableValueTypeVector) 'VektorIndex vom Typ String 64' Case 1 If LogErrorsOnly = False Then ClassLogger.Add("- VektorIndex vom Typ String 1", False) + For Each wert As Object In werte 'Führende Nullen Entfernen If werte.ToString.StartsWith("0") Then Dim werteString As String = CStr(CInt(wert.ToString)) wert = werteString - temp_arr.Add(CStr(wert)) + temp_arr(arrayIndex) = CStr(wert) ClassLogger.Add("- Führende Nullen wurden entfernt", False) Else - temp_arr.Add(CStr(wert)) + temp_arr(arrayIndex) = CStr(wert) + End If + arrayIndex = arrayIndex + 1 + If LogErrorsOnly = False Then ClassLogger.Add("- Wert " & CStr(wert) & " konvertiert", False) Next Case WMObjectVariableValueTypeUndefined @@ -1652,61 +1665,72 @@ Public Class ClassWindream 'Führende Nullen Entfernen If werte.ToString.StartsWith("0") Then wert = CInt(wert) - temp_arr.Add(CStr(wert)) + temp_arr(arrayIndex) = CStr(wert) ClassLogger.Add("- Führende Nullen wurden entfernt", False) Else - temp_arr.Add(CStr(wert)) + temp_arr(arrayIndex) = CStr(wert) End If + + arrayIndex = arrayIndex + 1 + If LogErrorsOnly = False Then ClassLogger.Add("- Wert " & CStr(wert) & " konvertiert", False) Next Case WMObjectVariableValueTypeInteger If LogErrorsOnly = False Then ClassLogger.Add("- VektorIndex vom Typ Integer", False) For Each wert As Object In werte - temp_arr.Add(CInt(wert)) + temp_arr(arrayIndex) = CInt(wert) + arrayIndex = arrayIndex + 1 Next Case WMObjectVariableValueTypeFloat For Each wert As Object In werte wert = wert.ToString.Replace(".", ",") - temp_arr.Add(CDbl(wert)) + temp_arr(arrayIndex) = CDbl(wert) + arrayIndex = arrayIndex + 1 Next Case WMObjectVariableValueTypeBoolean For Each wert As Object In werte Try - temp_arr.Add(CBool(wert)) + temp_arr(arrayIndex) = CBool(wert) Catch ex As Exception ' Nothing zuweisen damit SetVariableValue nicht ausgeführt wird temp_arr = Nothing End Try + arrayIndex = arrayIndex + 1 Next Case WMObjectVariableValueTypeDate For Each wert As Object In werte 'wert = - temp_arr.Add(CDate(wert)) + temp_arr(arrayIndex) = CDate(wert) + arrayIndex = arrayIndex + 1 Next Case WMObjectVariableValueTypeFixedPoint For Each wert As Object In werte - temp_arr.Add(CDbl(wert)) + temp_arr(arrayIndex) = CDbl(wert) + arrayIndex = arrayIndex + 1 Next Case WMObjectVariableValueTypeTimeStamp For Each wert As Object In werte - temp_arr.Add(CInt(wert)) + temp_arr(arrayIndex) = CInt(wert) + arrayIndex = arrayIndex + 1 Next Case WMObjectVariableValueTypeCurrency For Each wert As Object In werte Dim aValue As System.Runtime.InteropServices.CurrencyWrapper = New System.Runtime.InteropServices.CurrencyWrapper(werte) - temp_arr.Add(aValue) + temp_arr(arrayIndex) = aValue + arrayIndex = arrayIndex + 1 Next Case WMObjectVariableValueTypeTime For Each wert As Object In werte - temp_arr.Add(CDate(wert)) + temp_arr(arrayIndex) = CDate(wert) + arrayIndex = arrayIndex + 1 Next Case WMObjectVariableValueTypeVariant @@ -1714,13 +1738,8 @@ Public Class ClassWindream End Select - If temp_arr.Count > 0 Then - If LogErrorsOnly = False Then ClassLogger.Add("- Einträge in temp_arr also Speichern des Arrays in convertValue", False) - ' convertValue = Nothing - ' convertValue = temp_arr.ToArray - Else - ' convertValue = vbEmpty - End If + werte = temp_arr + If LogErrorsOnly = False Then ClassLogger.Add("- Werte erfolgreich konvertiert", False) Else ' convertValue = vbEmpty @@ -1760,28 +1779,10 @@ Public Class ClassWindream WMObject.unlock() If LogErrorsOnly = False Then ClassLogger.Add(" - die Sperrung des Dokuments aufheben", False) Catch ex As Exception + ' nichts tun (Datei war nicht gesperrt) End Try - 'Catch ex As Exception - ' ' auch wenn ein Fehler aufgetreten ist muss das Dokument gespeichert werden, um den Dokumenttypen zu speichern - ' WMObject.Save() - - ' ' Unlock in einem unbehandelten Try-Block um Fehler abzufangen, - ' ' wenn eine Datei nicht gelocked ist - ' Try - ' WMObject.unlock() - ' Catch ex2 As Exception - ' ' nichts tun (Datei war nicht gesperrt) - ' End Try - - - ' ' Nachricht für den TreeView-Log - ' indexBeschreibung &= "konnte nicht indexiert werden" - ' ClassLogger.Add(" DATEI konnte nicht indexiert werden", True) - 'End Try - - ' die Indexierungsinformationen für den TreeView-Log zurückgeben Return True Else diff --git a/Global_Indexer/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index c44cae4..a3b72f1 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -24240,19 +24240,24 @@ Namespace MyDatasetTableAdapters _ Private Sub InitCommandCollection() - Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT GUID, NAME, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ " TBDD_GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (INTERNAL = 0)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(1).Connection = Me.Connection + Me._commandCollection(1).CommandText = "SELECT GUID, NAME, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ + " TBDD_USER_GROUPS" + Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text End Sub _ - Public Overloads Overridable Function Fill(ByVal dataTable As MyDataset.TBDD_GROUPSDataTable) As Integer + Public Overloads Overridable Function FillNew(ByVal dataTable As MyDataset.TBDD_GROUPSDataTable) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) If (Me.ClearBeforeFill = true) Then dataTable.Clear @@ -24272,6 +24277,30 @@ Namespace MyDatasetTableAdapters Return dataTable End Function + _ + Public Overloads Overridable Function Fill(ByVal dataTable As MyDataset.TBDD_GROUPSDataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(1) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetDataBy() As MyDataset.TBDD_GROUPSDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(1) + Dim dataTable As MyDataset.TBDD_GROUPSDataTable = New MyDataset.TBDD_GROUPSDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + _ diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index a61467a..adc7715 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -933,7 +933,7 @@ ORDER BY NAME - + DELETE FROM [TBDD_USER_GROUPS] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN))) @@ -995,7 +995,17 @@ SELECT GUID, NAME, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_US - + + + + + SELECT GUID, NAME, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN +FROM TBDD_USER_GROUPS + + + + + @@ -1733,7 +1743,7 @@ ORDER BY GUID DESC - + @@ -1808,7 +1818,7 @@ ORDER BY GUID DESC - + @@ -1891,7 +1901,7 @@ ORDER BY GUID DESC - + @@ -1928,7 +1938,7 @@ ORDER BY GUID DESC - + @@ -1942,7 +1952,7 @@ ORDER BY GUID DESC - + @@ -1956,7 +1966,7 @@ ORDER BY GUID DESC - + @@ -2038,7 +2048,7 @@ ORDER BY GUID DESC - + @@ -2111,7 +2121,7 @@ ORDER BY GUID DESC - + @@ -2224,7 +2234,7 @@ ORDER BY GUID DESC - + @@ -2320,7 +2330,7 @@ ORDER BY GUID DESC - + @@ -2375,7 +2385,7 @@ ORDER BY GUID DESC - + @@ -2383,7 +2393,7 @@ ORDER BY GUID DESC - + @@ -2433,7 +2443,7 @@ ORDER BY GUID DESC - + @@ -2505,7 +2515,7 @@ ORDER BY GUID DESC - + @@ -2586,7 +2596,7 @@ ORDER BY GUID DESC - + @@ -2600,7 +2610,7 @@ ORDER BY GUID DESC - + @@ -2609,7 +2619,7 @@ ORDER BY GUID DESC - + @@ -2639,7 +2649,7 @@ ORDER BY GUID DESC - + @@ -2664,7 +2674,7 @@ ORDER BY GUID DESC - + @@ -2703,7 +2713,7 @@ ORDER BY GUID DESC - + @@ -2735,7 +2745,7 @@ ORDER BY GUID DESC - + @@ -2807,7 +2817,7 @@ ORDER BY GUID DESC - + @@ -2846,7 +2856,7 @@ ORDER BY GUID DESC - + @@ -2860,7 +2870,7 @@ ORDER BY GUID DESC - + @@ -2906,7 +2916,7 @@ ORDER BY GUID DESC - + @@ -2966,7 +2976,7 @@ ORDER BY GUID DESC - + @@ -2998,7 +3008,7 @@ ORDER BY GUID DESC - + @@ -3036,7 +3046,7 @@ ORDER BY GUID DESC - + @@ -3058,7 +3068,7 @@ ORDER BY GUID DESC - + @@ -3179,21 +3189,21 @@ ORDER BY GUID DESC - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Global_Indexer/MyDataset.xss b/Global_Indexer/MyDataset.xss index 7d23529..4adc415 100644 --- a/Global_Indexer/MyDataset.xss +++ b/Global_Indexer/MyDataset.xss @@ -4,37 +4,37 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - + + + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - + @@ -101,35 +101,39 @@ - + - 1127 - 251 + 1096 + 262 - 741 - 251 + 1047 + 262 - 741 - 220 + 1047 + 228 - + - 871 + 951 247 - 871 - 220 + 951 + 211 + + + 1014 + 211 - + 94 @@ -149,7 +153,7 @@ - + 129 @@ -165,7 +169,7 @@ - + 183 @@ -177,7 +181,7 @@ - + 88 @@ -197,7 +201,7 @@ - + 117 @@ -217,7 +221,7 @@ - + 765 @@ -233,7 +237,7 @@ - + 409 @@ -253,7 +257,7 @@ - + 38 diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index e84eae8..5f97781 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -125,9 +125,6 @@ 0, 0 - - 4, 4, 4, 4 - True @@ -136,13 +133,10 @@ Fill - 0, 128 - - - 4, 4, 4, 4 + 0, 104 - 688, 338 + 535, 269 8 @@ -172,16 +166,13 @@ MiddleRight - 524, 93 - - - 4, 4, 4, 4 + 408, 76 No - 159, 27 + 123, 21 12 @@ -211,13 +202,10 @@ MiddleLeft - 512, 49 - - - 4, 4, 4, 4 + 398, 40 - 171, 37 + 133, 30 11 @@ -247,7 +235,7 @@ Magenta - 145, 24 + 121, 24 Top Most = False @@ -256,7 +244,7 @@ 0, 0 - 688, 27 + 535, 27 6 @@ -283,10 +271,13 @@ Verdana, 9.75pt - 5, 96 + 4, 78 + + + 2, 0, 2, 0 - 51, 20 + 39, 16 3 @@ -313,13 +304,10 @@ Top, Left, Right - 6, 54 - - - 4, 4, 4, 4 + 5, 44 - 502, 29 + 391, 25 2 @@ -340,13 +328,10 @@ True - 4, 31 - - - 4, 0, 4, 0 + 3, 25 - 278, 23 + 208, 17 1 @@ -373,10 +358,10 @@ 0, 0 - 3, 4, 3, 4 + 2, 3, 2, 3 - 688, 128 + 535, 104 4 @@ -400,13 +385,10 @@ Verdana, 9.75pt, style=Bold, Italic - 4, 48 - - - 4, 4, 4, 4 + 3, 39 - 688, 24 + 520, 20 10 @@ -433,13 +415,13 @@ Verdana, 9.75pt - 4, 16 + 3, 13 - 3, 4, 3, 4 + 2, 3, 2, 3 - 226, 24 + 176, 20 3 @@ -466,10 +448,13 @@ Verdana, 8.25pt - 0, 77 + 0, 62 + + + 2, 0, 2, 0 - 110, 17 + 92, 13 2 @@ -496,16 +481,16 @@ Verdana, 6.75pt - 4, 96 + 3, 78 - 3, 4, 3, 4 + 2, 3, 2, 3 True - 678, 41 + 528, 34 1 @@ -532,13 +517,13 @@ MiddleLeft - 486, 7 + 378, 6 - 4, 5, 4, 5 + 3, 4, 3, 4 - 197, 37 + 153, 30 0 @@ -565,13 +550,13 @@ Bottom - 0, 466 + 0, 373 - 3, 4, 3, 4 + 2, 3, 2, 3 - 688, 148 + 535, 120 7 @@ -604,16 +589,13 @@ Fill - 4, 26 - - - 4, 4, 4, 4 + 3, 21 - 26, 25 + 20, 20 - 249, 69 + 194, 54 2 @@ -634,19 +616,16 @@ 1477, 173 - 153, 20 + 120, 17 ToolStripStatusLabel1 - 4, 95 - - - 1, 0, 18, 0 + 3, 75 - 249, 25 + 194, 22 0 @@ -670,16 +649,10 @@ Segoe UI Semibold, 9.75pt, style=Bold, Italic - 75, 435 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 + 58, 352 - 257, 124 + 200, 100 5 @@ -706,13 +679,10 @@ Segoe UI, 9.75pt, style=Italic - 4, 26 - - - 5, 5, 5, 5 + 3, 21 - 249, 29 + 194, 25 0 @@ -733,16 +703,10 @@ Segoe UI Semibold, 9.75pt, style=Bold, Italic - 26, 79 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 + 20, 64 - 257, 72 + 200, 58 4 @@ -766,13 +730,10 @@ Fill - 0, 177 - - - 4, 4, 4, 4 + 0, 141 - 404, 177 + 314, 142 4 @@ -796,7 +757,7 @@ Segoe UI Semibold, 9pt, style=Bold, Italic - 174, 21 + 143, 20 ToolStripStatusLabel1 @@ -805,19 +766,16 @@ Magenta - 168, 24 + 137, 23 Seitenansicht Minimal - 0, 354 - - - 1, 0, 18, 0 + 0, 283 - 404, 26 + 314, 25 3 @@ -840,11 +798,8 @@ 0, 0 - - 5, 5, 5, 5 - - 404, 177 + 314, 141 RibbonControl1 @@ -859,13 +814,10 @@ 2 - 86, 31 - - - 4, 4, 4, 4 + 67, 25 - 404, 380 + 314, 308 1 @@ -895,13 +847,10 @@ 1 - 1162, 614 + 904, 493 - 688 - - - 5 + 535 8 @@ -922,7 +871,7 @@ 17, 17 - 0, 20 + 0, 17 MiddleLeft @@ -931,7 +880,7 @@ False - 122, 20 + 98, 17 Vorschau ist aktiv @@ -940,13 +889,13 @@ False - 0, 614 + 0, 493 - 1, 0, 13, 0 + 1, 0, 10, 0 - 1162, 22 + 904, 22 6 @@ -997,16 +946,16 @@ 100 - 9, 21 + 7, 17 - 1162, 636 + 904, 515 Segoe UI, 9.75pt - 4, 5, 4, 5 + 3, 4, 3, 4 Indexierung Drag 'n Drop File: diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 16540ed..c649aee 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -608,6 +608,7 @@ Public Class frmIndex AddHandler lookupButton.Click, Sub() Dim frm As New frmLookupGrid() + frm.FormBorderStyle = FormBorderStyle.SizableToolWindow frm.MultiSelect = False frm.DataSource = table frm.StartPosition = FormStartPosition.Manual @@ -907,8 +908,9 @@ Public Class frmIndex End If If ctrl.Name.StartsWith("cmbMulti") Then Dim cmbMulti As DevExpress.XtraEditors.GridLookUpEdit = ctrl + Dim values As List(Of Object) = cmbMulti.Properties.DataSource - If cmbMulti.Text = "" Then + If values.Count = 0 Then Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & dokartid & " AND NAME = '" & Replace(cmbMulti.Name, "cmbMulti", "") & "'", MyConnectionString, True) If optional_index = False Then @@ -920,9 +922,25 @@ Public Class frmIndex result = True End If Else - Indexwert_Postprocessing(Replace(cmbMulti.Name, "cmbMulti", ""), cmbMulti.Text) - result = True + Dim vectorValue = String.Join(";", values) + Indexwert_Postprocessing(Replace(cmbMulti.Name, "cmbMulti", ""), vectorValue) End If + + 'If cmbMulti.Text = "" Then + ' Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & dokartid & " AND NAME = '" & Replace(cmbMulti.Name, "cmbMulti", "") & "'", MyConnectionString, True) + + ' If optional_index = False Then + ' MsgBox("Bitte wählen Sie einen Wert aus der Combobox.", MsgBoxStyle.Exclamation) + ' cmbMulti.Focus() + ' Return False + ' Else + ' Indexwert_Postprocessing(Replace(cmbMulti.Name, "cmbMulti", ""), "") + ' result = True + ' End If + 'Else + ' Indexwert_Postprocessing(Replace(cmbMulti.Name, "cmbMulti", ""), cmbMulti.Text) + ' result = True + 'End If ElseIf ctrl.Name.StartsWith("cmbSingle") Then Dim cmbSingle As TextBox = ctrl @@ -1308,14 +1326,25 @@ Public Class frmIndex If LogErrorsOnly = False Then ClassLogger.Add(" >> Manueller Indexvalue: " & idxvalue.ToString, False) Count += 1 - indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, idxvalue) + + ' den Typ des Zielindexes auslesen + Dim indexType As Integer = ClassWindream.GetTypeOfIndexAsIntByName(indexname) + + If indexType < ClassWindream.WMObjectVariableValueTypeVector Then + indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, idxvalue) + Else + Dim indexArray = Split(idxvalue, ";") + indexierung_erfolgreich = ClassWindream.Indexiere(CURRENT_NEWFILENAME.Substring(2), indexname, indexArray) + End If + + 'indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, idxvalue) If indexierung_erfolgreich = False Then MsgBox("Error in Indexing file - See log", MsgBoxStyle.Critical) Return False Exit For End If Else - If LogErrorsOnly = False Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> No Indexing: indexname: " & indexname, False) ClassLogger.Add(" >> No Indexing: is optional? " & optional_Index.ToString, False) End If diff --git a/Global_Indexer/frmLookupGrid.Designer.vb b/Global_Indexer/frmLookupGrid.Designer.vb index 7bdadd0..f30e009 100644 --- a/Global_Indexer/frmLookupGrid.Designer.vb +++ b/Global_Indexer/frmLookupGrid.Designer.vb @@ -38,7 +38,7 @@ Partial Class frmLookupGrid Me.gridLookup.Location = New System.Drawing.Point(0, 0) Me.gridLookup.MainView = Me.viewLookup Me.gridLookup.Name = "gridLookup" - Me.gridLookup.Size = New System.Drawing.Size(295, 233) + Me.gridLookup.Size = New System.Drawing.Size(446, 266) Me.gridLookup.TabIndex = 0 Me.gridLookup.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewLookup}) ' @@ -58,9 +58,9 @@ Partial Class frmLookupGrid Me.Panel1.Controls.Add(Me.btnClear) Me.Panel1.Controls.Add(Me.btnOK) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel1.Location = New System.Drawing.Point(0, 233) + Me.Panel1.Location = New System.Drawing.Point(0, 266) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(295, 36) + Me.Panel1.Size = New System.Drawing.Size(446, 36) Me.Panel1.TabIndex = 1 ' 'btnClear @@ -88,12 +88,14 @@ Partial Class frmLookupGrid Me.AcceptButton = Me.btnOK Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(295, 269) + Me.ClientSize = New System.Drawing.Size(446, 302) Me.Controls.Add(Me.gridLookup) Me.Controls.Add(Me.Panel1) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmLookupGrid" + Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual Me.Text = "Auswahl:" Me.TopMost = True CType(Me.gridLookup, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/Global_Indexer/frmLookupGrid.vb b/Global_Indexer/frmLookupGrid.vb index 23c60a6..b1dee1e 100644 --- a/Global_Indexer/frmLookupGrid.vb +++ b/Global_Indexer/frmLookupGrid.vb @@ -27,8 +27,10 @@ Public Class frmLookupGrid If MultiSelect Then ' Selected Spalte anpassen - view.Columns.Item(0).Caption = " " - view.Columns.Item(0).Resize(10) + Dim checkboxColumn = view.Columns.Item(0) + checkboxColumn.Caption = " " + checkboxColumn.MaxWidth = 10 + Text = "Wählen Sie einen oder mehrere Werte:" dataColumn = 1 Else @@ -57,7 +59,6 @@ Public Class frmLookupGrid ' Focus auf Find panel setzen view.ShowFindPanel() - End Sub Private Sub SyncItemsWithView(view As GridView) diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 4d3af01..68a40a5 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -308,7 +308,8 @@ Public Class frmStart If USER_LANGUAGE = "de-DE" Then 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) Else - result = MessageBox.Show("You abort the indexdialog for the 2nd time!" & vbNewLine & "Do You want to abort all file-indexing?", "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + result = MessageBox.Show("You abort the indexdialog for the 2nd time!" & vbNewLine & "Do You want to abort all file- +?", "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) End If If result = MsgBoxResult.Yes Then