This commit is contained in:
2023-11-23 10:07:00 +01:00
parent df489932df
commit d5e084ac6b
12 changed files with 94 additions and 408 deletions

View File

@@ -172,20 +172,27 @@ Public Class ClassHelper
Public Shared Function File_open(RESULT_DOC_PATH As Object, DocID As String)
Try
RESULT_DOC_PATH = FORMAT_WM_PATH(RESULT_DOC_PATH)
CURRENT_OFFICE_FILE_CHANGED = False
If SHARE_DRIVE_ACTIVE Then
If RESULT_DOC_PATH.ToString.StartsWith(constWMOBJECTS) Then
RESULT_DOC_PATH = RESULT_DOC_PATH.ToString.Replace(constWMOBJECTS, WMPATH_PREFIX)
End If
End If
CURRENT_OFFICE_FILE_CHANGED = False
If RESULT_DOC_PATH <> Nothing Then
Dim EXT = Path.GetExtension(RESULT_DOC_PATH)
EXT = EXT.Replace(".", "")
Dim sql = String.Format("SELECT VIEWER FROM TBPMO_DOC_USER_VIEW WHERE USER_ID = {0} AND FILE_EXTENSION = '{1}'", USER_GUID, EXT)
Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
If DT.Rows.Count = 1 Then
Select Case DT.Rows(0).Item("VIEWER")
Case "DOC_VIEW"
OPEN_DOCVIEW(RESULT_DOC_PATH, DocID)
End Select
Else
File_SYSOPEN(RESULT_DOC_PATH, DocID)
End If
'Dim EXT = Path.GetExtension(RESULT_DOC_PATH)
'EXT = EXT.Replace(".", "")
' Dim sql = String.Format("SELECT VIEWER FROM TBPMO_DOC_USER_VIEW WHERE USER_ID = {0} AND FILE_EXTENSION = '{1}'", USER_GUID, EXT)
' Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
' If DT.Rows.Count = 1 Then
' Select Case DT.Rows(0).Item("VIEWER")
' Case "DOC_VIEW"
' OPEN_DOCVIEW(RESULT_DOC_PATH, DocID)
' End Select
' Else
File_SYSOPEN(RESULT_DOC_PATH, DocID)
'End If
Return True
Else
MSGBOX_Handler("ERROR", "", "Sorry, but the docpath for doc-id: " & DocID & " is nothing!")
@@ -264,7 +271,6 @@ Public Class ClassHelper
If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then
oSql = $"SELECT dwVersionID FROM VWPMO_DOC_SEARCH WHERE DocID = {BW_DocID}"
Dim odwVersionId = MYDB_ECM.GetScalarValue(oSql)
Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,DOC_PATH) VALUES ({USER_GUID},'{ProcID.ToString}',{odwVersionId},{BW_DocID},'{BW_DocPath}')"
MYDB_ECM.ExecuteNonQuery(oInsert)
End If
@@ -272,6 +278,7 @@ Public Class ClassHelper
'oMyProcess.WaitForExit()
Catch ex As Exception
LOGGER.Warn("Error in Process1.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
MsgBox("Error in OpenFile: " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID, MsgBoxStyle.Exclamation)
Exit Sub
End Try