diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index d1abeae..befac2c 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -124,6 +124,13 @@ Public Class ClassInit GI_withWindream = DT.Rows(0).Item("BIT1") 'vWLaufwerk = DT.Rows(0).Item("STRING1") End If + oSql = "SELECT * FROM TBDD_CATALOG" + DT = DATABASE_ECM.GetDatatable(oSql) + For Each oROW As DataRow In DT.Rows + If oROW.Item("CAT_TITLE") = "WM_DB_SERVER" Then + WM_DB_SERVER = oROW.Item("CAT_STRING") + End If + Next oSql = "SELECT * FROM TBDD_BASECONFIG" DT = DATABASE_ECM.GetDatatable(oSql) If DT.Rows.Count = 1 Then diff --git a/Global_Indexer/ClassPatterns.vb b/Global_Indexer/ClassPatterns.vb index d22e9d6..75e343b 100644 --- a/Global_Indexer/ClassPatterns.vb +++ b/Global_Indexer/ClassPatterns.vb @@ -39,6 +39,8 @@ Public Class ClassPatterns Public Const INT_VALUE_MACHINE = "MACHINE" Public Const INT_VALUE_DOMAIN = "DOMAIN" Public Const INT_VALUE_DATE = "DATE" + Public Const INT_VALUE_WMDocID = "WMDocID" + Public Const INT_VALUE_IDBID = "IDBObjID" Public Const MAX_TRY_COUNT = 20 @@ -74,29 +76,35 @@ Public Class ClassPatterns Public Shared Function ReplaceInternalValues(input As String) As String Try - Dim result = input + Dim oResult = input ' Replace Username(s) - While ContainsPatternAndValue(result, PATTERN_INT, INT_VALUE_USERNAME) - result = ReplacePattern(result, PATTERN_INT, Environment.UserName) + While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_USERNAME) + oResult = ReplacePattern(oResult, PATTERN_INT, Environment.UserName) End While ' Replace Machinename(s) - While ContainsPatternAndValue(result, PATTERN_INT, INT_VALUE_MACHINE) - result = ReplacePattern(result, PATTERN_INT, Environment.MachineName) + While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_MACHINE) + oResult = ReplacePattern(oResult, PATTERN_INT, Environment.MachineName) End While ' Replace Domainname(s) - While ContainsPatternAndValue(result, PATTERN_INT, INT_VALUE_DOMAIN) - result = ReplacePattern(result, PATTERN_INT, Environment.UserDomainName) + While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_DOMAIN) + oResult = ReplacePattern(oResult, PATTERN_INT, Environment.UserDomainName) End While ' Replace CurrentDate(s) - While ContainsPatternAndValue(result, PATTERN_INT, INT_VALUE_DATE) - result = ReplacePattern(result, PATTERN_INT, Now.ToShortDateString) + While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_DATE) + oResult = ReplacePattern(oResult, PATTERN_INT, Now.ToShortDateString) + End While + While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_WMDocID) + oResult = ReplacePattern(oResult, PATTERN_INT, CURRENT_DOC_ID) + End While + While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_IDBID) + oResult = ReplacePattern(oResult, PATTERN_INT, CURRENT_DOC_ID) End While LOGGER.Debug("sql after ReplaceInternalValues: " & input) - Return result + Return oResult Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Error in ReplaceInternalValues:" & ex.Message) diff --git a/Global_Indexer/GdPicture.NET.14.Imaging.ML.64.dll b/Global_Indexer/GdPicture.NET.14.Imaging.ML.64.dll new file mode 100644 index 0000000..2ad8950 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.Imaging.ML.64.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.Imaging.ML.dll b/Global_Indexer/GdPicture.NET.14.Imaging.ML.dll new file mode 100644 index 0000000..387246a Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.Imaging.ML.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll b/Global_Indexer/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll new file mode 100644 index 0000000..b9ba4a3 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.Imaging.Rendering.Skia.dll b/Global_Indexer/GdPicture.NET.14.Imaging.Rendering.Skia.dll new file mode 100644 index 0000000..8f60b41 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.Imaging.Rendering.Skia.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.barcode.1d.reader.64.dll b/Global_Indexer/GdPicture.NET.14.barcode.1d.reader.64.dll new file mode 100644 index 0000000..a96a316 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.barcode.1d.reader.64.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.barcode.1d.reader.dll b/Global_Indexer/GdPicture.NET.14.barcode.1d.reader.dll new file mode 100644 index 0000000..6d24c8b Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.barcode.1d.reader.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.barcode.2d.reader.64.dll b/Global_Indexer/GdPicture.NET.14.barcode.2d.reader.64.dll new file mode 100644 index 0000000..2287de5 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.barcode.2d.reader.64.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.barcode.2d.reader.dll b/Global_Indexer/GdPicture.NET.14.barcode.2d.reader.dll new file mode 100644 index 0000000..4984254 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.barcode.2d.reader.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.filters.64.dll b/Global_Indexer/GdPicture.NET.14.filters.64.dll new file mode 100644 index 0000000..0f3e367 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.filters.64.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.filters.dll b/Global_Indexer/GdPicture.NET.14.filters.dll new file mode 100644 index 0000000..938c3f3 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.filters.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.image.gdimgplug.64.dll b/Global_Indexer/GdPicture.NET.14.image.gdimgplug.64.dll new file mode 100644 index 0000000..80b0cf9 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.image.gdimgplug.64.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.image.gdimgplug.dll b/Global_Indexer/GdPicture.NET.14.image.gdimgplug.dll new file mode 100644 index 0000000..88eeff8 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.image.gdimgplug.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.machine.vision.64.dll b/Global_Indexer/GdPicture.NET.14.machine.vision.64.dll new file mode 100644 index 0000000..af684ac Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.machine.vision.64.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.machine.vision.dll b/Global_Indexer/GdPicture.NET.14.machine.vision.dll new file mode 100644 index 0000000..da04adb Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.machine.vision.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.twain.client.64.dll b/Global_Indexer/GdPicture.NET.14.twain.client.64.dll new file mode 100644 index 0000000..045fdd3 Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.twain.client.64.dll differ diff --git a/Global_Indexer/GdPicture.NET.14.twain.client.dll b/Global_Indexer/GdPicture.NET.14.twain.client.dll new file mode 100644 index 0000000..51d630b Binary files /dev/null and b/Global_Indexer/GdPicture.NET.14.twain.client.dll differ diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index a3ea845..476cfd2 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -162,26 +162,23 @@ False - - False - ..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + ..\packages\DigitalData.Controls.DocumentViewer.1.9.8\lib\net462\DigitalData.Controls.DocumentViewer.dll ..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll - - ..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll + + ..\packages\DigitalData.GUIs.Common.2.6.2\lib\net462\DigitalData.GUIs.Common.dll ..\..\..\2_DLL Projekte\DDMonorepo\GUIs.GlobalIndexer\bin\Debug\DigitalData.GUIs.GlobalIndexer.dll - - False - ..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + + ..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll - False - ..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll ..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll @@ -196,16 +193,14 @@ ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll - - False - ..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + + ..\packages\DigitalData.Modules.Messaging.1.9.8\lib\net462\DigitalData.Modules.Messaging.dll - - ..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + + ..\packages\DigitalData.Modules.Patterns.1.3.1\lib\net462\DigitalData.Modules.Patterns.dll - - False - ..\..\..\2_DLL Projekte\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll + + ..\packages\DigitalData.Modules.Windows.1.5.1\lib\net462\DigitalData.Modules.Windows.dll ..\packages\DigitalData.Modules.Windream.1.9.5.2\lib\net462\DigitalData.Modules.Windream.dll @@ -315,6 +310,12 @@ ..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll + + ..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll + + + ..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -340,6 +341,9 @@ ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll + + ..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll @@ -364,6 +368,7 @@ ..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll + ..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll @@ -959,10 +964,27 @@ Always + + + + + + + + + + + + + + + + PreserveNewest + diff --git a/Global_Indexer/ModuleCURRENT.vb b/Global_Indexer/ModuleCURRENT.vb index 62df7ad..2fe40e3 100644 --- a/Global_Indexer/ModuleCURRENT.vb +++ b/Global_Indexer/ModuleCURRENT.vb @@ -82,6 +82,7 @@ Module ModuleCURRENT Public Property CURRENT_DROPTYPE Public Property VIEWER_LICENSE As String = "" + Public CURRENT_DOC_ID As Integer End Module diff --git a/Global_Indexer/ModuleRuntime.vb b/Global_Indexer/ModuleRuntime.vb index 13702c7..229eaec 100644 --- a/Global_Indexer/ModuleRuntime.vb +++ b/Global_Indexer/ModuleRuntime.vb @@ -12,6 +12,7 @@ Module ModuleRuntime Public LogErrorsOnly As Boolean = True Public GI_withWindream As Boolean = False Public WMDrive As String = "W" + Public WM_DB_SERVER As String = "" 'Public myPreviewActive As Boolean = True Public Property FW_started As Boolean = False Public IDB_ACTIVE As Boolean = False @@ -25,6 +26,8 @@ Module ModuleRuntime Public IDB_DOC_ID As Int64 Public IDB_LOG_INDEX As String + + Public Property WINDREAM As Windream Public Property DATABASE_ECM As MSSQLServer diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 53c3fea..a885b17 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/README.txt b/Global_Indexer/README.txt new file mode 100644 index 0000000..58cbced --- /dev/null +++ b/Global_Indexer/README.txt @@ -0,0 +1,5 @@ +BASE MODULE +=========== + +This module is intended for often used constants and datastructures. +Therefor it is important that this module does not have any dependencies on other modules!! \ No newline at end of file diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index ee9815a..cba6afa 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -534,7 +534,8 @@ Public Class frmAdministration .SQLCommand = oSQLCommand, .SQLConnection = oConnection, .PlaceholdersManual = oPlaceholders, - .PlaceholdersManualPrefix = "CTRL" + .PlaceholdersManualPrefix = "CTRL", + .PlaceholdersWindream = SourceAttributes } Dim oResult = oForm2.ShowDialog() diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 79aa064..5136161 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -2519,6 +2519,7 @@ Public Class frmIndex Private Function Move_File2_Target() Dim oError As Boolean Try + CURRENT_DOC_ID = 0 Dim oSQL As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID Dim oFolderForIndex = DATABASE_ECM.GetScalarValue(oSQL) If Not IsDBNull(oFolderForIndex) Then @@ -2539,8 +2540,18 @@ Public Class frmIndex oExportSuccessful = SINGLEFILE_2_WINDREAM(CURR_DOKART_OBJECTTYPE) End If If oExportSuccessful = True Then - 'Kein Fehler in Export2windream - oError = False + Dim ofilename = Path.GetFileName(CURRENT_NEWFILENAME) + Dim odwDocID As Int64 + If WM_DB_SERVER <> "" Then + oSQL = $"select max(dwdocid) from {WM_DB_SERVER}.dbo.BaseAttributes where szLongName = '{ofilename}'" + Dim oDocID = DATABASE_ECM.GetScalarValue(oSQL) + If Not IsNothing(oDocID) Then + CURRENT_DOC_ID = oDocID + End If + End If + + 'Kein Fehler in Export2windream + oError = False If Write_Indizes() = True Then 'Kein Fehler in Setzen der windream-Indizes Dim Insert_String As String diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index 6b4e3e1..52818c5 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -236,48 +236,6 @@ 625, 56 - - FolderWatch aktiv - - - Konfiguration - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAEFwcGx5O09LO0NoZWNrO0JhcnM7 - UmliYm9uO2RjyGgAAADESURBVDhPpZPRDYQgEEQtxUL4tiwT/88qLMZ2TK4Abt9GzMCtmMt9vAjLzAQW - HFJKLZOxGrtxnDCmxlql18lovIy3kW9gDQ3aKoDCZkSmCLQeUgJIjYQ98HgA5+ptW1lkjGcigOao6I4l - 54xeaysFOqzFCDcHATsFrkmLuk2fi3lu1o6vgFNYQnpm8IDqCGJ4MoMfoW3iXIwPZvAmRtfoIXybunJd - I0QPqWeG6yHBaPz1lEsIqb1XyRoaN4MGFH74ndPwASbJh+jVDWBmAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAEFwcGx5O09LO0NoZWNrO0JhcnM7 - UmliYm9uO2RjyGgAAAGcSURBVFhHxZcxcsIwEEU5AVWO4z4dZ8gBcgZm6LhNWsrcIh0dV6B19nm0Hln5 - sleG4OINRvq7+7FXktn1fb8pcvCVjBdd1y2xNw7G2bgYV+Oe4Jox5tCgVTlGWgy8GZ/Gt9EHQUsMsSpn - 2MC78WWoIhGIJcef3BEDH8aPoRK3QA5yTfIvGSDgZqiEayDXxMScAW7ZM355CTnHx1EzQNM88syXIPfQ - mDUDdK4KXMNJjAE1pAHWbstSm+OUcqo5auyVATYQFdDKUDzlVPNwcE1ugF1MiVsYi6ecSgNn1+RitlIl - jjIpnnIqHVxck4vZz5UYag3lqOLHQpNzdV0ewKGixDY9zNdMtBaHu2vzoFkDSVOaWFMcpIHqI3BN0rmJ - tcVBPoJqE7om0z5SHGQTzi3Do+sUzBf6JeQyXNqIpAnGC10EuRFFtuKJCb4X8xGqWzFEDqPBBJ/FeJTq - YQTR43ht8cXjGDZ9IXE2fSVzCHjGnSDHpDhEDAC37JFXNGLH254TNQA0DZ3b8raElpih4RQtBpz//Wu2 - FXLwdfS7XxGwk2isBZLIAAAAAElFTkSuQmCC - - - - Administration - - - User Basis Einstellungen - - - Historie - Bereits indexierte Dateien - - - Info - Statusleiste @@ -814,4 +772,46 @@ auszuwählen DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Konfiguration + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAEFwcGx5O09LO0NoZWNrO0JhcnM7 + UmliYm9uO2RjyGgAAADESURBVDhPpZPRDYQgEEQtxUL4tiwT/88qLMZ2TK4Abt9GzMCtmMt9vAjLzAQW + HFJKLZOxGrtxnDCmxlql18lovIy3kW9gDQ3aKoDCZkSmCLQeUgJIjYQ98HgA5+ptW1lkjGcigOao6I4l + 54xeaysFOqzFCDcHATsFrkmLuk2fi3lu1o6vgFNYQnpm8IDqCGJ4MoMfoW3iXIwPZvAmRtfoIXybunJd + I0QPqWeG6yHBaPz1lEsIqb1XyRoaN4MGFH74ndPwASbJh+jVDWBmAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAEFwcGx5O09LO0NoZWNrO0JhcnM7 + UmliYm9uO2RjyGgAAAGcSURBVFhHxZcxcsIwEEU5AVWO4z4dZ8gBcgZm6LhNWsrcIh0dV6B19nm0Hln5 + sleG4OINRvq7+7FXktn1fb8pcvCVjBdd1y2xNw7G2bgYV+Oe4Jox5tCgVTlGWgy8GZ/Gt9EHQUsMsSpn + 2MC78WWoIhGIJcef3BEDH8aPoRK3QA5yTfIvGSDgZqiEayDXxMScAW7ZM355CTnHx1EzQNM88syXIPfQ + mDUDdK4KXMNJjAE1pAHWbstSm+OUcqo5auyVATYQFdDKUDzlVPNwcE1ugF1MiVsYi6ecSgNn1+RitlIl + jjIpnnIqHVxck4vZz5UYag3lqOLHQpNzdV0ewKGixDY9zNdMtBaHu2vzoFkDSVOaWFMcpIHqI3BN0rmJ + tcVBPoJqE7om0z5SHGQTzi3Do+sUzBf6JeQyXNqIpAnGC10EuRFFtuKJCb4X8xGqWzFEDqPBBJ/FeJTq + YQTR43ht8cXjGDZ9IXE2fSVzCHjGnSDHpDhEDAC37JFXNGLH254TNQA0DZ3b8raElpih4RQtBpz//Wu2 + FXLwdfS7XxGwk2isBZLIAAAAAElFTkSuQmCC + + + + Administration + + + User Basis Einstellungen + + + Historie - Bereits indexierte Dateien + + + Info + + + FolderWatch aktiv + \ No newline at end of file diff --git a/Global_Indexer/packages.config b/Global_Indexer/packages.config index b7892fe..c2d4ed2 100644 --- a/Global_Indexer/packages.config +++ b/Global_Indexer/packages.config @@ -1,9 +1,16 @@  + + + + + + + @@ -16,6 +23,8 @@ + + @@ -24,6 +33,7 @@ + diff --git a/SetupVS19/Product.wxs b/SetupVS19/Product.wxs index feb37f9..40fb5cc 100644 --- a/SetupVS19/Product.wxs +++ b/SetupVS19/Product.wxs @@ -130,8 +130,19 @@ - - + + + + + + + + + + + + +