diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index 93f6349..d82e6a9 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -173,41 +173,41 @@ False - P:\Install .Net\0 DD - Bibliotheken\Modules\Base\DigitalData.Modules.Base.dll + ..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - + False - P:\Install .Net\0 DD - Bibliotheken\Modules\Config\DigitalData.Modules.Config.dll + ..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - + False - P:\Install .Net\0 DD - Bibliotheken\Modules\Database\DigitalData.Modules.Database.dll + ..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll ..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll False - P:\Install .Net\0 DD - Bibliotheken\Modules\License\DigitalData.Modules.License.dll + ..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll - + False - P:\Install .Net\0 DD - Bibliotheken\Modules\Logging\DigitalData.Modules.Logging.dll + ..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll False - P:\Install .Net\0 DD - Bibliotheken\Modules\Messaging\DigitalData.Modules.Messaging.dll + ..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll ..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll False - P:\Install .Net\0 DD - Bibliotheken\Modules\Windows\DigitalData.Modules.Windows.dll + ..\..\..\2_DLL Projekte\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll - + False - P:\Install .Net\0 DD - Bibliotheken\Modules\Windream\DigitalData.Modules.Windream.dll + ..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll False diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index b89b0d1..8331cfd 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index e6fda9e..0a907e1 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -789,22 +789,21 @@ Public Class frmIndex ' den Typ des Zielindexes auslesen Dim oIndexType As Integer = WINDREAM.GetIndexType(indexname) _Logger.Debug($"oIndexType [{oIndexType}]...") - If oIndexType < WINDREAM.WMObjectVariableValueTypeVector Then + If oIndexType > 4095 And oIndexType < WINDREAM.WMObjectVariableValueTypeVector Then _Logger.Debug($"Indexing oIndexType < WINDREAM.WMObjectVariableValueTypeVector...") - indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, idxvalue, CURR_DOKART_OBJECTTYPE) - Else Dim oSplitArray = Split(idxvalue, ClassConstants.VECTORSEPARATOR) Dim oListofString As New List(Of String) - If oSplitArray.Count = 0 Then - oListofString.Add(idxvalue) + If oSplitArray.Length <= 1 Then + indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, idxvalue, CURR_DOKART_OBJECTTYPE) Else For Each oStr In oSplitArray oListofString.Add(oStr) Next + indexierung_erfolgreich = WINDREAM.SetFileIndexLoS(CURRENT_NEWFILENAME, indexname, oListofString, CURR_DOKART_OBJECTTYPE) End If - - indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, oListofString, CURR_DOKART_OBJECTTYPE) + Else + indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, idxvalue, CURR_DOKART_OBJECTTYPE) End If 'indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, idxvalue) @@ -847,9 +846,7 @@ Public Class frmIndex ' den Typ des Zielindexes auslesen Dim indexType As Integer = WINDREAM.GetIndexType(oIndexName) - If indexType < WINDREAM.WMObjectVariableValueTypeVector Then - indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, oIndexName, oIndexValue, CURR_DOKART_OBJECTTYPE) - Else + If indexType > 4095 And indexType < WINDREAM.WMObjectVariableValueTypeVector Then Dim oExistingItems = WINDREAM.GetIndexValue(CURRENT_NEWFILENAME, oIndexName) Dim oSplitArray = Split(oIndexValue, ClassConstants.VECTORSEPARATOR) @@ -870,7 +867,10 @@ Public Class frmIndex oListofString = oListofString.Distinct().ToList() End If - indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, oIndexName, oListofString, CURR_DOKART_OBJECTTYPE) + indexierung_erfolgreich = WINDREAM.SetFileIndexLoS(CURRENT_NEWFILENAME, oIndexName, oListofString, CURR_DOKART_OBJECTTYPE) + + Else + indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, oIndexName, oIndexValue, CURR_DOKART_OBJECTTYPE) End If 'indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, Indexvalue, CURR_DOKART_OBJECTTYPE) diff --git a/SetupVS19/Product.wxs b/SetupVS19/Product.wxs index 4f8b191..f8fece4 100644 --- a/SetupVS19/Product.wxs +++ b/SetupVS19/Product.wxs @@ -125,10 +125,10 @@ - - - - + + + +