MS 2.4.9.8 Logging OperationMode, GDPictureLicense
This commit is contained in:
Developer01
parent
a535792b08
commit
a99258cfea
@ -143,7 +143,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-14.2.89.0" newVersion="14.2.89.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-14.2.90.0" newVersion="14.2.90.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
@ -483,6 +483,10 @@ Public Class ClassInit
|
||||
If oROW.Item("NAME") = "GDPICTURE" Then
|
||||
GDPICTURE_LICENSE = oROW.Item("LICENSE")
|
||||
End If
|
||||
If oROW.Item("NAME") = "GDPICTURE_TASKFLOW" Then
|
||||
GDPICTURE_LICENSE = oROW.Item("LICENSE")
|
||||
LOGGER.Debug("GDPICTURE_TASKFLOW License used!")
|
||||
End If
|
||||
Next
|
||||
|
||||
oStep = "TBDD_SQL_COMMANDS"
|
||||
|
||||
@ -74,6 +74,7 @@ Public Class ClassParamRefresh
|
||||
If OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM Then
|
||||
IDB_USES_WMFILESTORE = True
|
||||
End If
|
||||
LOGGER.Info("OPERATION_MODE_FS: " + OPERATION_MODE_FS)
|
||||
ElseIf oMode = "PM.IDBWITHWMFS" Then
|
||||
IDB_USES_WMFILESTORE = True
|
||||
ElseIf oMode = "PM.NO_BASICCONF" Then
|
||||
|
||||
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.4.9.7")>
|
||||
<Assembly: AssemblyVersion("2.4.9.8")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
<Assembly: NeutralResourcesLanguage("")>
|
||||
|
||||
@ -156,9 +156,9 @@
|
||||
<Reference Include="DigitalData.Controls.SnapPanel">
|
||||
<HintPath>..\..\..\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.GUIs.Common, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<Reference Include="DigitalData.GUIs.Common, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
|
||||
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
@ -190,6 +190,9 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.Modules.Patterns">
|
||||
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.Modules.Windream">
|
||||
<HintPath>..\..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
|
||||
</Reference>
|
||||
@ -203,8 +206,8 @@
|
||||
<Reference Include="FormsUtils">
|
||||
<HintPath>P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GdPicture.NET.14, Version=14.2.89.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll</HintPath>
|
||||
<Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Interop.WINDREAMLib">
|
||||
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
|
||||
@ -1112,12 +1115,12 @@
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<Import Project="..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" />
|
||||
<Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
|
||||
</Target>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
||||
@ -101,7 +101,7 @@ Public Class frmValidator
|
||||
Private Property listChangedLookup As New List(Of String)
|
||||
|
||||
|
||||
Private Documentloader As Loader
|
||||
Private DD_Documentloader As Loader
|
||||
Private ControlCreator As ClassControlCreator
|
||||
Private PerformanceLogger As Logger
|
||||
Private Validator As Validator
|
||||
@ -150,15 +150,17 @@ Public Class frmValidator
|
||||
Private Function GetOperationMode() As OperationMode
|
||||
Dim oOperationMode As OperationMode
|
||||
|
||||
If Environment.Service.Client Is Nothing Then
|
||||
If Environment.Service.Client Is Nothing And OPERATION_MODE_FS <> ClassConstants.OpModeFS_ZF Then
|
||||
Return OperationMode.NoAppServer
|
||||
End If
|
||||
If Not IsNothing(Environment.Service.Client) Then
|
||||
If Environment.Service.Client.IsOnline AndAlso Environment.Service.Client.ServerAddress <> String.Empty And IDB_USES_WMFILESTORE = False Then
|
||||
oOperationMode = OperationMode.WithAppServer
|
||||
Else
|
||||
oOperationMode = OperationMode.NoAppServer
|
||||
End If
|
||||
End If
|
||||
|
||||
End If
|
||||
If Environment.Service.Client.IsOnline AndAlso Environment.Service.Client.ServerAddress <> String.Empty And IDB_USES_WMFILESTORE = False Then
|
||||
oOperationMode = OperationMode.WithAppServer
|
||||
Else
|
||||
oOperationMode = OperationMode.NoAppServer
|
||||
End If
|
||||
If OPERATION_MODE_FS = ClassConstants.OpModeFS_ZF Then
|
||||
oOperationMode = OperationMode.ZooFlow
|
||||
End If
|
||||
@ -178,7 +180,7 @@ Public Class frmValidator
|
||||
' or explictly set from OperationModeOverride in Params
|
||||
OperationMode = GetOperationMode()
|
||||
|
||||
Documentloader = New Loader(LOGCONFIG, OperationMode, Environment.Service.Client, Environment.User)
|
||||
DD_Documentloader = New Loader(LOGCONFIG, OperationMode, Environment.Service.Client, Environment.User)
|
||||
ControlCreator = New ClassControlCreator(LOGCONFIG)
|
||||
Validator = New Validator(LOGCONFIG)
|
||||
|
||||
@ -2441,29 +2443,36 @@ Public Class frmValidator
|
||||
CURRENT_DOC_PATH = WM_AHWF_docPath
|
||||
Return True
|
||||
End If
|
||||
|
||||
Dim oResult As String
|
||||
|
||||
Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})"
|
||||
oResult = DatabaseFallback.GetScalarValueECM(oSQL)
|
||||
|
||||
Logger.Debug($"Checking file 0 [{oResult}] exists?...")
|
||||
WMDocPathWindows = String.Empty
|
||||
If File.Exists(oResult) = False And OPERATION_MODE_FS <> ClassConstants.OpModeFS_ZF Then
|
||||
DocPathWindows = oResult
|
||||
Logger.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...")
|
||||
oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)"
|
||||
|
||||
oResult = DatabaseFallback.GetScalarValueECM(oSQL)
|
||||
|
||||
Logger.Debug($"Checking file 1[{oResult}] exists?...")
|
||||
If OPERATION_MODE_FS <> ClassConstants.OpModeFS_ZF Then
|
||||
If File.Exists(oResult) = False Then
|
||||
Logger.Info($"GetWMDocPathWindows FileExists2 also returned false [{oResult}]!")
|
||||
Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})"
|
||||
oResult = DatabaseFallback.GetScalarValueECM(oSQL)
|
||||
Logger.Debug($"Checking file 0 [{oResult}] exists?...")
|
||||
DocPathWindows = oResult
|
||||
Logger.Warn($"GetDocPathWindows: File [{oResult}] not existing!")
|
||||
Return False
|
||||
End If
|
||||
Logger.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...")
|
||||
oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)"
|
||||
|
||||
oResult = DatabaseFallback.GetScalarValueECM(oSQL)
|
||||
|
||||
Logger.Debug($"Checking file 1[{oResult}] exists?...")
|
||||
If File.Exists(oResult) = False Then
|
||||
Logger.Info($"GetWMDocPathWindows FileExists2 also returned false [{oResult}]!")
|
||||
DocPathWindows = oResult
|
||||
Logger.Warn($"GetDocPathWindows: File [{oResult}] not existing!")
|
||||
Return False
|
||||
End If
|
||||
|
||||
End If
|
||||
Else
|
||||
oResult = ClassConstants.OpModeFS_ZF
|
||||
Logger.Debug($"GetDocPathWindows: Filestore is {ClassConstants.OpModeFS_ZF}")
|
||||
End If
|
||||
|
||||
WMDocPathWindows = oResult
|
||||
CURRENT_DOC_PATH = WMDocPathWindows
|
||||
Logger.Info($"GetWMDocPathWindows CURRENT_DOC_PATH: {CURRENT_DOC_PATH}")
|
||||
@ -2583,8 +2592,9 @@ Public Class frmValidator
|
||||
|
||||
If oErrMsgMissingInput = "" Then
|
||||
If WMDocPathWindows <> String.Empty Or OPERATION_MODE_FS = ClassConstants.OpModeFS_ZF Then
|
||||
load_viewer()
|
||||
Logger.Debug("Viewer loaded!")
|
||||
Logger.Debug($"Operationmode is {ClassConstants.OpModeFS_ZF}! Initializing Viewer ...")
|
||||
LoadDocument_DDViewer()
|
||||
Logger.Debug("Viewer loaded!!")
|
||||
If Current_Document.Extension <> "pdf" Then
|
||||
bbtniAnnotation.Visibility = BarItemVisibility.Never
|
||||
End If
|
||||
@ -2752,12 +2762,11 @@ Public Class frmValidator
|
||||
Logger.Error(ex)
|
||||
End Try
|
||||
End Sub
|
||||
Sub load_viewer()
|
||||
Sub LoadDocument_DDViewer()
|
||||
Try
|
||||
|
||||
Dim oDocument As DocumentResultList.Document = Nothing
|
||||
' Load DocumentInfo
|
||||
oDocument = Documentloader.Load(CURRENT_DOC_ID, WMDocPathWindows)
|
||||
oDocument = DD_Documentloader.Load(CURRENT_DOC_ID, WMDocPathWindows)
|
||||
If oDocument Is Nothing Then
|
||||
Exit Sub
|
||||
End If
|
||||
@ -5851,7 +5860,7 @@ Public Class frmValidator
|
||||
|
||||
frmAnnotations.ShowDialog()
|
||||
|
||||
load_viewer()
|
||||
LoadDocument_DDViewer()
|
||||
End Sub
|
||||
|
||||
Private Sub BbtnItm_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BbtnitmSave.ItemClick
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="GdPicture" version="14.2.89" targetFramework="net462" />
|
||||
<package id="GdPicture.runtimes.windows" version="14.2.89" targetFramework="net462" />
|
||||
<package id="GdPicture" version="14.2.90" targetFramework="net462" />
|
||||
<package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" />
|
||||
<package id="NLog" version="5.0.5" targetFramework="net461" />
|
||||
</packages>
|
||||
Loading…
x
Reference in New Issue
Block a user