AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS Änderungen dokumnetart Konfiguration

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber
2019-01-11 15:29:01 +01:00
parent a56087cab3
commit f5eae6a1d8
7 changed files with 76 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
app/DD-Record-Organizer/ClassImport_Windream.vb
View File

@@ -113,39 +113,40 @@ Public Class ClassImport_Windream
VERSION_DELIMITER = DT1.Rows(0).Item("VERSION_DELIMITER") VERSION_DELIMITER = DT1.Rows(0).Item("VERSION_DELIMITER")
Dim err As Boolean = False Dim err As Boolean = False
Dim Zielordner As String Dim oWMTARGET_FOLDER As String
Dim extension As String = Path.GetExtension(CURRENT_FILENAME) Dim oExtension As String = Path.GetExtension(CURRENT_FILENAME)
Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & DocTypeID, True) Dim oDT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & DocTypeID, True)
'sql_history_INSERT_INTO = "INSERT INTO TBGI_HISTORY (FILENAME_ORIGINAL,FILENAME_NEW" 'sql_history_INSERT_INTO = "INSERT INTO TBGI_HISTORY (FILENAME_ORIGINAL,FILENAME_NEW"
'sql_history_Index_Values = "" 'sql_history_Index_Values = ""
Dim AnzahlIndexe As Integer = 1 Dim AnzahlIndexe As Integer = 1
_WDOBJECTTYPE = DT.Rows(0).Item("OBJEKTTYP") _WDOBJECTTYPE = oDT.Rows(0).Item("OBJEKTTYP")
' Den Zielordner erstellen ' Den Zielordner erstellen
Zielordner = DT.Rows(0).Item("ZIEL_PFAD") oWMTARGET_FOLDER = oDT.Rows(0).Item("ZIEL_PFAD")
sql = $"SELECT * FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = {CURRENT_FORMVIEW_ID} AND DOCTYPE_ID = {DocTypeID}" sql = $"SELECT * FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = {CURRENT_FORMVIEW_ID} AND DOCTYPE_ID = {DocTypeID}"
Dim oDTFW_DOCTYPES As DataTable = ClassDatabase.Return_Datatable(sql) Dim oDTFW_DOCTYPES As DataTable = ClassDatabase.Return_Datatable(sql)
Dim DYNAMIC_FOLDER = oDTFW_DOCTYPES.Rows(0).Item("DYNAMIC_FOLDER") Dim oDYNAMIC_FOLDER = oDTFW_DOCTYPES.Rows(0).Item("DYNAMIC_FOLDER")
Dim oNAME_CONVENTION = oDTFW_DOCTYPES.Rows(0).Item("NAME_CONVENTION")
Dim oROOTWM_FOLDER Dim oROOTWM_FOLDER
Try Try
oROOTWM_FOLDER = oDTFW_DOCTYPES.Rows(0).Item("DYNAMIC_FOLDER") oROOTWM_FOLDER = oDTFW_DOCTYPES.Rows(0).Item("ROOT_FOLDER")
Catch ex As Exception Catch ex As Exception
oROOTWM_FOLDER = "" oROOTWM_FOLDER = ""
End Try End Try
If oROOTWM_FOLDER <> String.Empty Then If oROOTWM_FOLDER <> String.Empty Then
If LogErrorsOnly = False Then ClassLogger.Add($">> oROOTWM_FOLDER '{oROOTWM_FOLDER}' will be used", False) If LogErrorsOnly = False Then ClassLogger.Add($">> oROOTWM_FOLDER '{oROOTWM_FOLDER}' will be used", False)
Zielordner = oROOTWM_FOLDER oWMTARGET_FOLDER = oROOTWM_FOLDER
End If End If
'ClassDatabase.Execute_Scalar(sql) 'ClassDatabase.Execute_Scalar(sql)
If Not IsDBNull(DYNAMIC_FOLDER) Then If Not IsDBNull(oDYNAMIC_FOLDER) Then
If DYNAMIC_FOLDER <> String.Empty Then If oDYNAMIC_FOLDER <> String.Empty Then
If CREATE_FOLDER_INDEX(DYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then
If CURRENT_VARIABLE_FOLDER_OVERRIDE = True Then If CURRENT_VARIABLE_FOLDER_OVERRIDE = True Then
Zielordner = CURRENT_VARIABLE_FOLDER oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER
Else Else
Zielordner = Zielordner & "\" & CURRENT_VARIABLE_FOLDER oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER
End If End If
Else Else
@@ -157,20 +158,20 @@ Public Class ClassImport_Windream
'Unterordner ja oder nein 'Unterordner ja oder nein
If CURRENT_CHECK_SUBFOLDER = True And CURRENT_SUBFOLDER <> "" Then If CURRENT_CHECK_SUBFOLDER = True And CURRENT_SUBFOLDER <> "" Then
Zielordner = Zielordner & "\" & CURRENT_SUBFOLDER oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_SUBFOLDER
End If End If
Zielordner = Zielordner.Replace("\\", "\") oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("\\", "\")
If Zielordner.Contains("/") Then If oWMTARGET_FOLDER.Contains("/") Then
ClassLogger.Add(String.Format(">> Targetpath contains /-sign. / will be replaced with _")) ClassLogger.Add(String.Format(">> Targetpath contains /-sign. / will be replaced with _"))
Zielordner = Zielordner.Replace("/", "_") oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("/", "_")
End If End If
Try Try
Select Case clsWD_GET.WD_PATH_EXISTS(Zielordner.Substring(2)) Select Case clsWD_GET.WD_PATH_EXISTS(oWMTARGET_FOLDER.Substring(2))
Case False Case False
ClassLogger.Add(String.Format(">> Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", Zielordner.Substring(2)), False) ClassLogger.Add(String.Format(">> Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2)), False)
Dim split() As String = Zielordner.Split("\") Dim split() As String = oWMTARGET_FOLDER.Split("\")
Dim Path_Combined As String = "" Dim Path_Combined As String = ""
For Each s As String In split For Each s As String In split
Path_Combined &= s & "\" Path_Combined &= s & "\"
@@ -193,7 +194,7 @@ Public Class ClassImport_Windream
End Select End Select
Catch ex As Exception Catch ex As Exception
If Not ex.Message.Contains("Filename exists!") Then If Not ex.Message.Contains("Filename exists!") Then
ClassLogger.Add(String.Format(">> Could not create folder-part: {0} - Complete path is: ({1})", temppath, Zielordner.Substring(2))) ClassLogger.Add(String.Format(">> Could not create folder-part: {0} - Complete path is: ({1})", temppath, oWMTARGET_FOLDER.Substring(2)))
ClassLogger.Add(String.Format(">> ErrorMessage: {0}: ", ex.Message)) ClassLogger.Add(String.Format(">> ErrorMessage: {0}: ", ex.Message))
Return False Return False
End If End If
@@ -206,7 +207,7 @@ Public Class ClassImport_Windream
End Select End Select
Catch ex As Exception Catch ex As Exception
If Not ex.Message.Contains("Filename exists!") Then If Not ex.Message.Contains("Filename exists!") Then
ClassLogger.Add(String.Format(">> Could not create folder ({0}): " & ex.Message, Zielordner.Substring(2)), False) ClassLogger.Add(String.Format(">> Could not create folder ({0}): " & ex.Message, oWMTARGET_FOLDER.Substring(2)), False)
Return False Return False
End If End If
End Try End Try
@@ -214,22 +215,22 @@ Public Class ClassImport_Windream
' Regulären Ausdruck zum Auslesen der Indexe definieren ' Regulären Ausdruck zum Auslesen der Indexe definieren
Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
'Namenkonvention laden 'Namenkonvention laden
Dim NameConv = ClassDatabase.Execute_Scalar("SELECT TOP 1 NAME_CONVENTION FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID, True) 'Dim NameConv = ClassDatabase.Execute_Scalar("SELECT TOP 1 NAME_CONVENTION FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID, True)
If IsDBNull(NameConv) Then If IsDBNull(oNAME_CONVENTION) Then
ClassLogger.Add(">> Achtung: Namenskonvention is DBNull", False) ClassLogger.Add(">> Achtung: Namenskonvention is DBNull", False)
NameConv = Path.GetFileNameWithoutExtension(CURRENT_FILENAME) oNAME_CONVENTION = Path.GetFileNameWithoutExtension(CURRENT_FILENAME)
ElseIf NameConv = String.Empty Then ElseIf oNAME_CONVENTION = String.Empty Then
ClassLogger.Add(">> Achtung: Namenskonvention is String empty", False) ClassLogger.Add(">> Achtung: Namenskonvention is String empty", False)
NameConv = Path.GetFileNameWithoutExtension(CURRENT_FILENAME) oNAME_CONVENTION = Path.GetFileNameWithoutExtension(CURRENT_FILENAME)
End If End If
'schonmal den gesamten Pfad laden 'schonmal den gesamten Pfad laden
Dim DATEINAME As String = Zielordner & "\" & NameConv Dim oNewWM_Filename As String = oWMTARGET_FOLDER & "\" & oNAME_CONVENTION
If LogErrorsOnly = False Then ClassLogger.Add(" >> DATEINAME: " & DATEINAME, False) If LogErrorsOnly = False Then ClassLogger.Add(" >> oNewWM_Filename: " & oNewWM_Filename, False)
' einen Regulären Ausdruck laden ' einen Regulären Ausdruck laden
Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg) Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
' die Vorkommen im SQL-String auslesen ' die Vorkommen im SQL-String auslesen
Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(DATEINAME) Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(oNewWM_Filename)
'#### '####
' alle Vorkommen innerhalbd er Namenkonvention durchlaufen ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
For Each element As System.Text.RegularExpressions.Match In elemente For Each element As System.Text.RegularExpressions.Match In elemente
@@ -290,7 +291,7 @@ Public Class ClassImport_Windream
End If End If
ElseIf APattern.Contains("#") Then ElseIf APattern.Contains("#") Then
If LogErrorsOnly = False Then ClassLogger.Add(" >> element filled with Record-Data.......: ", False) If LogErrorsOnly = False Then ClassLogger.Add(" >> element [" & APattern & "] filled with Record-Data...: ", False)
Dim split() As String = APattern.Split("#") Dim split() As String = APattern.Split("#")
If split.Length = 2 Then If split.Length = 2 Then
Dim CONTROL_ID = split(1) Dim CONTROL_ID = split(1)
@@ -365,8 +366,8 @@ Public Class ClassImport_Windream
End Select End Select
If value <> String.Empty Then If value <> String.Empty Then
DATEINAME = DATEINAME.Replace(element.Value, value) oNewWM_Filename = oNewWM_Filename.Replace(element.Value, value)
_NewFileString = DATEINAME _NewFileString = oNewWM_Filename
If LogErrorsOnly = False Then ClassLogger.Add(" >> Actual NEWFILESTRING: " & _NewFileString, False) If LogErrorsOnly = False Then ClassLogger.Add(" >> Actual NEWFILESTRING: " & _NewFileString, False)
' sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString ' sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString
AnzahlIndexe += 1 AnzahlIndexe += 1
@@ -418,14 +419,14 @@ Public Class ClassImport_Windream
Case "MM_YYYY" Case "MM_YYYY"
datetemp = _Month & "_" & My.Computer.Clock.LocalTime.Year datetemp = _Month & "_" & My.Computer.Clock.LocalTime.Year
Case "OFilename".ToUpper Case "OFilename".ToUpper
DATEINAME = DATEINAME.Replace(element.Value, Path.GetFileNameWithoutExtension(CURRENT_FILENAME)) oNewWM_Filename = oNewWM_Filename.Replace(element.Value, Path.GetFileNameWithoutExtension(CURRENT_FILENAME))
Case "Username".ToUpper Case "Username".ToUpper
DATEINAME = DATEINAME.Replace(element.Value, USER_USERNAME) oNewWM_Filename = oNewWM_Filename.Replace(element.Value, USER_USERNAME)
End Select End Select
If datetemp <> "" Then If datetemp <> "" Then
DATEINAME = DATEINAME.Replace(element.Value, datetemp) oNewWM_Filename = oNewWM_Filename.Replace(element.Value, datetemp)
End If End If
_NewFileString = DATEINAME _NewFileString = oNewWM_Filename
Case Else Case Else
Dim msg As String Dim msg As String
msg = "In der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper msg = "In der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper
@@ -439,17 +440,17 @@ Public Class ClassImport_Windream
Next Next
Try Try
'ungültige Zeichen entfernen 'ungültige Zeichen entfernen
DATEINAME = ClassHelper.CleanFilename(DATEINAME, "") oNewWM_Filename = ClassHelper.CleanFilename(oNewWM_Filename, "")
If DATEINAME.Contains("/") Then If oNewWM_Filename.Contains("/") Then
ClassLogger.Add(String.Format(">> DATEINAME contains /-sign. / will be replaced with _")) ClassLogger.Add(String.Format(">> DATEINAME contains /-sign. / will be replaced with _"))
DATEINAME = DATEINAME.Replace("/", "_") oNewWM_Filename = oNewWM_Filename.Replace("/", "_")
End If End If
Catch ex As Exception Catch ex As Exception
ClassLogger.Add(" - Error in Versioning file - Error: " & vbNewLine & ex.Message) ClassLogger.Add(" - Error in Versioning file - Error: " & vbNewLine & ex.Message)
MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Versioning file:") MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Versioning file:")
err = True err = True
End Try End Try
CURRENT_NEWFILENAME = DATEINAME & extension CURRENT_NEWFILENAME = oNewWM_Filename & oExtension
'False oder True zurückgeben 'False oder True zurückgeben

12
app/DD-Record-Organizer/ClassInit.vb
View File

@@ -100,6 +100,7 @@ Public Class ClassInit
If configResult = False Then If configResult = False Then
Throw New Exception("Find more information in the logfile.") Throw New Exception("Find more information in the logfile.")
End If End If
Dim sql = String.Format("SELECT * FROM TBPMO_KONFIGURATION WHERE GUID = 1") Dim sql = String.Format("SELECT * FROM TBPMO_KONFIGURATION WHERE GUID = 1")
Dim KONFIG_DT As DataTable = ClassDatabase.Return_Datatable(sql, False) Dim KONFIG_DT As DataTable = ClassDatabase.Return_Datatable(sql, False)
If KONFIG_DT.Rows.Count = 1 Then If KONFIG_DT.Rows.Count = 1 Then
@@ -123,7 +124,7 @@ Public Class ClassInit
CURRENT_TBPMO_FORM_VIEW = ClassDatabase.Return_Datatable(sql, True) CURRENT_TBPMO_FORM_VIEW = ClassDatabase.Return_Datatable(sql, True)
sql = String.Format("select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID") sql = String.Format("select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID")
CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql, True) CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql, True)
clsCURRENT.LOG_ERRORS_ONLY = LogErrorsOnly
Catch ex As Exception Catch ex As Exception
MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try End Try
@@ -143,6 +144,7 @@ Public Class ClassInit
Public Shared Function InitUserLogin(Optional _User As String = "") Public Shared Function InitUserLogin(Optional _User As String = "")
Try Try
If _User = "" Then If _User = "" Then
USER_USERNAME = Environment.UserName USER_USERNAME = Environment.UserName
Else Else
@@ -169,7 +171,7 @@ Public Class ClassInit
clsCURRENT.USER_LANGUAGE = USER_LANGUAGE clsCURRENT.USER_LANGUAGE = USER_LANGUAGE
USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT") USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT")
USER_GENERAL_VIEWER = USER_DT.Rows(0).Item("GENERAL_VIEWER") USER_GENERAL_VIEWER = USER_DT.Rows(0).Item("GENERAL_VIEWER")
sql = String.Format("SELECT * FROM TBDD_USER_MODULES T, TBDD_MODULES T1 WHERE T.MODULE_ID = T1.GUID AND T1.NAME = 'Record-Organizer' AND T.USER_ID = {0}", USER_GUID) sql = String.Format("SELECT T.* FROM TBDD_USER_MODULES T, TBDD_MODULES T1 WHERE T.MODULE_ID = T1.GUID AND T1.NAME = 'Record-Organizer' AND T.USER_ID = {0}", USER_GUID)
Dim USER2MODULE As DataTable = clsDatabase.Return_Datatable(sql) Dim USER2MODULE As DataTable = clsDatabase.Return_Datatable(sql)
If Not IsNothing(USER2MODULE) Then If Not IsNothing(USER2MODULE) Then
If USER2MODULE.Rows.Count = 1 Then If USER2MODULE.Rows.Count = 1 Then
@@ -253,7 +255,7 @@ Public Class ClassInit
ClassLogger.Add("Unexpected Error in clswindream.Init: " & ex.Message) ClassLogger.Add("Unexpected Error in clswindream.Init: " & ex.Message)
MsgBox("Unexpected Error in Creating windream-Session: " & ex.Message & vbNewLine & "Please inform Your sysadmin!", MsgBoxStyle.Critical) MsgBox("Unexpected Error in Creating windream-Session: " & ex.Message & vbNewLine & "Please inform Your sysadmin!", MsgBoxStyle.Critical)
End Try End Try
sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED) sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED)
Dim anzahl = ClassDatabase.Execute_Scalar(sql, False) Dim anzahl = ClassDatabase.Execute_Scalar(sql, False)
USERS_LOGGED_IN = CInt(anzahl) USERS_LOGGED_IN = CInt(anzahl)
@@ -264,7 +266,7 @@ Public Class ClassInit
Dim msg = String.Format("Die Anzahl der aktuell angemeldeten User (" & USERS_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!") Dim msg = String.Format("Die Anzahl der aktuell angemeldeten User (" & USERS_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!")
If USER_LANGUAGE <> "de-DE" Then If USER_LANGUAGE <> "de-DE" Then
msg = String.Format("The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses." & vbNewLine & _ msg = String.Format("The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses." & vbNewLine &
"Number of licenses: " & LICENSE_COUNT.ToString & vbNewLine & "Please contact Your admin!") "Number of licenses: " & LICENSE_COUNT.ToString & vbNewLine & "Please contact Your admin!")
End If End If
MsgBox(msg, MsgBoxStyle.Exclamation) MsgBox(msg, MsgBoxStyle.Exclamation)
@@ -299,7 +301,7 @@ Public Class ClassInit
End If End If
Return True Return True
'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString 'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString
End If End If
End If End If
Catch ex As Exception Catch ex As Exception
ClassLogger.Add("Unexpected Error in InitUserLogin: " & ex.Message) ClassLogger.Add("Unexpected Error in InitUserLogin: " & ex.Message)

7
app/DD-Record-Organizer/ClassUpdate.vb
View File

@@ -21,13 +21,10 @@ Public Class ClassUpdate
Public Shared UPDATE_ERROR As Boolean = False Public Shared UPDATE_ERROR As Boolean = False
Private Shared RecExe_found As Boolean = False Private Shared RecExe_found As Boolean = False
Private Shared DT_USER_DATA As DataTable Public Shared DT_USER_DATA As DataTable
Private Shared USER_INFO1, USER_INFO2, USER_INFO3 As String Private Shared USER_INFO1, USER_INFO2, USER_INFO3 As String
Public Shared Function Init() Public Shared Function Init()
Try Try
If InitInstallPath() = False Then
End If
Dim sql = String.Format("SELECT * FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')") Dim sql = String.Format("SELECT * FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')")
Dim KONFIG_DT As DataTable = clsDatabase.Return_Datatable(sql, False) Dim KONFIG_DT As DataTable = clsDatabase.Return_Datatable(sql, False)
If KONFIG_DT.Rows.Count = 1 Then If KONFIG_DT.Rows.Count = 1 Then
@@ -62,7 +59,7 @@ Public Class ClassUpdate
End Try End Try
End Function End Function
Private Shared Function InitInstallPath() Public Shared Function InitInstallPath()
Try Try
Dim readValue = My.Computer.Registry.GetValue("HKEY_CURRENT_USER\Software\Digital Data\Record Organizer", "Path", Nothing) Dim readValue = My.Computer.Registry.GetValue("HKEY_CURRENT_USER\Software\Digital Data\Record Organizer", "Path", Nothing)
If Not IsNothing(readValue) Then If Not IsNothing(readValue) Then

2
app/DD-Record-Organizer/My Project/AssemblyInfo.vb
View File

@@ -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.5.0.0")> <Assembly: AssemblyVersion("2.5.0.1")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")> <Assembly: NeutralResourcesLanguageAttribute("")>

31
app/DD-Record-Organizer/frmMain.vb
View File

@@ -120,6 +120,7 @@ Public Class frmMain
Catch ex As Exception Catch ex As Exception
MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try End Try
If LogErrorsOnly = False Then ClassLogger.Add(">> FormLoad finished!", False)
Proxy_Server_Controls() Proxy_Server_Controls()
CONN_Manager CONN_Manager
@@ -151,14 +152,19 @@ Public Class frmMain
End Try End Try
End Sub End Sub
Sub Proxy_Server_Controls() Sub Proxy_Server_Controls()
If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then Try
'itemRefreshProxy.Visibility = BarItemVisibility.Always If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then
LabelProxyServer.Visibility = BarItemVisibility.Always 'itemRefreshProxy.Visibility = BarItemVisibility.Always
ClassLogger.Add(">> PROXY-SERVER is being used", False) LabelProxyServer.Visibility = BarItemVisibility.Always
Else ClassLogger.Add(">> PROXY-SERVER is being used", False)
'itemRefreshProxy.Visibility = BarItemVisibility.Never Else
LabelProxyServer.Visibility = BarItemVisibility.Never 'itemRefreshProxy.Visibility = BarItemVisibility.Never
End If LabelProxyServer.Visibility = BarItemVisibility.Never
End If
Catch ex As Exception
ClassLogger.Add("Unexpected Error in Sub Proxy_Server_Controls():" & ex.Message, True)
End Try
End Sub End Sub
Public Sub RUN_TIMER() Public Sub RUN_TIMER()
Try Try
@@ -574,12 +580,19 @@ Public Class frmMain
Try Try
If ClassUpdate.Init = True And Not IsNothing(ClassUpdate.DT_UPDATE_ITEMS) Then If ClassUpdate.Init = True And Not IsNothing(ClassUpdate.DT_UPDATE_ITEMS) Then
'MsgBox("532") 'MsgBox("532")
If Not IsNothing(ClassUpdate.DT_UPDATE) And Not IsNothing(ClassUpdate.DT_UPDATE_ITEMS) Then If Not IsNothing(ClassUpdate.DT_UPDATE) Then
If ClassUpdate.DT_UPDATE_ITEMS.Rows.Count > 0 Then If ClassUpdate.DT_UPDATE_ITEMS.Rows.Count > 0 Then
If ClassUpdate.InitUser = False Then If ClassUpdate.InitUser = False Then
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
Exit Sub Exit Sub
Else Else
If ClassUpdate.DT_USER_DATA.Rows.Count = 1 Or ClassUpdate.ALL_USERS = True Then
If ClassUpdate.InitInstallPath() = False Then
Exit Sub
End If
End If
ClassUpdate.RUN_UPDATE() ClassUpdate.RUN_UPDATE()
If ClassUpdate.UPDATE_ERROR = True Then If ClassUpdate.UPDATE_ERROR = True Then
Dim msg = String.Format("Während des Updatevorgangs für Version '{0}' haben sich unerwartet Fehler ereignet!" & vbNewLine & "Wollen Sie die Logdatei anzeigen?", ClassUpdate.VERSION_SERVER) Dim msg = String.Format("Während des Updatevorgangs für Version '{0}' haben sich unerwartet Fehler ereignet!" & vbNewLine & "Wollen Sie die Logdatei anzeigen?", ClassUpdate.VERSION_SERVER)

3
app/DD-Record-Organizer/frmWM_IndexFile.vb
View File

@@ -50,6 +50,7 @@ Public Class frmWM_IndexFile
sw.Done() sw.Done()
sw = New SW("CheckFileExists") sw = New SW("CheckFileExists")
Dim existsonlyasMaster = False Dim existsonlyasMaster = False
If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer) = True Then If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer) = True Then
Dim msg = "Eine Datei mit identischem Namen existiert bereits! Wollen Sie die bestehende Datei ersetzen?" Dim msg = "Eine Datei mit identischem Namen existiert bereits! Wollen Sie die bestehende Datei ersetzen?"
If USER_LANGUAGE <> "de-DE" Then If USER_LANGUAGE <> "de-DE" Then
@@ -487,7 +488,7 @@ Public Class frmWM_IndexFile
Me.Cursor = Cursors.WaitCursor Me.Cursor = Cursors.WaitCursor
SaveMySettingsValue("WD_IndexDeleteDocs", WD_IndexDeleteDocs, "ConfigMain") SaveMySettingsValue("WD_IndexDeleteDocs", WD_IndexDeleteDocs, "ConfigMain")
clsWindream.MY_WDOBJECTTYPE = Me.OBJECT_TYPETextBox.Text clsWindream.MY_WDOBJECTTYPE = Me.OBJECT_TYPETextBox.Text
'Multi-Indexer ist aktiv
If chkMultiIndexer.Visible = True And chkMultiIndexer.Checked = True Then If chkMultiIndexer.Visible = True And chkMultiIndexer.Checked = True Then
'Die erste Datei indexieren 'Die erste Datei indexieren
If WORK_FILE(Me.txtFilepath.Text, Me.PATHTextBox.Text, doctype_id, My.Settings.WD_INDEXDOKART_SAVE, True) = True Then If WORK_FILE(Me.txtFilepath.Text, Me.PATHTextBox.Text, doctype_id, My.Settings.WD_INDEXDOKART_SAVE, True) = True Then

2
app/VERSION_CHECKER/ClassInit.vb
View File

@@ -31,9 +31,7 @@ Public Class ClassInit
End Function End Function
Public Sub InitBasics() Public Sub InitBasics()
Try Try
If InitInstallPath() = False Then
End If
Dim sql = String.Format("SELECT * FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')") Dim sql = String.Format("SELECT * FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')")
Dim KONFIG_DT As DataTable = clsDatabase.Return_Datatable(sql, False) Dim KONFIG_DT As DataTable = clsDatabase.Return_Datatable(sql, False)
If KONFIG_DT.Rows.Count = 1 Then If KONFIG_DT.Rows.Count = 1 Then