Indexe leeren wie Vektor, ValidatorSearch und Instanzierung, ShowDocument abfangen

This commit is contained in:
Developer01 2025-08-21 11:19:48 +02:00
parent a9cc02c4b4
commit 03b566574f
6 changed files with 155 additions and 143 deletions

View File

@ -167,6 +167,8 @@
<File Id="GdPicture.NET.14.Email" Name="GdPicture.NET.14.Email.dll" /> <File Id="GdPicture.NET.14.Email" Name="GdPicture.NET.14.Email.dll" />
<File Id="GdPicture.NET.14.HTML" Name="GdPicture.NET.14.HTML.dll" /> <File Id="GdPicture.NET.14.HTML" Name="GdPicture.NET.14.HTML.dll" />
<File Id="GdPicture.NET.14.MSOfficeBinary" Name="GdPicture.NET.14.MSOfficeBinary.dll"/> <File Id="GdPicture.NET.14.MSOfficeBinary" Name="GdPicture.NET.14.MSOfficeBinary.dll"/>
<File Id="GdPicture.NET.14.CAD" Name="GdPicture.NET.14.CAD.dll"/>
<File Id="GdPicture.NET.14.CAD.DWG" Name="GdPicture.NET.14.CAD.DWG.dll"/>
<File Id="BouncyCastle.Cryptography" Name="BouncyCastle.Cryptography.dll"/> <File Id="BouncyCastle.Cryptography" Name="BouncyCastle.Cryptography.dll"/>
<File Id="System.ValueTuple" Name="System.ValueTuple.dll" /> <File Id="System.ValueTuple" Name="System.ValueTuple.dll" />
<File Id="System.IO.Packaging" Name="System.IO.Packaging.dll" /> <File Id="System.IO.Packaging" Name="System.IO.Packaging.dll" />

View File

@ -152,14 +152,20 @@ Public Class ClassPMWindream
'Den Typ des Index-Feldes auslesen 'Den Typ des Index-Feldes auslesen
'MsgBox(value.GetType.ToString) 'MsgBox(value.GetType.ToString)
Select Case vType Select Case vType
'Case WMObjectVariableValueTypeUndefined
Case WMObjectVariableValueTypeString Case WMObjectVariableValueTypeString
LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeString") LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeString")
If value = "DeleteWMAttributeValue" Then
LOGGER.Debug("Indexing simpleAttribute with String.Empty")
convertValue = CStr(String.Empty)
Else
convertValue = CStr(value) convertValue = CStr(value)
End If
Case WMObjectVariableValueTypeInteger Case WMObjectVariableValueTypeInteger
LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeInteger") LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeInteger")
If IsNumeric(value) = False Then If IsNumeric(value) = False Then
If value = String.Empty Then If value = String.Empty Then
LOGGER.Debug("Indexing WMObjectVariableValueTypeInteger with vbEmpty")
convertValue = vbEmpty convertValue = vbEmpty
Else Else
frmValidator.idxerr_message = "Unerlaubte Eingabe in Numerisches Feld: " & value frmValidator.idxerr_message = "Unerlaubte Eingabe in Numerisches Feld: " & value
@ -289,17 +295,8 @@ Public Class ClassPMWindream
LOGGER.Info(" >> Unexpected Error in Logging SetVariableValue for " & aName & ": " & ex.Message, False) LOGGER.Info(" >> Unexpected Error in Logging SetVariableValue for " & aName & ": " & ex.Message, False)
End Try End Try
'Dim ArrValues()
'ReDim ArrValues(0)
'ArrValues(0) = convertValue
'Dim ArrName()
'ReDim ArrName(0)
'ArrName(0) = "Tournr"
'oDocument.SetValues(ArrName, ArrValues)
'If convertValue = String.Empty Or convertValue = vbEmpty Then
' LOGGER.Debug("Now Indexing simpleAttribute with vbEmpty ...")
' oDocument.SetVariableValue(aName, String.Empty)
'Else
If _int = True Then If _int = True Then
oDocument.SetVariableValue(aName, CInt(convertValue)) oDocument.SetVariableValue(aName, CInt(convertValue))
ElseIf _date = True Then ElseIf _date = True Then
@ -318,10 +315,15 @@ Public Class ClassPMWindream
Else Else
'VEKTORFELDER, ALSO ÜBERPRÜFEN OB ERGEBNIS-ARRAY GEFÜLLT IST 'VEKTORFELDER, ALSO ÜBERPRÜFEN OB ERGEBNIS-ARRAY GEFÜLLT IST
LOGGER.Debug("VEKTORFELD: Vorbereiten des Arrays", False) LOGGER.Debug("VEKTORFELD: Vorbereiten des Arrays", False)
If aValues(0).ToString.Contains("DeleteWMAttributeValue") Then
'Variante um Vektorfeld zu leeren
Dim myArray()
ReDim myArray(aValues.Length - 1)
myArray(0) = String.Empty
LOGGER.Debug("Now Indexing vektor-attribute with String.Empty ...")
oDocument.SetVariableValue(aName, myArray)
Else
Dim myArray() Dim myArray()
'Dim anz As Integer = 0
'For Each obj In aValues
'ReDim Preserve myArray(anz)
Select Case vType Select Case vType
Case 4100 Case 4100
'Vektortyp Boolean 'Vektortyp Boolean
@ -425,21 +427,23 @@ Public Class ClassPMWindream
i1 = i1 + 1 i1 = i1 + 1
Next Next
End Select End Select
LOGGER.Debug("Wert für Index vor Indexierung: [{0}]", myArray)
'Jetzt die Nachindexierung für Vektor-Felder 'Jetzt die Nachindexierung für Vektor-Felder
If vType = 4097 Or vType = 36865 Then LOGGER.Debug("Wert für Index vor Indexierung: [{0}]", myArray)
If myArray(0) = String.Empty Then
'Variante um Vektorfeld zu leeren 'If vType = 4097 Or vType = 36865 Then
LOGGER.Debug("Now Indexing vektor-attribute with vbEmpty ...") ' If myArray(0) = "DeleteWMAttributeValue" Then
oDocument.SetVariableValue(aName, vbEmpty) ' 'Variante um Vektorfeld zu leeren
Else ' LOGGER.Debug("Now Indexing vektor-attribute with vbEmpty ...")
oDocument.SetVariableValue(aName, myArray) ' oDocument.SetVariableValue(aName, vbEmpty)
End If ' Else
Else ' oDocument.SetVariableValue(aName, myArray)
' End If
'Else
oDocument.SetVariableValue(aName, myArray) oDocument.SetVariableValue(aName, myArray)
'End If
End If End If
LOGGER.Debug("'SetVariableValue' für VEKTOR erfolgreich", False) LOGGER.Debug("'SetVariableValue' für VEKTOR erfolgreich", False)
End If End If
End If End If

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.5.6.0")> <Assembly: AssemblyVersion("2.5.6.1")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguage("")> <Assembly: NeutralResourcesLanguage("")>

View File

@ -247,12 +247,13 @@ Public Class frmValidator
Dim _step = 0 Dim _step = 0
Try Try
DocumentViewer1.Init(LOGCONFIG, GDPICTURE_LICENSE, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With { Dim oDVSettings As New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
.ShowPrintButton = True, .ShowPrintButton = True,
.ShowRotateButton = True, .ShowRotateButton = True,
.ShowFlipButton = True, .ShowFlipButton = True,
.ShowSettingButton = True .ShowSettingButton = True
}) }
DocumentViewer1.Init(LOGCONFIG, GDPICTURE_LICENSE, oDVSettings)
Catch ex As Exception Catch ex As Exception
MyValidationLogger.Error(ex) MyValidationLogger.Error(ex)
End Try End Try
@ -2892,6 +2893,9 @@ Public Class frmValidator
Exit Sub Exit Sub
End Try End Try
If ActiveWorkflowType = ConstAHWorkflow_BlindFile Or PROFILE_SHOW_DOCUMENT = False Then If ActiveWorkflowType = ConstAHWorkflow_BlindFile Or PROFILE_SHOW_DOCUMENT = False Then
If PROFILE_SHOW_DOCUMENT = False And ActiveWorkflowType <> ConstAHWorkflow_BlindFile Then
MyValidationLogger.Warn("PROFILE_SHOW_DOCUMENT = False - DocumentViewer won't be displayed. Configuration error?")
End If
SplitContainer1.Panel2Collapsed = True SplitContainer1.Panel2Collapsed = True
If Not IsNothing(DocumentViewer1) Then If Not IsNothing(DocumentViewer1) Then
DocumentViewer1.Visible = False DocumentViewer1.Visible = False

View File

@ -855,7 +855,7 @@
<data name="EigenschaftenDateiToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="EigenschaftenDateiToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsPAAALDwGS+QOlAAACbElE JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsOAAALDgFAvuFBAAACbElE
QVRIS8WQb0gTcRyHJYig3hgkBBlRb8I3UvNdEHm9iOjUbU6mopUL2rIgx0SwUTTILUTJSJpJKbHWKlkm QVRIS8WQb0gTcRyHJYig3hgkBBlRb8I3UvNdEHm9iOjUbU6mopUL2rIgx0SwUTTILUTJSJpJKbHWKlkm
EUhW4Mxw2h9tI0PT6bYWbbkyk+n+3Se8mun9or3Quw4e7u6B+32f+6YASPmfEEJoCCE0hBAaQggNIf5F EUhW4Mxw2h9tI0PT6bYWbbkyk+n+3Se8mun9or3Quw4e7u6B+32f+6YASPmfEEJoCCE0hBAaQggNIf5F
R5txrbW1cfRpu2FSX606+Oi2LnarSYebRh2aG7Ro1FdCpy5hjHVarcxKXZRZqW7uGVwIkYzONpNlbtJg R5txrbW1cfRpu2FSX606+Oi2LnarSYebRh2aG7Ro1FdCpy5hjHVarcxKXZRZqW7uGVwIkYzONpNlbtJg
@ -922,7 +922,7 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAAAYdJREFUOE+NkG0rQ2Ec 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYdJREFUOE+NkG0rQ2Ec
h/clfBS+gFdEXox3iqI85d0UjUKTp02O7axlM9vMkZ0sIxQSIdsLUUZ5bnmIzZrZ5uzBOT/d01bOjjN3 h/clfBS+gFdEXox3iqI85d0UjUKTp02O7axlM9vMkZ0sIxQSIdsLUUZ5bnmIzZrZ5uzBOT/d01bOjjN3
XXV397+uuv8KAAophgzO8gGKQfeoHcO0C2qtrVc8Qyh4yNGooqFs09WTe2ePtWSQYtClma1rUBnwr4CY XXV397+uuv8KAAophgzO8gGKQfeoHcO0C2qtrVc8Qyh4yNGooqFs09WTe2ePtWSQYtClma1rUBnwr4CY
drWpurZDh5q2ycKA0bkOKei5NThXfeNkRtk+gZpWClUteumA1JmyraCssjkfkUI2MGFxY/PQn4toxXLR drWpurZDh5q2ycKA0bkOKei5NThXfeNkRtk+gZpWClUteumA1JmyraCssjkfkUI2MGFxY/PQn4toxXLR

View File

@ -687,6 +687,7 @@ Public Class frmValidatorSearch
End Sub End Sub
Private Sub ToolStripButtonRefreshSearches_Click(sender As Object, e As EventArgs) Handles ToolStripButtonRefreshSearches.Click Private Sub ToolStripButtonRefreshSearches_Click(sender As Object, e As EventArgs) Handles ToolStripButtonRefreshSearches.Click
If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
LOGGER.Debug($"There are [{BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count}] SQLSearches configured!")
_DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL _DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL
Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
@ -695,6 +696,7 @@ Public Class frmValidatorSearch
Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE")) Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE"))
End If End If
If DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then If DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
LOGGER.Debug($"There are [{DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count}] DocSearches configured!")
_DTDocSearches = DT_FILTERED_PROFILE_SEARCHES_DOC _DTDocSearches = DT_FILTERED_PROFILE_SEARCHES_DOC
Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
Dim oCommand = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") Dim oCommand = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")