merge

.gitignore

@@ -154,5 +154,5 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 .DS_Store
-/.vs/Global_Indexer/v15/Server/sqlite3
+
-/.vs/Global_Indexer/v16/Server/sqlite3
+.vs

.vs/ProjectSettings.json

@@ -1,3 +0,0 @@
-{
-  "CurrentProjectSetting": null
-}

.vs/VSWorkspaceState.json

@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\Global_Indexer.sln",
-  "PreviewInSolutionExplorer": false
-}

Global_Indexer/ClassConfig.vb

@@ -19,5 +19,4 @@ Public Class ClassConfig
     ' Misc Settings
     Public Property LogDEBUG As Boolean = True
     Public Property WindreamSearchMaximized As Boolean = False
-    Public Property OverrideLanguage As String = ""
 End Class

Global_Indexer/ClassInit.vb

@@ -24,7 +24,7 @@ Public Class ClassInit
 
     Public Sub InitConfig()
         CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath)
-        LOGCONFIG.Debug = Not CONFIG.Config.LogDEBUG
+        LOGCONFIG.Debug = CONFIG.Config.LogDEBUG
         LOGGER.Info("Debug log set to: [{0}]", LOGCONFIG.Debug)
 
         MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString)
@@ -237,7 +237,7 @@ Public Class ClassInit
         Try
             Dim oSql As String
 
-            oSql = String.Format($"SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{Environment.UserName}','GLOBIX',{1},'{CONFIG.Config.OverrideLanguage}')")
+            oSql = String.Format($"SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{Environment.UserName}','GLOBIX',{1})")
             Dim DT_CHECKUSER_MODULE As DataTable = DATABASE_ECM.GetDatatable(oSql)
             If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
                 LOGGER.Info("DT_CHECKUSER_MODULE.Rows.Count = 0")

Global_Indexer/My Project/AssemblyInfo.vb

@@ -14,8 +14,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("File Flow")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
+<Assembly: AssemblyCopyright("Copyright © 2023")>
-<Assembly: AssemblyTrademark("2.6.2.0")>
+<Assembly: AssemblyTrademark("2.6.6.5")>
 
 <Assembly: ComVisible(False)> 
 
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.5.0")>
+<Assembly: AssemblyVersion("2.6.6.5")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

Global_Indexer/frmAdministration.vb

@@ -527,12 +527,13 @@ Public Class frmAdministration
 
             Dim oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocTypeGuid} AND ACTIVE = 1")
             Dim oPlaceholders = oDatatable.AsEnumerable().
-                ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("WD_INDEX"))
+                ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("NAME"))
 
             Dim oForm2 As New DigitalData.GUIs.Common.frmSQLEditor(LOGCONFIG, DATABASE_ECM) With {
                 .SQLCommand = oSQLCommand,
                 .SQLConnection = oConnection,
-                .PlaceholdersManual = oPlaceholders
+                .PlaceholdersManual = oPlaceholders,
+                .PlaceholdersManualPrefix = "CTRL"
             }
 
             Dim oResult = oForm2.ShowDialog()

Global_Indexer/frmIndex.vb

@@ -571,7 +571,7 @@ Public Class frmIndex
             CURR_WORKFILE_EXTENSION = extension
 
             oRAWZielordner = WINDREAM.GetNormalizedPath(DT.Rows(0).Item("ZIEL_PFAD"), True)
-            oRAWZielordner = Path.Combine(WINDREAM_BASEPATH, oRAWZielordner)
+            oRAWZielordner = WINDREAM_BASEPATH & oRAWZielordner
 
             '####
             ' Regulären Ausdruck zum Auslesen der Indexe definieren
@@ -931,7 +931,10 @@ Public Class frmIndex
             If pIndexAttachment = False Then
                 LOGGER.Debug("Indexing Email File: [{0}]", CURRENT_NEWFILENAME)
 
-                Dim oMsgFilePath As String = Path.Combine(WINDREAM_BASEPATH, CURRENT_NEWFILENAME)
+                ' This cannot use Path.Combine, otherwise the WINDREAM_BASEPATH will be swallowed... lol
+                'Dim oMsgFilePath As String = Path.Combine(WINDREAM_BASEPATH, CURRENT_NEWFILENAME)
+                Dim oMsgFilePath As String = WINDREAM_BASEPATH & CURRENT_NEWFILENAME
+
                 Dim oMail As IMail = EMAIL.Load_Email(oMsgFilePath)
 
                 Dim oMessageId As String = oMail.MessageID
@@ -1387,7 +1390,7 @@ Public Class frmIndex
             End If
 
             Dim oStreamSuccessful = WINDREAM.NewFileStream(CURRENT_WORKFILE, CURRENT_NEWFILENAME, CURR_DOKART_OBJECTTYPE)
-            Dim oTempPath As String = Path.Combine(WINDREAM_BASEPATH, CURRENT_NEWFILENAME)
+            Dim oTempPath As String = WINDREAM_BASEPATH & CURRENT_NEWFILENAME
 
             _Logger.Debug("Checks for file [{0}]", oTempPath)
             _Logger.Debug("File streamed to Windream: {0}", oStreamSuccessful)