diff --git a/Global_Indexer/ClassDatatables.vb b/Global_Indexer/ClassDatatables.vb index 7436e3d..ec84d17 100644 --- a/Global_Indexer/ClassDatatables.vb +++ b/Global_Indexer/ClassDatatables.vb @@ -120,7 +120,7 @@ FROM TBDD_USER_DOKTYPE WHERE DOCTYPE_ID = {ProfileId} ) - AND GUID IN (SELECT USER_ID FROM [dbo].[FNDD_GET_USER_FOR_MODULE] ('GLOBIX', 1)) + AND GUID IN (SELECT USER_ID FROM [dbo].[FNDD_GET_USER_FOR_MODULE] ('fileFLOW', 1)) " Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL) diff --git a/Global_Indexer/ClassIndexFunctions.vb b/Global_Indexer/ClassIndexFunctions.vb index 351ea62..33eb4fe 100644 --- a/Global_Indexer/ClassIndexFunctions.vb +++ b/Global_Indexer/ClassIndexFunctions.vb @@ -68,7 +68,7 @@ Public Class ClassIndexFunctions Else Dim oResult As DialogResult Dim oDate As String = oFileExists.ToString("d") - Dim oBoxTitle = $"GLOBIX - {pModuleTitle}" + Dim oBoxTitle = $"fileFLOW - {pModuleTitle}" Dim oMessage As String If USER_LANGUAGE = "de-DE" Then diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index eb13ded..cb9d1df 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -16,15 +16,15 @@ Public Class ClassInit LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, CompanyName:=My.Application.Info.CompanyName, ProductName:=My.Application.Info.ProductName) - LOGGER = LOGCONFIG.GetLogger("Globix") + LOGGER = LOGCONFIG.GetLogger("fileFLOW") LOGGER.Info("Programmstart: " & Now) LOGGER.Info("Username: {0}", Environment.UserName) End Sub Public Sub InitConfig() Dim oUtils = New ConfigUtils(LOGCONFIG) - oUtils.MigrateUserAppDataConfig(Application.UserAppDataPath, Application.ProductName, "Global Indexer") - oUtils.MigrateCommonAppDataConfig(Application.CommonAppDataPath, Application.ProductName, "Global Indexer") + oUtils.MigrateUserAppDataConfig(Application.UserAppDataPath, Application.ProductName, "fileFLOW") + oUtils.MigrateCommonAppDataConfig(Application.CommonAppDataPath, Application.ProductName, "fileFLOW") CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath) @@ -117,7 +117,7 @@ Public Class ClassInit Public Function Load_BasicConfig() Try 'ClassDatabase.Init() - Dim oSql As String = "SELECT * FROM TBDD_MODULES WHERE NAME = 'Global-Indexer'" + Dim oSql As String = "SELECT * FROM TBDD_MODULES WHERE NAME = 'fileFLOW'" Dim DT As DataTable = DATABASE_ECM.GetDatatable(oSql) If DT.Rows.Count = 1 Then @@ -241,7 +241,7 @@ Public Class ClassInit Try Dim oSql As String - oSql = String.Format($"SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{Environment.UserName}','GLOBIX',{1})") + oSql = String.Format($"SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{Environment.UserName}','fileFLOW',{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") @@ -294,18 +294,18 @@ Public Class ClassInit End If USER_LANGUAGE = oRow.Item("USER_LANGUAGE") - oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')" + oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'fileFLOW'" DATABASE_ECM.ExecuteNonQuery(oSql) - oSql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE, CLIENT_ID) VALUES (" & USER_ID & ",'Global-Indexer', 1)" + oSql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE, CLIENT_ID) VALUES (" & USER_ID & ",'fileFLOW', 1)" DATABASE_ECM.ExecuteNonQuery(oSql) - oSql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE Upper(MODULE) = UPPER('Global-Indexer')" + oSql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE MODULE = 'fileFLOW'" If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für fileFLOW!") If USER_IS_ADMIN = False Then 'Anmeldung wieder herausnehmen - oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Global-Indexer'" + oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'fileFLOW'" DATABASE_ECM.ExecuteNonQuery(oSql) LOGGER.Info(" - Wieder abgemeldet") START_INCOMPLETE = True diff --git a/Global_Indexer/DD_Icons_ICO_GLOBIX_1.ico b/Global_Indexer/DD_Icons_ICO_GLOBIX_1.ico deleted file mode 100644 index 64d5152..0000000 Binary files a/Global_Indexer/DD_Icons_ICO_GLOBIX_1.ico and /dev/null differ diff --git a/Global_Indexer/DD_Icons_ICO_GLOBIX_128.ico b/Global_Indexer/DD_Icons_ICO_GLOBIX_128.ico deleted file mode 100644 index 84cf533..0000000 Binary files a/Global_Indexer/DD_Icons_ICO_GLOBIX_128.ico and /dev/null differ diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index 9e06837..6609e61 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -789,14 +789,9 @@ - - - PreserveNewest + + Always - - PreserveNewest - - PreserveNewest diff --git a/Global_Indexer/ModuleRuntime.vb b/Global_Indexer/ModuleRuntime.vb index 5e2613b..13702c7 100644 --- a/Global_Indexer/ModuleRuntime.vb +++ b/Global_Indexer/ModuleRuntime.vb @@ -29,5 +29,4 @@ Module ModuleRuntime Public Property DATABASE_ECM As MSSQLServer Public Property DATABASE_IDB As MSSQLServer - Public Property DebugDisplay As Boolean = False End Module diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 42ba56f..ba77458 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/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index 7c88993..3f5f8ce 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -15855,8 +15855,8 @@ Namespace MyDatasetTableAdapters ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (SELECT T.DOKART_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " FROM TBDD_DOKUMENTART_MODULE AS T INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " TBDD_MODULES AS T1 ON T.MODULE_ID = "& _ - "T1.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE (T1.NAME = 'Global-Indexer'"& _ - ")))"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY SEQUENCE, BEZEICHNUNG" + "T1.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE (T1.NAME = 'fileFLOW')))"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"O"& _ + "RDER BY SEQUENCE, BEZEICHNUNG" Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text End Sub diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index d5db766..511482c 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -236,7 +236,7 @@ WHERE (GUID IN (SELECT T.DOKART_ID FROM TBDD_DOKUMENTART_MODULE AS T INNER JOIN TBDD_MODULES AS T1 ON T.MODULE_ID = T1.GUID - WHERE (T1.NAME = 'Global-Indexer'))) + WHERE (T1.NAME = 'fileFLOW'))) ORDER BY SEQUENCE, BEZEICHNUNG diff --git a/Global_Indexer/file.ico b/Global_Indexer/file.ico deleted file mode 100644 index 7296965..0000000 Binary files a/Global_Indexer/file.ico and /dev/null differ diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index e250b62..3899218 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -132,7 +132,7 @@ 189, -255 - 23, 15 + 22, 15 0 @@ -319,7 +319,7 @@ 170 - 1070, 247 + 1070, 249 88 @@ -382,7 +382,7 @@ 1 - 1070, 564 + 1070, 566 88 @@ -1073,13 +1073,13 @@ Grundeinstellungen - 1310, 151 + 1310, 147 - 0, 775 + 0, 773 - 1310, 21 + 1310, 23 RibbonStatusBar1 @@ -1220,7 +1220,7 @@ 150 - 1070, 278 + 1070, 280 1 @@ -1286,7 +1286,7 @@ 1 - 1070, 564 + 1070, 566 0 @@ -1307,7 +1307,7 @@ Fill - 0, 151 + 0, 147 127, 17 @@ -1361,7 +1361,7 @@ 277 - 224, 594 + 224, 596 93 @@ -1577,7 +1577,7 @@ 5 - Tahoma, 8.25pt, style=Bold + Tahoma, 8.25pt 10, 6 @@ -1652,13 +1652,13 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt 155, 86 - 66, 15 + 62, 15 87 @@ -1682,16 +1682,16 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl - 155, 39 + 155, 37 - 82, 15 + 78, 15 87 @@ -1715,7 +1715,7 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl @@ -1724,13 +1724,13 @@ 7, 37 - 41, 15 + 21, 15 87 - GUID: + ID: Label7 @@ -1748,7 +1748,7 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl @@ -1757,7 +1757,7 @@ 7, 128 - 55, 15 + 53, 15 87 @@ -1781,7 +1781,7 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl @@ -1790,7 +1790,7 @@ 7, 170 - 86, 15 + 82, 15 87 @@ -1913,16 +1913,16 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl - 448, 34 + 448, 37 - 64, 15 + 60, 15 87 @@ -1946,16 +1946,16 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl - 70, 38 + 70, 37 - 78, 15 + 73, 15 87 @@ -2033,7 +2033,7 @@ 73, 56 - 3900, 24 + 75, 24 91 @@ -2078,13 +2078,13 @@ True - Tahoma, 8.25pt, style=Bold + Segoe UI, 9pt - 598, 39 + 598, 37 - 241, 13 + 222, 15 96 @@ -2135,7 +2135,7 @@ True - Segoe UI, 9pt, style=Bold + Segoe UI, 9pt NoControl @@ -2144,7 +2144,7 @@ 7, 212 - 119, 15 + 114, 15 87 @@ -2306,7 +2306,7 @@ Bottom - 0, 514 + 0, 275 True @@ -3279,7 +3279,7 @@ der Datei 150, 0 - 3821, 33 + 922, 274 96 @@ -3303,7 +3303,7 @@ der Datei 0, 0 - 150, 33 + 150, 274 95 @@ -3338,7 +3338,7 @@ der Datei - 3971, 33 + 1072, 274 manuelle Indexe @@ -3356,7 +3356,7 @@ der Datei 0 - 3973, 61 + 1074, 302 86 @@ -3374,7 +3374,7 @@ der Datei 0, 0 - 150, 278 + 150, 274 97 @@ -4271,7 +4271,7 @@ der Datei - 1070, 278 + 1070, 274 Nachbearbeitungsfunktionen manueller Index @@ -4431,7 +4431,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0, 0 - 100, 278 + 100, 274 90 @@ -5181,7 +5181,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1070, 278 + 1070, 274 automatische/feste Indexe @@ -5618,7 +5618,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1070, 278 + 1070, 274 Dynamischer Ordnerpfad @@ -6073,7 +6073,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1070, 278 + 1070, 274 Automatische Profilauswahl @@ -6505,7 +6505,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - 1072, 592 + 1072, 594 Profil-Verwaltung @@ -6523,7 +6523,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0 - 1074, 624 + 1074, 626 1 @@ -6562,7 +6562,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1070, 564 + 1070, 566 Gruppen-Zuordnung @@ -6580,7 +6580,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 1 - 1072, 592 + 1072, 594 89 @@ -6610,7 +6610,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1070, 564 + 1070, 566 Benutzer-Zuordnung @@ -6662,7 +6662,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - 1072, 592 + 1072, 594 Profil-Zuordnung @@ -6707,7 +6707,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 1 - 1310, 624 + 1310, 626 4 diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 95043d4..ee9815a 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -212,9 +212,9 @@ Public Class frmAdministration Dim oNewID As Integer oNewID = DATABASE_ECM.GetScalarValue("SELECT MAX(GUID) FROM TBDD_DOKUMENTART") If IsNumeric(oNewID) Then - Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX', {oNewID}" + Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'fileFLOW', {oNewID}" If DATABASE_ECM.ExecuteNonQuery(osql) = False Then - MsgBox("Fehler beim zuweisen des neuen Profils zum Modul Global-Indexer!", MsgBoxStyle.Critical, Text) + MsgBox("Fehler beim zuweisen des neuen Profils zum Modul fileFLOW/GI!", MsgBoxStyle.Critical, Text) End If End If End If @@ -299,9 +299,9 @@ Public Class frmAdministration End Sub Private Sub btnadd_Click(sender As Object, e As EventArgs) - Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX',{DOKART_GUIDTextBox.Text}" + Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'fileFLOW',{DOKART_GUIDTextBox.Text}" DATABASE_ECM.ExecuteNonQuery(osql) - LoadGlobix_Doctypes() + LoadfileFLOW_Doctypes() End Sub Private Sub OBJEKTTYPComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles OBJEKTTYPComboBox.SelectedIndexChanged @@ -789,7 +789,7 @@ Public Class frmAdministration Load_PostProcessing(Me.DOKART_GUIDTextBox.Text) End Sub - Sub LoadGlobix_Doctypes() + Sub LoadfileFLOW_Doctypes() Dim oFocusedRow = GridViewProfile.FocusedRowHandle Load_Dokart() GridViewProfile.FocusedRowHandle = oFocusedRow @@ -1021,8 +1021,8 @@ Public Class frmAdministration If result = MsgBoxResult.Yes Then Try - Dim oGlobixId = DATABASE_ECM.GetScalarValue("SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'GLOBIX'") - Dim copy = "exec PRDD_COPY_DOKPROFILE " & DOKART_GUIDTextBox.Text & ", " & oGlobixId + Dim oFF_ID = DATABASE_ECM.GetScalarValue("SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'fileFLOW'") + Dim copy = "exec PRDD_COPY_DOKPROFILE " & DOKART_GUIDTextBox.Text & ", " & oFF_ID If DATABASE_ECM.ExecuteNonQuery(copy) Then If USER_LANGUAGE = "de-DE" Then @@ -1040,7 +1040,7 @@ Public Class frmAdministration End Sub Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick - LoadGlobix_Doctypes() + LoadfileFLOW_Doctypes() End Sub Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem5.ItemClick @@ -1471,4 +1471,6 @@ Public Class frmAdministration chkPreventMultipleValues.Enabled = False End If End Function + + End Class diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 6a24057..f84fff4 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -47,7 +47,7 @@ Public Class frmStart Cursor = Cursors.WaitCursor Try IndexForm = New frmIndex() - FileDrop = New FileDrop(LOGCONFIG, "GLOBIX") + FileDrop = New FileDrop(LOGCONFIG, "fileFLOW") 'Lizenz abgellaufen, überprüfen ob User Admin ist If LICENSE_COUNT < USERCOUNT_LOGGED_IN Then @@ -131,7 +131,7 @@ Public Class frmStart Private Sub frmStart_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Try If START_INCOMPLETE = False Then - Dim Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')" + Dim Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'fileFLOW'" DATABASE_ECM.ExecuteNonQuery(Sql) End If ClassWindowLocation.SaveFormLocationSize(Me) @@ -513,11 +513,11 @@ Public Class frmStart If DTACTUAL_FILES.Rows.Count > 0 Then ABORT_INDEXING = False Me.TimerFolderWatch.Stop() - If LOGCONFIG.Debug And DebugDisplay = False Then + If LOGCONFIG.Debug Then Clipboard.Clear() Clipboard.SetText(oSql, TextDataFormat.Text) - DebugDisplay = True - MsgBox("DEBUG - Check TBGI_FILES_USER if necessary. Command copied to Clipboard") + + 'MsgBox("DEBUG - Check TBGI_FILES_USER if necessary. Command copied to Clipboard") End If For Each oRow As DataRow In DTACTUAL_FILES.Rows diff --git a/SetupVS19/Config.wxi b/SetupVS19/Config.wxi index c2a4737..1201d9d 100644 --- a/SetupVS19/Config.wxi +++ b/SetupVS19/Config.wxi @@ -1,7 +1,7 @@ - + diff --git a/SetupVS19/Product.wxs b/SetupVS19/Product.wxs index 3521c17..4f8b191 100644 --- a/SetupVS19/Product.wxs +++ b/SetupVS19/Product.wxs @@ -103,8 +103,7 @@ - - + diff --git a/SetupVS19/SetupVS19.wixproj b/SetupVS19/SetupVS19.wixproj index 99a57ac..73417c0 100644 --- a/SetupVS19/SetupVS19.wixproj +++ b/SetupVS19/SetupVS19.wixproj @@ -44,7 +44,7 @@ - +