Compare commits

9 Commits

Author SHA1 Message Date
Jonathan Jenne
62e4bb84c3 Fix debug flag for logger 2023-03-28 14:47:21 +02:00
Jonathan Jenne
e1692f68de Version 2.6.5.1 2023-03-28 13:59:21 +02:00
Jonathan Jenne
2fefe100ee merge 2023-03-28 13:57:54 +02:00
8097017f9f MS merge DEsign 2023-03-28 13:56:07 +02:00
Jonathan Jenne
890cd6a45e Version 2.6.3.3 2023-03-28 13:47:48 +02:00
Jonathan Jenne
8edac6bb6a Version 2.6.3.1 2023-03-13 15:43:41 +01:00
Jonathan Jenne
8ac13823ca Fix placeholder configuration for dynamic sqls 2023-03-13 15:43:31 +01:00
Jonathan Jenne
1906bac96d Merge branch 'master' of http://dd-vmp07-com04:3000/SchreiberM/GlobalIndexer 2023-03-13 14:12:24 +01:00
Jonathan Jenne
e66d404158 ignore .vs folder 2023-02-20 09:32:32 +01:00
18 changed files with 8 additions and 17 deletions

4
.gitignore vendored
View File

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

View File

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

View File

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

Binary file not shown.

View File

@@ -24,7 +24,7 @@ Public Class ClassInit
Public Sub InitConfig() Public Sub InitConfig()
CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath) 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) LOGGER.Info("Debug log set to: [{0}]", LOGCONFIG.Debug)
MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString) MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString)

View File

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

View File

@@ -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 oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocTypeGuid} AND ACTIVE = 1")
Dim oPlaceholders = oDatatable.AsEnumerable(). 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 { Dim oForm2 As New DigitalData.GUIs.Common.frmSQLEditor(LOGCONFIG, DATABASE_ECM) With {
.SQLCommand = oSQLCommand, .SQLCommand = oSQLCommand,
.SQLConnection = oConnection, .SQLConnection = oConnection,
.PlaceholdersManual = oPlaceholders .PlaceholdersManual = oPlaceholders,
.PlaceholdersManualPrefix = "CTRL"
} }
Dim oResult = oForm2.ShowDialog() Dim oResult = oForm2.ShowDialog()