From dfb9cf2ea9fe9955c50095c9ad27a2d502667838 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 24 May 2019 11:31:36 +0200 Subject: [PATCH] rename ECM references to IDB --- Controls.LookupGrid/LookupControl2.vb | 27 + DDMonorepo.sln | 2 +- .../DigitalData.Services.EDMService.wsdl | 145 ----- .../EDMIServiceReference/Reference.vb | 524 ------------------ ...erviceReference.DocumentResult.datasource} | 2 +- ...DBServiceReference.IndexResult.datasource} | 2 +- ...erviceReference.NonQueryResult.datasource} | 2 +- ...BServiceReference.ScalarResult.datasource} | 2 +- ...DBServiceReference.TableResult.datasource} | 2 +- .../DigitalData.Modules.Filesystem.xsd | 0 .../DigitalData.Services.IDBService.wsdl | 145 +++++ .../DigitalData.Services.IDBService.xsd} | 22 +- .../DigitalData.Services.IDBService1.xsd} | 2 +- .../Reference.svcmap | 6 +- .../IDBServiceReference/Reference.vb | 524 ++++++++++++++++++ .../System.Data.xsd | 0 .../System.xsd | 0 .../configuration.svcinfo | 2 +- .../configuration91.svcinfo | 6 +- .../service.wsdl | 34 +- .../service.xsd | 0 EDMI_FILE_OPs/Document.vb | 9 +- EDMI_FILE_OPs/EDMIAPI.vbproj | 36 +- EDMI_FILE_OPs/app.config | 2 +- GUIs.ClientSuite/App.config | 8 +- GUIs.ClientSuite/ClassService.vb | 8 +- GUIs.ClientSuite/ClassTimer.vb | 4 +- GUIs.ClientSuite/ClientSuite.vbproj | 4 +- .../Common/ClassCommonCommands.vb | 18 +- GUIs.ClientSuite/Common/ClassCommonViews.vb | 8 +- .../FormDesigner/frmFormDesigner.vb | 2 +- .../FormUserManager/frmUserManager.vb | 10 +- .../FormWorkflow/frmWorkflowStep.vb | 6 +- .../My Project/Settings.Designer.vb | 16 +- GUIs.ClientSuite/My Project/Settings.settings | 5 +- GUIs.ClientSuite/MyApplication.vb | 6 +- GUIs.ClientSuite/_TEST/frmDocTest.vb | 4 +- GUIs.ClientSuite/_TEST/frmFileTest.vb | 2 +- GUIs.ClientSuite/frmHome.vb | 2 +- GUIs.ClientSuite/frmObjectEditor.vb | 4 +- GUIs.ClientSuite/frmSearch.vb | 2 +- GUIs.ClientSuite/frmSplash.vb | 10 +- SERVICES/DDEDM_NetworkService/App.config | 8 +- .../{EDMService.vb => IDBService.vb} | 39 +- ...{DDEDMService.vbproj => IDBService.vbproj} | 14 +- .../{IEDMService.vb => IIDBService.vb} | 4 +- .../My Project/AssemblyInfo.vb | 4 +- .../My Project/Resources.Designer.vb | 2 +- .../My Project/Settings.Designer.vb | 4 +- .../DDEDM_NetworkService/SettingsModule.vb | 4 +- .../DDEDM_NetworkService/WindowsService.vb | 21 +- 51 files changed, 862 insertions(+), 853 deletions(-) delete mode 100644 EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.wsdl delete mode 100644 EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.DocumentResult.datasource => IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource} (66%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.IndexResult.datasource => IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource} (66%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.NonQueryResult.datasource => IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource} (66%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.ScalarResult.datasource => IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource} (66%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.TableResult.datasource => IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource} (66%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference => IDBServiceReference}/DigitalData.Modules.Filesystem.xsd (100%) create mode 100644 EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference/DigitalData.Services.EDMService.xsd => IDBServiceReference/DigitalData.Services.IDBService.xsd} (90%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference/DigitalData.Services.EDMService1.xsd => IDBServiceReference/DigitalData.Services.IDBService1.xsd} (95%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference => IDBServiceReference}/Reference.svcmap (86%) create mode 100644 EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.vb rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference => IDBServiceReference}/System.Data.xsd (100%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference => IDBServiceReference}/System.xsd (100%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference => IDBServiceReference}/configuration.svcinfo (56%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference => IDBServiceReference}/configuration91.svcinfo (98%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference => IDBServiceReference}/service.wsdl (85%) rename EDMI_FILE_OPs/Connected Services/{EDMIServiceReference => IDBServiceReference}/service.xsd (100%) rename SERVICES/DDEDM_NetworkService/{EDMService.vb => IDBService.vb} (90%) rename SERVICES/DDEDM_NetworkService/{DDEDMService.vbproj => IDBService.vbproj} (94%) rename SERVICES/DDEDM_NetworkService/{IEDMService.vb => IIDBService.vb} (93%) diff --git a/Controls.LookupGrid/LookupControl2.vb b/Controls.LookupGrid/LookupControl2.vb index 95c502b4..c2c0633c 100644 --- a/Controls.LookupGrid/LookupControl2.vb +++ b/Controls.LookupGrid/LookupControl2.vb @@ -44,6 +44,8 @@ Public Class LookupControl2 Private Const TEXT_N_RECORDS = "{0} Datensätze ausgewählt" Private _SelectedValues As New List(Of String) + Friend WithEvents fProperties As RepositoryItemGridLookUpEdit + Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView Private _ReadOnly As Boolean = False Shared Sub New() @@ -176,6 +178,31 @@ Public Class LookupControl2 Return RepositoryItemLookupControl2.CustomEditName End Get End Property + + Private Sub InitializeComponent() + Me.fProperties = New DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit() + Me.fPropertiesView = New DevExpress.XtraGrid.Views.Grid.GridView() + CType(Me.fProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'fProperties + ' + Me.fProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.fProperties.Name = "fProperties" + Me.fProperties.PopupView = Me.fPropertiesView + ' + 'fPropertiesView + ' + Me.fPropertiesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.fPropertiesView.Name = "fPropertiesView" + Me.fPropertiesView.OptionsSelection.EnableAppearanceFocusedCell = False + Me.fPropertiesView.OptionsView.ShowGroupPanel = False + CType(Me.fProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub End Class diff --git a/DDMonorepo.sln b/DDMonorepo.sln index bced3c9e..3194f7a0 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -59,7 +59,7 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUI_EDMI", "GUIs.Test.GUI_E EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClientSuite", "GUIs.ClientSuite\ClientSuite.vbproj", "{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMService", "SERVICES\DDEDM_NetworkService\DDEDMService.vbproj", "{A8C3F298-76AB-4359-AB3C-986E313B4336}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "IDBService", "SERVICES\DDEDM_NetworkService\IDBService.vbproj", "{A8C3F298-76AB-4359-AB3C-986E313B4336}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIAPI", "EDMI_FILE_OPs\EDMIAPI.vbproj", "{5B1171DC-FFFE-4813-A20D-786AAE47B320}" EndProject diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.wsdl b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.wsdl deleted file mode 100644 index 73fa3430..00000000 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.wsdl +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb deleted file mode 100644 index 7f3c0fdc..00000000 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb +++ /dev/null @@ -1,524 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - -Imports System -Imports System.Runtime.Serialization - -Namespace EDMIServiceReference - - _ - Partial Public Class BaseResult - Inherits Object - Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - - _ - Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject - - _ - Private ErrorMessageField As String - - _ - Private OKField As Boolean - - _ - Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData - Get - Return Me.extensionDataField - End Get - Set - Me.extensionDataField = value - End Set - End Property - - _ - Public Property ErrorMessage() As String - Get - Return Me.ErrorMessageField - End Get - Set - If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then - Me.ErrorMessageField = value - Me.RaisePropertyChanged("ErrorMessage") - End If - End Set - End Property - - _ - Public Property OK() As Boolean - Get - Return Me.OKField - End Get - Set - If (Me.OKField.Equals(value) <> true) Then - Me.OKField = value - Me.RaisePropertyChanged("OK") - End If - End Set - End Property - - Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged - - Protected Sub RaisePropertyChanged(ByVal propertyName As String) - Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent - If (Not (propertyChanged) Is Nothing) Then - propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) - End If - End Sub - End Class - - _ - Partial Public Class ScalarResult - Inherits EDMIServiceReference.BaseResult - - _ - Private ScalarField As Object - - _ - Public Property Scalar() As Object - Get - Return Me.ScalarField - End Get - Set - If (Object.ReferenceEquals(Me.ScalarField, value) <> true) Then - Me.ScalarField = value - Me.RaisePropertyChanged("Scalar") - End If - End Set - End Property - End Class - - _ - Partial Public Class NonQueryResult - Inherits EDMIServiceReference.BaseResult - End Class - - _ - Partial Public Class DocumentResult - Inherits EDMIServiceReference.BaseResult - - Private ContentsField() As Byte - - Private DocumentField As EDMIServiceReference.DocumentObject - - Private HasContentsField As Boolean - - _ - Public Property Contents() As Byte() - Get - Return Me.ContentsField - End Get - Set - If (Object.ReferenceEquals(Me.ContentsField, value) <> true) Then - Me.ContentsField = value - Me.RaisePropertyChanged("Contents") - End If - End Set - End Property - - _ - Public Property Document() As EDMIServiceReference.DocumentObject - Get - Return Me.DocumentField - End Get - Set - If (Object.ReferenceEquals(Me.DocumentField, value) <> true) Then - Me.DocumentField = value - Me.RaisePropertyChanged("Document") - End If - End Set - End Property - - _ - Public Property HasContents() As Boolean - Get - Return Me.HasContentsField - End Get - Set - If (Me.HasContentsField.Equals(value) <> true) Then - Me.HasContentsField = value - Me.RaisePropertyChanged("HasContents") - End If - End Set - End Property - End Class - - _ - Partial Public Class IndexResult - Inherits EDMIServiceReference.BaseResult - - Private IndexIdField As Long - - _ - Public Property IndexId() As Long - Get - Return Me.IndexIdField - End Get - Set - If (Me.IndexIdField.Equals(value) <> true) Then - Me.IndexIdField = value - Me.RaisePropertyChanged("IndexId") - End If - End Set - End Property - End Class - - _ - Partial Public Class TableResult - Inherits EDMIServiceReference.BaseResult - - _ - Private TableField As System.Data.DataTable - - _ - Public Property Table() As System.Data.DataTable - Get - Return Me.TableField - End Get - Set - If (Object.ReferenceEquals(Me.TableField, value) <> true) Then - Me.TableField = value - Me.RaisePropertyChanged("Table") - End If - End Set - End Property - End Class - - _ - Partial Public Class DocumentObject - Inherits Object - Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - - _ - Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject - - Private ContainerIdField As String - - Private DocumentIdField As Long - - Private FileNameField As String - - _ - Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData - Get - Return Me.extensionDataField - End Get - Set - Me.extensionDataField = value - End Set - End Property - - _ - Public Property ContainerId() As String - Get - Return Me.ContainerIdField - End Get - Set - If (Object.ReferenceEquals(Me.ContainerIdField, value) <> true) Then - Me.ContainerIdField = value - Me.RaisePropertyChanged("ContainerId") - End If - End Set - End Property - - _ - Public Property DocumentId() As Long - Get - Return Me.DocumentIdField - End Get - Set - If (Me.DocumentIdField.Equals(value) <> true) Then - Me.DocumentIdField = value - Me.RaisePropertyChanged("DocumentId") - End If - End Set - End Property - - _ - Public Property FileName() As String - Get - Return Me.FileNameField - End Get - Set - If (Object.ReferenceEquals(Me.FileNameField, value) <> true) Then - Me.FileNameField = value - Me.RaisePropertyChanged("FileName") - End If - End Set - End Property - - Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged - - Protected Sub RaisePropertyChanged(ByVal propertyName As String) - Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent - If (Not (propertyChanged) Is Nothing) Then - propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) - End If - End Sub - End Class - - _ - Public Interface IEDMService - - _ - Function Heartbeat() As Boolean - - _ - Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) - - _ - Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String - - _ - Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) - - _ - Sub CloseDatabaseRequest() - - _ - Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task - - _ - Function ReturnDatatable(ByVal SQL As String) As EDMIServiceReference.TableResult - - _ - Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) - - _ - Function ReturnScalar(ByVal SQL As String) As EDMIServiceReference.ScalarResult - - _ - Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult) - - _ - Function ExecuteNonQuery(ByVal SQL As String) As EDMIServiceReference.NonQueryResult - - _ - Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) - - _ - Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult - - _ - Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) - - _ - Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult - - _ - Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) - - _ - Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResult - - _ - Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) - - _ - Function DeleteFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As Boolean - - _ - Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) - - _ - Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResult - - _ - Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) - - _ - Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResult - - _ - Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) - - _ - Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult - - _ - Function NewFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.IndexResult) - End Interface - - _ - Public Interface IEDMServiceChannel - Inherits EDMIServiceReference.IEDMService, System.ServiceModel.IClientChannel - End Interface - - _ - Partial Public Class EDMServiceClient - Inherits System.ServiceModel.ClientBase(Of EDMIServiceReference.IEDMService) - Implements EDMIServiceReference.IEDMService - - Public Sub New() - MyBase.New - End Sub - - Public Sub New(ByVal endpointConfigurationName As String) - MyBase.New(endpointConfigurationName) - End Sub - - Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As String) - MyBase.New(endpointConfigurationName, remoteAddress) - End Sub - - Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As System.ServiceModel.EndpointAddress) - MyBase.New(endpointConfigurationName, remoteAddress) - End Sub - - Public Sub New(ByVal binding As System.ServiceModel.Channels.Binding, ByVal remoteAddress As System.ServiceModel.EndpointAddress) - MyBase.New(binding, remoteAddress) - End Sub - - Public Function Heartbeat() As Boolean Implements EDMIServiceReference.IEDMService.Heartbeat - Return MyBase.Channel.Heartbeat - End Function - - Public Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) Implements EDMIServiceReference.IEDMService.HeartbeatAsync - Return MyBase.Channel.HeartbeatAsync - End Function - - Public Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String Implements EDMIServiceReference.IEDMService.CreateDatabaseRequest - Return MyBase.Channel.CreateDatabaseRequest(Name, Debug) - End Function - - Public Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMService.CreateDatabaseRequestAsync - Return MyBase.Channel.CreateDatabaseRequestAsync(Name, Debug) - End Function - - Public Sub CloseDatabaseRequest() Implements EDMIServiceReference.IEDMService.CloseDatabaseRequest - MyBase.Channel.CloseDatabaseRequest - End Sub - - Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements EDMIServiceReference.IEDMService.CloseDatabaseRequestAsync - Return MyBase.Channel.CloseDatabaseRequestAsync - End Function - - Public Function ReturnDatatable(ByVal SQL As String) As EDMIServiceReference.TableResult Implements EDMIServiceReference.IEDMService.ReturnDatatable - Return MyBase.Channel.ReturnDatatable(SQL) - End Function - - Public Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) Implements EDMIServiceReference.IEDMService.ReturnDatatableAsync - Return MyBase.Channel.ReturnDatatableAsync(SQL) - End Function - - Public Function ReturnScalar(ByVal SQL As String) As EDMIServiceReference.ScalarResult Implements EDMIServiceReference.IEDMService.ReturnScalar - Return MyBase.Channel.ReturnScalar(SQL) - End Function - - Public Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult) Implements EDMIServiceReference.IEDMService.ReturnScalarAsync - Return MyBase.Channel.ReturnScalarAsync(SQL) - End Function - - Public Function ExecuteNonQuery(ByVal SQL As String) As EDMIServiceReference.NonQueryResult Implements EDMIServiceReference.IEDMService.ExecuteNonQuery - Return MyBase.Channel.ExecuteNonQuery(SQL) - End Function - - Public Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) Implements EDMIServiceReference.IEDMService.ExecuteNonQueryAsync - Return MyBase.Channel.ExecuteNonQueryAsync(SQL) - End Function - - Public Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMService.NewFile - Return MyBase.Channel.NewFile(FileName, Contents) - End Function - - Public Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMService.NewFileAsync - Return MyBase.Channel.NewFileAsync(FileName, Contents) - End Function - - Public Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMService.UpdateFile - Return MyBase.Channel.UpdateFile(DocObject, Contents) - End Function - - Public Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMService.UpdateFileAsync - Return MyBase.Channel.UpdateFileAsync(DocObject, Contents) - End Function - - Public Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMService.GetFile - Return MyBase.Channel.GetFile(DocObject) - End Function - - Public Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMService.GetFileAsync - Return MyBase.Channel.GetFileAsync(DocObject) - End Function - - Public Function DeleteFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As Boolean Implements EDMIServiceReference.IEDMService.DeleteFile - Return MyBase.Channel.DeleteFile(DocObject) - End Function - - Public Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) Implements EDMIServiceReference.IEDMService.DeleteFileAsync - Return MyBase.Channel.DeleteFileAsync(DocObject) - End Function - - Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMService.GetDocumentByDocumentId - Return MyBase.Channel.GetDocumentByDocumentId(DocumentId) - End Function - - Public Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMService.GetDocumentByDocumentIdAsync - Return MyBase.Channel.GetDocumentByDocumentIdAsync(DocumentId) - End Function - - Public Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMService.GetDocumentByContainerId - Return MyBase.Channel.GetDocumentByContainerId(ContainerId) - End Function - - Public Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMService.GetDocumentByContainerIdAsync - Return MyBase.Channel.GetDocumentByContainerIdAsync(ContainerId) - End Function - - Public Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult Implements EDMIServiceReference.IEDMService.NewFileIndex - Return MyBase.Channel.NewFileIndex(DocObject, Syskey, LanguageCode, Value) - End Function - - Public Function NewFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.IndexResult) Implements EDMIServiceReference.IEDMService.NewFileIndexAsync - Return MyBase.Channel.NewFileIndexAsync(DocObject, Syskey, LanguageCode, Value) - End Function - End Class -End Namespace diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.DocumentResult.datasource b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource similarity index 66% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.DocumentResult.datasource rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource index 7c84b32e..dcabd2b0 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.DocumentResult.datasource +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMIAPI.EDMIServiceReference.DocumentResult + DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.IndexResult.datasource b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource similarity index 66% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.IndexResult.datasource rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource index 00a7860a..73dd7f06 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.IndexResult.datasource +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMIAPI.EDMIServiceReference.IndexResult + DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.NonQueryResult.datasource b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource similarity index 66% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.NonQueryResult.datasource rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource index 6380297c..b7e71b2c 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.NonQueryResult.datasource +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMIAPI.EDMIServiceReference.NonQueryResult + DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.ScalarResult.datasource b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource similarity index 66% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.ScalarResult.datasource rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource index d2434d7c..3ed2b399 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.ScalarResult.datasource +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMIAPI.EDMIServiceReference.ScalarResult + DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.TableResult.datasource b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource similarity index 66% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.TableResult.datasource rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource index 54940eb0..5f67f205 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIAPI.EDMIServiceReference.TableResult.datasource +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource @@ -6,5 +6,5 @@ cause the file to be unrecognizable by the program. --> - DigitalData.Modules.EDMIAPI.EDMIServiceReference.TableResult + DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.Filesystem.xsd similarity index 100% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.Filesystem.xsd diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl new file mode 100644 index 00000000..ea56398f --- /dev/null +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.xsd b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd similarity index 90% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.xsd rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd index 2c7e8c11..e7c74fda 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.xsd +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd @@ -1,6 +1,6 @@  - - + + @@ -49,7 +49,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -180,7 +180,7 @@ - + diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService1.xsd b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd similarity index 95% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService1.xsd rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd index e60af79b..424ff5bc 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService1.xsd +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd @@ -1,5 +1,5 @@  - + diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.svcmap b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.svcmap similarity index 86% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.svcmap rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.svcmap index 7dc5a656..c1e1ecdb 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.svcmap +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.svcmap @@ -22,11 +22,11 @@ - + - + - + diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.vb b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.vb new file mode 100644 index 00000000..4b4be068 --- /dev/null +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.vb @@ -0,0 +1,524 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System +Imports System.Runtime.Serialization + +Namespace IDBServiceReference + + + Partial Public Class BaseResult + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + + + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject + + + Private ErrorMessageField As String + + + Private OKField As Boolean + + + Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData + Get + Return Me.extensionDataField + End Get + Set + Me.extensionDataField = Value + End Set + End Property + + + Public Property ErrorMessage() As String + Get + Return Me.ErrorMessageField + End Get + Set + If (Object.ReferenceEquals(Me.ErrorMessageField, Value) <> True) Then + Me.ErrorMessageField = Value + Me.RaisePropertyChanged("ErrorMessage") + End If + End Set + End Property + + + Public Property OK() As Boolean + Get + Return Me.OKField + End Get + Set + If (Me.OKField.Equals(Value) <> True) Then + Me.OKField = Value + Me.RaisePropertyChanged("OK") + End If + End Set + End Property + + Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged + + Protected Sub RaisePropertyChanged(ByVal propertyName As String) + Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent + If (Not (propertyChanged) Is Nothing) Then + propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) + End If + End Sub + End Class + + + Partial Public Class ScalarResult + Inherits IDBServiceReference.BaseResult + + + Private ScalarField As Object + + + Public Property Scalar() As Object + Get + Return Me.ScalarField + End Get + Set + If (Object.ReferenceEquals(Me.ScalarField, Value) <> True) Then + Me.ScalarField = Value + Me.RaisePropertyChanged("Scalar") + End If + End Set + End Property + End Class + + + Partial Public Class NonQueryResult + Inherits IDBServiceReference.BaseResult + End Class + + + Partial Public Class DocumentResult + Inherits IDBServiceReference.BaseResult + + Private ContentsField() As Byte + + Private DocumentField As IDBServiceReference.DocumentObject + + Private HasContentsField As Boolean + + + Public Property Contents() As Byte() + Get + Return Me.ContentsField + End Get + Set + If (Object.ReferenceEquals(Me.ContentsField, Value) <> True) Then + Me.ContentsField = Value + Me.RaisePropertyChanged("Contents") + End If + End Set + End Property + + + Public Property Document() As IDBServiceReference.DocumentObject + Get + Return Me.DocumentField + End Get + Set + If (Object.ReferenceEquals(Me.DocumentField, Value) <> True) Then + Me.DocumentField = Value + Me.RaisePropertyChanged("Document") + End If + End Set + End Property + + + Public Property HasContents() As Boolean + Get + Return Me.HasContentsField + End Get + Set + If (Me.HasContentsField.Equals(Value) <> True) Then + Me.HasContentsField = Value + Me.RaisePropertyChanged("HasContents") + End If + End Set + End Property + End Class + + + Partial Public Class IndexResult + Inherits IDBServiceReference.BaseResult + + Private IndexIdField As Long + + + Public Property IndexId() As Long + Get + Return Me.IndexIdField + End Get + Set + If (Me.IndexIdField.Equals(Value) <> True) Then + Me.IndexIdField = Value + Me.RaisePropertyChanged("IndexId") + End If + End Set + End Property + End Class + + + Partial Public Class TableResult + Inherits IDBServiceReference.BaseResult + + + Private TableField As System.Data.DataTable + + + Public Property Table() As System.Data.DataTable + Get + Return Me.TableField + End Get + Set + If (Object.ReferenceEquals(Me.TableField, Value) <> True) Then + Me.TableField = Value + Me.RaisePropertyChanged("Table") + End If + End Set + End Property + End Class + + + Partial Public Class DocumentObject + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + + + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject + + Private ContainerIdField As String + + Private DocumentIdField As Long + + Private FileNameField As String + + + Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData + Get + Return Me.extensionDataField + End Get + Set + Me.extensionDataField = Value + End Set + End Property + + + Public Property ContainerId() As String + Get + Return Me.ContainerIdField + End Get + Set + If (Object.ReferenceEquals(Me.ContainerIdField, Value) <> True) Then + Me.ContainerIdField = Value + Me.RaisePropertyChanged("ContainerId") + End If + End Set + End Property + + + Public Property DocumentId() As Long + Get + Return Me.DocumentIdField + End Get + Set + If (Me.DocumentIdField.Equals(Value) <> True) Then + Me.DocumentIdField = Value + Me.RaisePropertyChanged("DocumentId") + End If + End Set + End Property + + + Public Property FileName() As String + Get + Return Me.FileNameField + End Get + Set + If (Object.ReferenceEquals(Me.FileNameField, Value) <> True) Then + Me.FileNameField = Value + Me.RaisePropertyChanged("FileName") + End If + End Set + End Property + + Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged + + Protected Sub RaisePropertyChanged(ByVal propertyName As String) + Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent + If (Not (propertyChanged) Is Nothing) Then + propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) + End If + End Sub + End Class + + + Public Interface IIDBService + + + Function Heartbeat() As Boolean + + + Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) + + + Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String + + + Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) + + + Sub CloseDatabaseRequest() + + + Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task + + + Function ReturnDatatable(ByVal SQL As String) As IDBServiceReference.TableResult + + + Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.TableResult) + + + Function ReturnScalar(ByVal SQL As String) As IDBServiceReference.ScalarResult + + + Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.ScalarResult) + + + Function ExecuteNonQuery(ByVal SQL As String) As IDBServiceReference.NonQueryResult + + + Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.NonQueryResult) + + + Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult + + + Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) + + + Function UpdateFile(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult + + + Function UpdateFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) + + + Function GetFile(ByVal DocObject As IDBServiceReference.DocumentObject) As IDBServiceReference.DocumentResult + + + Function GetFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) + + + Function DeleteFile(ByVal DocObject As IDBServiceReference.DocumentObject) As Boolean + + + Function DeleteFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) + + + Function GetDocumentByDocumentId(ByVal DocumentId As Long) As IDBServiceReference.DocumentResult + + + Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) + + + Function GetDocumentByContainerId(ByVal ContainerId As String) As IDBServiceReference.DocumentResult + + + Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) + + + Function NewFileIndex(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As IDBServiceReference.IndexResult + + + Function NewFileIndexAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of IDBServiceReference.IndexResult) + End Interface + + + Public Interface IIDBServiceChannel + Inherits IDBServiceReference.IIDBService, System.ServiceModel.IClientChannel + End Interface + + + Partial Public Class IDBServiceClient + Inherits System.ServiceModel.ClientBase(Of IDBServiceReference.IIDBService) + Implements IDBServiceReference.IIDBService + + Public Sub New() + MyBase.New + End Sub + + Public Sub New(ByVal endpointConfigurationName As String) + MyBase.New(endpointConfigurationName) + End Sub + + Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As String) + MyBase.New(endpointConfigurationName, remoteAddress) + End Sub + + Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As System.ServiceModel.EndpointAddress) + MyBase.New(endpointConfigurationName, remoteAddress) + End Sub + + Public Sub New(ByVal binding As System.ServiceModel.Channels.Binding, ByVal remoteAddress As System.ServiceModel.EndpointAddress) + MyBase.New(binding, remoteAddress) + End Sub + + Public Function Heartbeat() As Boolean Implements IDBServiceReference.IIDBService.Heartbeat + Return MyBase.Channel.Heartbeat + End Function + + Public Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) Implements IDBServiceReference.IIDBService.HeartbeatAsync + Return MyBase.Channel.HeartbeatAsync + End Function + + Public Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String Implements IDBServiceReference.IIDBService.CreateDatabaseRequest + Return MyBase.Channel.CreateDatabaseRequest(Name, Debug) + End Function + + Public Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) Implements IDBServiceReference.IIDBService.CreateDatabaseRequestAsync + Return MyBase.Channel.CreateDatabaseRequestAsync(Name, Debug) + End Function + + Public Sub CloseDatabaseRequest() Implements IDBServiceReference.IIDBService.CloseDatabaseRequest + MyBase.Channel.CloseDatabaseRequest() + End Sub + + Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements IDBServiceReference.IIDBService.CloseDatabaseRequestAsync + Return MyBase.Channel.CloseDatabaseRequestAsync + End Function + + Public Function ReturnDatatable(ByVal SQL As String) As IDBServiceReference.TableResult Implements IDBServiceReference.IIDBService.ReturnDatatable + Return MyBase.Channel.ReturnDatatable(SQL) + End Function + + Public Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.TableResult) Implements IDBServiceReference.IIDBService.ReturnDatatableAsync + Return MyBase.Channel.ReturnDatatableAsync(SQL) + End Function + + Public Function ReturnScalar(ByVal SQL As String) As IDBServiceReference.ScalarResult Implements IDBServiceReference.IIDBService.ReturnScalar + Return MyBase.Channel.ReturnScalar(SQL) + End Function + + Public Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.ScalarResult) Implements IDBServiceReference.IIDBService.ReturnScalarAsync + Return MyBase.Channel.ReturnScalarAsync(SQL) + End Function + + Public Function ExecuteNonQuery(ByVal SQL As String) As IDBServiceReference.NonQueryResult Implements IDBServiceReference.IIDBService.ExecuteNonQuery + Return MyBase.Channel.ExecuteNonQuery(SQL) + End Function + + Public Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.NonQueryResult) Implements IDBServiceReference.IIDBService.ExecuteNonQueryAsync + Return MyBase.Channel.ExecuteNonQueryAsync(SQL) + End Function + + Public Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.NewFile + Return MyBase.Channel.NewFile(FileName, Contents) + End Function + + Public Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.NewFileAsync + Return MyBase.Channel.NewFileAsync(FileName, Contents) + End Function + + Public Function UpdateFile(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.UpdateFile + Return MyBase.Channel.UpdateFile(DocObject, Contents) + End Function + + Public Function UpdateFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.UpdateFileAsync + Return MyBase.Channel.UpdateFileAsync(DocObject, Contents) + End Function + + Public Function GetFile(ByVal DocObject As IDBServiceReference.DocumentObject) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetFile + Return MyBase.Channel.GetFile(DocObject) + End Function + + Public Function GetFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetFileAsync + Return MyBase.Channel.GetFileAsync(DocObject) + End Function + + Public Function DeleteFile(ByVal DocObject As IDBServiceReference.DocumentObject) As Boolean Implements IDBServiceReference.IIDBService.DeleteFile + Return MyBase.Channel.DeleteFile(DocObject) + End Function + + Public Function DeleteFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) Implements IDBServiceReference.IIDBService.DeleteFileAsync + Return MyBase.Channel.DeleteFileAsync(DocObject) + End Function + + Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetDocumentByDocumentId + Return MyBase.Channel.GetDocumentByDocumentId(DocumentId) + End Function + + Public Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetDocumentByDocumentIdAsync + Return MyBase.Channel.GetDocumentByDocumentIdAsync(DocumentId) + End Function + + Public Function GetDocumentByContainerId(ByVal ContainerId As String) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetDocumentByContainerId + Return MyBase.Channel.GetDocumentByContainerId(ContainerId) + End Function + + Public Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetDocumentByContainerIdAsync + Return MyBase.Channel.GetDocumentByContainerIdAsync(ContainerId) + End Function + + Public Function NewFileIndex(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As IDBServiceReference.IndexResult Implements IDBServiceReference.IIDBService.NewFileIndex + Return MyBase.Channel.NewFileIndex(DocObject, Syskey, LanguageCode, Value) + End Function + + Public Function NewFileIndexAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of IDBServiceReference.IndexResult) Implements IDBServiceReference.IIDBService.NewFileIndexAsync + Return MyBase.Channel.NewFileIndexAsync(DocObject, Syskey, LanguageCode, Value) + End Function + End Class +End Namespace diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/System.Data.xsd b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/System.Data.xsd similarity index 100% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/System.Data.xsd rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/System.Data.xsd diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/System.xsd b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/System.xsd similarity index 100% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/System.xsd rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/System.xsd diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/configuration.svcinfo b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/configuration.svcinfo similarity index 56% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/configuration.svcinfo rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/configuration.svcinfo index 58ccbec4..a6d3d6aa 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/configuration.svcinfo +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/configuration.svcinfo @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/configuration91.svcinfo b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/configuration91.svcinfo similarity index 98% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/configuration91.svcinfo rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/configuration91.svcinfo index de0da329..4f58cb92 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/configuration91.svcinfo +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/configuration91.svcinfo @@ -1,5 +1,5 @@ - + @@ -121,7 +121,7 @@ - + net.tcp://localhost:9000/DigitalData/Services/Main @@ -136,7 +136,7 @@ tcpBinding - EDMIServiceReference.IEDMService + IDBServiceReference.IIDBService System.ServiceModel.Configuration.AddressHeaderCollectionElement diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/service.wsdl b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/service.wsdl similarity index 85% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/service.wsdl rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/service.wsdl index 1d9e9dda..9883cd39 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/service.wsdl +++ b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/service.wsdl @@ -1,5 +1,5 @@  - + @@ -33,14 +33,14 @@ - + - + - + @@ -49,7 +49,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -157,7 +157,7 @@ - + diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/service.xsd b/EDMI_FILE_OPs/Connected Services/IDBServiceReference/service.xsd similarity index 100% rename from EDMI_FILE_OPs/Connected Services/EDMIServiceReference/service.xsd rename to EDMI_FILE_OPs/Connected Services/IDBServiceReference/service.xsd diff --git a/EDMI_FILE_OPs/Document.vb b/EDMI_FILE_OPs/Document.vb index c0bb55e4..d5363bcb 100644 --- a/EDMI_FILE_OPs/Document.vb +++ b/EDMI_FILE_OPs/Document.vb @@ -1,13 +1,14 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference +Imports DigitalData.Modules.EDMIAPI.IDBServiceReference Imports System.ServiceModel Imports System.IO Public Class Document Private _logger As Logger Private _logConfig As LogConfig - Private _channelFactory As ChannelFactory(Of IEDMServiceChannel) - Private _channel As IEDMServiceChannel + Private _channelFactory As ChannelFactory(Of IIDBServiceChannel) + Private _channel As IIDBServiceChannel ''' ''' Creates a new EDMIAPI object @@ -21,7 +22,7 @@ Public Class Document Try Dim oBinding = Channel.GetBinding() Dim oAddress = New EndpointAddress(ServiceAdress) - Dim oFactory = New ChannelFactory(Of IEDMServiceChannel)(oBinding, oAddress) + Dim oFactory = New ChannelFactory(Of IIDBServiceChannel)(oBinding, oAddress) _channelFactory = oFactory Catch ex As Exception @@ -147,7 +148,7 @@ Public Class Document ''' Creates a channel and adds a Faulted-Handler ''' ''' A channel object - Private Function GetChannel() As IEDMServiceChannel + Private Function GetChannel() As IIDBServiceChannel Try _logger.Debug("Creating channel..") Dim oChannel = _channelFactory.CreateChannel() diff --git a/EDMI_FILE_OPs/EDMIAPI.vbproj b/EDMI_FILE_OPs/EDMIAPI.vbproj index 262e4784..79a8574c 100644 --- a/EDMI_FILE_OPs/EDMIAPI.vbproj +++ b/EDMI_FILE_OPs/EDMIAPI.vbproj @@ -73,7 +73,7 @@ - + True True Reference.svcmap @@ -106,39 +106,39 @@ - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Designer - - + + Designer - + Designer - - + + Designer - + Designer - + Designer @@ -156,16 +156,16 @@ - + - + - + - + WCF Proxy Generator Reference.vb diff --git a/EDMI_FILE_OPs/app.config b/EDMI_FILE_OPs/app.config index a3784cbd..d3b30754 100644 --- a/EDMI_FILE_OPs/app.config +++ b/EDMI_FILE_OPs/app.config @@ -31,7 +31,7 @@ + contract="IDBServiceReference.IIDBService" name="tcpBinding"> diff --git a/GUIs.ClientSuite/App.config b/GUIs.ClientSuite/App.config index c6126768..3a3f427a 100644 --- a/GUIs.ClientSuite/App.config +++ b/GUIs.ClientSuite/App.config @@ -7,7 +7,6 @@
-
@@ -30,7 +29,7 @@ - + net.tcp://172.24.12.67:9000/DigitalData/Services/Main @@ -85,11 +84,6 @@ - - - - - diff --git a/GUIs.ClientSuite/ClassService.vb b/GUIs.ClientSuite/ClassService.vb index 2d353f5d..f93921e8 100644 --- a/GUIs.ClientSuite/ClassService.vb +++ b/GUIs.ClientSuite/ClassService.vb @@ -1,7 +1,7 @@ Imports System.ServiceModel Imports System.ServiceModel.Channels Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference +Imports DigitalData.Modules.EDMIAPI.IDBServiceReference Imports DigitalData.GUIs.ClientSuite.Base Public Class ClassService @@ -67,15 +67,15 @@ Public Class ClassService End Function) End Function - Public Function GetChannelFactory() As IChannelFactory(Of IEDMServiceChannel) + Public Function GetChannelFactory() As IChannelFactory(Of IIDBServiceChannel) Return GetChannelFactory(My.SysConfig.ServiceConnection) End Function - Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IEDMServiceChannel) + Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IIDBServiceChannel) Dim oBinding = GetBinding() Dim oEndpoint = New EndpointAddress(EndpointURL) - Dim oFactory As New ChannelFactory(Of IEDMServiceChannel)(oBinding, oEndpoint) + Dim oFactory As New ChannelFactory(Of IIDBServiceChannel)(oBinding, oEndpoint) Return oFactory End Function diff --git a/GUIs.ClientSuite/ClassTimer.vb b/GUIs.ClientSuite/ClassTimer.vb index 18da52d0..48d2d61f 100644 --- a/GUIs.ClientSuite/ClassTimer.vb +++ b/GUIs.ClientSuite/ClassTimer.vb @@ -2,7 +2,7 @@ Imports System.Threading Imports System.Timers Imports DigitalData.GUIs.ClientSuite.Base -Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference +Imports DigitalData.Modules.EDMIAPI.IDBServiceReference Imports DigitalData.Modules.Logging Public Class ClassTimer @@ -12,7 +12,7 @@ Public Class ClassTimer Private _LogConfig As LogConfig Private _Logger As Logger Private _Timer As Timers.Timer - Private _Channel As IEDMServiceChannel + Private _Channel As IIDBServiceChannel Public Event OnlineChanged As OnlineChangedEventHandler Public Delegate Sub OnlineChangedEventHandler(sender As Object, Online As Boolean) diff --git a/GUIs.ClientSuite/ClientSuite.vbproj b/GUIs.ClientSuite/ClientSuite.vbproj index b7851db2..6f126011 100644 --- a/GUIs.ClientSuite/ClientSuite.vbproj +++ b/GUIs.ClientSuite/ClientSuite.vbproj @@ -469,9 +469,9 @@ {903b2d7d-3b80-4be9-8713-7447b704e1b0} Logging - + {A8C3F298-76AB-4359-AB3C-986E313B4336} - DDEDMService + IDBService diff --git a/GUIs.ClientSuite/Common/ClassCommonCommands.vb b/GUIs.ClientSuite/Common/ClassCommonCommands.vb index cfdc100f..9d7a095a 100644 --- a/GUIs.ClientSuite/Common/ClassCommonCommands.vb +++ b/GUIs.ClientSuite/Common/ClassCommonCommands.vb @@ -1,5 +1,5 @@ Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference +Imports DigitalData.Modules.EDMIAPI.IDBServiceReference Public Class ClassCommonCommands Private _LogConfig As LogConfig @@ -10,9 +10,9 @@ Public Class ClassCommonCommands _Logger = LogConfig.GetLogger() End Sub - Public Async Function FNICM_RADM_NEW_USER2GROUP(UserId As Integer, GroupId As Integer) As Task(Of Integer) + Public Async Function FNIDB_RADM_NEW_USER2GROUP(UserId As Integer, GroupId As Integer) As Task(Of Integer) Try - Dim oSQL = $"SELECT FNICM_RADM_NEW_USER2GROUP({UserId},{GroupId}, '{Environment.UserName}') FROM RDB$DATABASE;" + Dim oSQL = $"SELECT FNIDB_RADM_NEW_USER2GROUP({UserId},{GroupId}, '{Environment.UserName}') FROM RDB$DATABASE;" Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"Add User To Group", False) Dim oResult = Await My.Channel.ReturnScalarAsync(oSQL) @@ -29,9 +29,9 @@ Public Class ClassCommonCommands End Try End Function - Public Async Function FNICM_RADM_NEW_GROUP2GROUP(ParentGroupId As Integer, GroupId As Integer) As Task(Of Integer) + Public Async Function FNIDB_RADM_NEW_GROUP2GROUP(ParentGroupId As Integer, GroupId As Integer) As Task(Of Integer) Try - Dim oSQL = $"SELECT FNICM_RADM_NEW_GROUP2GROUP({GroupId},{ParentGroupId}, '{Environment.UserName}') FROM RDB$DATABASE;" + Dim oSQL = $"SELECT FNIDB_RADM_NEW_GROUP2GROUP({GroupId},{ParentGroupId}, '{Environment.UserName}') FROM RDB$DATABASE;" Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"Add Group To Group", False) Dim oRecordIds As New List(Of Integer) @@ -49,9 +49,9 @@ Public Class ClassCommonCommands End Try End Function - Public Async Function FNICM_DELETE_RECORD_FINALLY(RecordId As Integer) As Task(Of Boolean) + Public Async Function FNIDB_DELETE_RECORD_FINALLY(RecordId As Integer) As Task(Of Boolean) Try - Dim oSQL = $"SELECT FNICM_DELETE_RECORD_FINALLY({RecordId},'{Environment.UserName}') FROM RDB$DATABASE;" + Dim oSQL = $"SELECT FNIDB_DELETE_RECORD_FINALLY({RecordId},'{Environment.UserName}') FROM RDB$DATABASE;" Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"Delete Record", False) Dim oResult = Await My.Channel.ReturnScalarAsync(oSQL) @@ -64,9 +64,9 @@ Public Class ClassCommonCommands End Try End Function - Public Async Function FNICM_NEW_DOC_VALUE(DocumentId As Int64, Syskey As String, LanguageKey As String, Value As String) As Task(Of ScalarResult) + Public Async Function FNIDB_NEW_DOC_VALUE(DocumentId As Int64, Syskey As String, LanguageKey As String, Value As String) As Task(Of ScalarResult) Try - Dim oSQL = $"SELECT FNICM_NEW_DOC_VALUE({DocumentId}, '{Syskey}', '{LanguageKey}', '{My.Application.User.UserName}', '{Value}') FROM RDB$DATABASE;" + Dim oSQL = $"SELECT FNIDB_NEW_DOC_VALUE({DocumentId}, '{Syskey}', '{LanguageKey}', '{My.Application.User.UserName}', '{Value}') FROM RDB$DATABASE;" Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"Delete Record", False) Dim oResult = Await My.Channel.ReturnScalarAsync(oSQL) diff --git a/GUIs.ClientSuite/Common/ClassCommonViews.vb b/GUIs.ClientSuite/Common/ClassCommonViews.vb index 6e09d655..287a1b80 100644 --- a/GUIs.ClientSuite/Common/ClassCommonViews.vb +++ b/GUIs.ClientSuite/Common/ClassCommonViews.vb @@ -9,11 +9,11 @@ Public Class ClassCommonViews _Logger = LogConfig.GetLogger() End Sub - Public Async Function VWICM_FORM_CONTROL(FormId As Int64) As Task(Of DataTable) + Public Async Function VWIDB_FORM_CONTROL(FormId As Int64) As Task(Of DataTable) Try My.Channel.CreateDatabaseRequest("Load Controls", True) - Dim oSQL As String = $"SELECT * FROM VWICM_FORMCONTROL WHERE FORMID = {FormId}" + Dim oSQL As String = $"SELECT * FROM VWIDB_FORMCONTROL WHERE FORMID = {FormId}" Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL) Dim oTable = oResult.Table @@ -31,11 +31,11 @@ Public Class ClassCommonViews End Try End Function - Public Async Function VWICM_WF_REQUESTCONTROLDATA(FormId As Int64, RequestId As Int64) As Task(Of DataTable) + Public Async Function VWIDB_WF_REQUESTCONTROLDATA(FormId As Int64, RequestId As Int64) As Task(Of DataTable) Try My.Channel.CreateDatabaseRequest("Load Control Data", True) - Dim oSQL As String = $"SELECT * FROM VWICM_WF_REQUESTCONTROLDATA WHERE FORMID = {FormId} AND REQUESTID = {RequestId}" + Dim oSQL As String = $"SELECT * FROM VWIDB_WF_REQUESTCONTROLDATA WHERE FORMID = {FormId} AND REQUESTID = {RequestId}" Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL) Dim oTable = oResult.Table diff --git a/GUIs.ClientSuite/FormDesigner/frmFormDesigner.vb b/GUIs.ClientSuite/FormDesigner/frmFormDesigner.vb index 26b70dad..475cd49c 100644 --- a/GUIs.ClientSuite/FormDesigner/frmFormDesigner.vb +++ b/GUIs.ClientSuite/FormDesigner/frmFormDesigner.vb @@ -109,7 +109,7 @@ Public Class frmFormDesigner _ControlLoader = New ControlLoader(My.LogConfig, LayoutControlGroupMain) - Dim oTable = Await My.Common.Views.VWICM_FORM_CONTROL(_FormId) + Dim oTable = Await My.Common.Views.VWIDB_FORM_CONTROL(_FormId) _ControlLoader.LoadControls(oTable) End Sub diff --git a/GUIs.ClientSuite/FormUserManager/frmUserManager.vb b/GUIs.ClientSuite/FormUserManager/frmUserManager.vb index 38ee7d01..1eed2de2 100644 --- a/GUIs.ClientSuite/FormUserManager/frmUserManager.vb +++ b/GUIs.ClientSuite/FormUserManager/frmUserManager.vb @@ -83,32 +83,32 @@ Public Class frmUserManager End Function Private Async Sub HandleUserAddedToGroup(GroupId As Integer, UserId As Integer, RelationRecordId As Integer) - Dim oRecordId = Await My.Common.Commands.FNICM_RADM_NEW_USER2GROUP(UserId, GroupId) + Dim oRecordId = Await My.Common.Commands.FNIDB_RADM_NEW_USER2GROUP(UserId, GroupId) Await UpdateDataAsync() End Sub Private Async Sub HandleUserRemovedFromGroup(GroupId As Integer, UserId As Integer, RelationRecordId As Integer) - Dim oResult = Await My.Common.Commands.FNICM_DELETE_RECORD_FINALLY(RelationRecordId) + Dim oResult = Await My.Common.Commands.FNIDB_DELETE_RECORD_FINALLY(RelationRecordId) Await UpdateDataAsync() End Sub Private Async Sub HandleGroupAddedToGroup(ParentGroupId As Integer, GroupId As Integer, RelationRecordId As Integer) - Dim oRecordId = Await My.Common.Commands.FNICM_RADM_NEW_GROUP2GROUP(GroupId, ParentGroupId) + Dim oRecordId = Await My.Common.Commands.FNIDB_RADM_NEW_GROUP2GROUP(GroupId, ParentGroupId) Await UpdateDataAsync() End Sub Private Async Sub HandleGroupRemovedFromGroup(ParentGroupId As Integer, GroupId As Integer, RelationRecordId As Integer) - Dim oResult = Await My.Common.Commands.FNICM_DELETE_RECORD_FINALLY(RelationRecordId) + Dim oResult = Await My.Common.Commands.FNIDB_DELETE_RECORD_FINALLY(RelationRecordId) Await UpdateDataAsync() End Sub Private Async Function GetAttributeListAsync(AttributeName As String) As Task(Of DataTable) Try - Dim oSQL = $"SELECT * FROM VWICM_{AttributeName.ToUpper}" + Dim oSQL = $"SELECT * FROM VWIDB_{AttributeName.ToUpper}" Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"List Attribute {AttributeName}", False) Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL) diff --git a/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb b/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb index 6cdf14f1..93199613 100644 --- a/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb +++ b/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb @@ -25,7 +25,7 @@ Public Class frmWorkflowStep Private Async Function GetRequestData(RequestId) As Task Await My.Channel.CreateDatabaseRequestAsync("Get Request Data", True) - Dim oResult = Await My.Channel.ReturnDatatableAsync($"SELECT PROCESS_NAME, TITLE, FORM_ID FROM VWICM_WF_REQUEST WHERE RECORD_ID = {RequestId}") + Dim oResult = Await My.Channel.ReturnDatatableAsync($"SELECT PROCESS_NAME, TITLE, FORM_ID FROM VWIDB_WF_REQUEST WHERE RECORD_ID = {RequestId}") If Not oResult.OK Then Throw New ApplicationException("Request data could not be fetched!") @@ -49,8 +49,8 @@ Public Class frmWorkflowStep Private Async Sub frmWorkflowStep_Load(sender As Object, e As EventArgs) Handles MyBase.Load Await GetRequestData(_RequestId) - Dim oControlTable = Await My.Common.Views.VWICM_FORM_CONTROL(_FormId) - Dim oControlData = Await My.Common.Views.VWICM_WF_REQUESTCONTROLDATA(_FormId, _RequestId) + Dim oControlTable = Await My.Common.Views.VWIDB_FORM_CONTROL(_FormId) + Dim oControlData = Await My.Common.Views.VWIDB_WF_REQUESTCONTROLDATA(_FormId, _RequestId) _HeaderGroup = LayoutControlGroupMain.AddGroup("Request Header") _BodyGroup = LayoutControlGroupMain.AddGroup("Control Body") diff --git a/GUIs.ClientSuite/My Project/Settings.Designer.vb b/GUIs.ClientSuite/My Project/Settings.Designer.vb index cfc02179..f955693d 100644 --- a/GUIs.ClientSuite/My Project/Settings.Designer.vb +++ b/GUIs.ClientSuite/My Project/Settings.Designer.vb @@ -57,23 +57,11 @@ Namespace My _ - Public ReadOnly Property EDM_NetworkService_Adress() As String + Public ReadOnly Property IDBNetworkServiceAddress() As String Get - Return CType(Me("EDM_NetworkService_Adress"),String) + Return CType(Me("IDBNetworkServiceAddress"),String) End Get End Property - - _ - Public Property ICMServiceAddress() As String - Get - Return CType(Me("ICMServiceAddress"),String) - End Get - Set - Me("ICMServiceAddress") = value - End Set - End Property End Class End Namespace diff --git a/GUIs.ClientSuite/My Project/Settings.settings b/GUIs.ClientSuite/My Project/Settings.settings index feab57fd..c0bbbcba 100644 --- a/GUIs.ClientSuite/My Project/Settings.settings +++ b/GUIs.ClientSuite/My Project/Settings.settings @@ -2,11 +2,8 @@ - + net.tcp://172.24.12.67:9000/DigitalData/Services/Main - - - \ No newline at end of file diff --git a/GUIs.ClientSuite/MyApplication.vb b/GUIs.ClientSuite/MyApplication.vb index bb071cae..03edb16c 100644 --- a/GUIs.ClientSuite/MyApplication.vb +++ b/GUIs.ClientSuite/MyApplication.vb @@ -2,7 +2,7 @@ Imports System.Threading Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference +Imports DigitalData.Modules.EDMIAPI.IDBServiceReference Namespace My ''' @@ -26,8 +26,8 @@ Namespace My End Property Property LogConfig As LogConfig - Property ChannelFactory As ChannelFactory(Of IEDMServiceChannel) - Property Channel As IEDMServiceChannel + Property ChannelFactory As ChannelFactory(Of IIDBServiceChannel) + Property Channel As IIDBServiceChannel Property MainForm As frmMain Property Common As ClassCommon End Module diff --git a/GUIs.ClientSuite/_TEST/frmDocTest.vb b/GUIs.ClientSuite/_TEST/frmDocTest.vb index e2fb3014..f94b8533 100644 --- a/GUIs.ClientSuite/_TEST/frmDocTest.vb +++ b/GUIs.ClientSuite/_TEST/frmDocTest.vb @@ -8,7 +8,7 @@ Public Class frmDocTest ProcessContainer(AddressOf GridControlDefaults.DefaultGridSettings). ProcessContainer(AddressOf GridControlDefaults.ReadOnlyGridSettings) - Dim oSQL = "SELECT * FROM VWICM_DOC_METADATA_DE" + Dim oSQL = "SELECT * FROM VWIDB_DOC_METADATA_DE" My.Channel.CreateDatabaseRequest("Load Doc Values", True) Dim oResult = My.Channel.ReturnDatatable(oSQL) @@ -35,7 +35,7 @@ Public Class frmDocTest Dim oDocId As Int64 = Int64.Parse(txtDocId.Text) Dim oValue As String = txtDoctype.Text Dim oSyskey As String = "001-DOCTYPE" - Dim oResult = Await My.Common.Commands.FNICM_NEW_DOC_VALUE(oDocId, oSyskey, My.Application.User.Language, oValue) + Dim oResult = Await My.Common.Commands.FNIDB_NEW_DOC_VALUE(oDocId, oSyskey, My.Application.User.Language, oValue) If Not oResult.OK Then MsgBox(oResult.ErrorMessage) diff --git a/GUIs.ClientSuite/_TEST/frmFileTest.vb b/GUIs.ClientSuite/_TEST/frmFileTest.vb index 41c1a49c..bf3a90ec 100644 --- a/GUIs.ClientSuite/_TEST/frmFileTest.vb +++ b/GUIs.ClientSuite/_TEST/frmFileTest.vb @@ -8,7 +8,7 @@ Public Class frmFileTest Private Sub frmFileTest_Load(sender As Object, e As EventArgs) Handles Me.Load Try - _fileOp = New Document(My.LogConfig, My.Settings.EDM_NetworkService_Adress) + _fileOp = New Document(My.LogConfig, My.Settings.IDBNetworkServiceAddress) _fileOp.Connect() Catch ex As Exception Logger.Warn($"Unexpected error in frmFileTest_Load: {ex.Message}") diff --git a/GUIs.ClientSuite/frmHome.vb b/GUIs.ClientSuite/frmHome.vb index 981de050..62bde727 100644 --- a/GUIs.ClientSuite/frmHome.vb +++ b/GUIs.ClientSuite/frmHome.vb @@ -14,7 +14,7 @@ Public Class frmHome oTreeListPatcher. ProcessContainer(AddressOf TreeListDefaults.DefaultTreeListSettings) - Dim oSQL As String = "SELECT * FROM VWICM_DOC_METADATA_DE;" + Dim oSQL As String = "SELECT * FROM VWIDB_DOC_METADATA_DE;" My.Channel.CreateDatabaseRequest("Doc Metadata", True) Dim oTable = My.Channel.ReturnDatatable(oSQL) My.Channel.CloseDatabaseRequest() diff --git a/GUIs.ClientSuite/frmObjectEditor.vb b/GUIs.ClientSuite/frmObjectEditor.vb index b0c4f3f3..844ede3c 100644 --- a/GUIs.ClientSuite/frmObjectEditor.vb +++ b/GUIs.ClientSuite/frmObjectEditor.vb @@ -102,7 +102,7 @@ Public Class frmObjectEditor Private Async Function LoadLanguageTableAsync(UserLanguage As String) As Task Try - Dim oSQL = $"SELECT * FROM VWICM_ATTRIBUTE_LANGUAGE WHERE LANGUAGE_CODE = '{UserLanguage}' AND PARENT_ATTRIBUTE_ID = '{_AttributeId}' ORDER BY ""SEQUENCE"";" + Dim oSQL = $"SELECT * FROM VWIDB_ATTRIBUTE_LANGUAGE WHERE LANGUAGE_CODE = '{UserLanguage}' AND PARENT_ATTRIBUTE_ID = '{_AttributeId}' ORDER BY ""SEQUENCE"";" Await My.Channel.CreateDatabaseRequestAsync("Language Syskey", False) Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL) @@ -190,7 +190,7 @@ Public Class frmObjectEditor Private Sub LoadDetailForm() ' Counter is used to match SEQUENCE in Attributes - ' to column order in the used View (eg. VWICM_USER) + ' to column order in the used View (eg. VWIDB_USER) Dim oCounter = 0 For Each oColumn As DataColumn In _Datatable.Columns diff --git a/GUIs.ClientSuite/frmSearch.vb b/GUIs.ClientSuite/frmSearch.vb index 9086accc..7aaac623 100644 --- a/GUIs.ClientSuite/frmSearch.vb +++ b/GUIs.ClientSuite/frmSearch.vb @@ -20,7 +20,7 @@ Public Class frmSearch Dim oData As DataTable My.Channel.CreateDatabaseRequest("Get Users", False) - oData = My.Channel.ReturnDatatable("SELECT * FROM VWICM_USER").Table + oData = My.Channel.ReturnDatatable("SELECT * FROM VWIDB_USER").Table My.Channel.CloseDatabaseRequest() oList.Add(New PanelInfo(oPanel, DockingStyle.Bottom, oData) With { diff --git a/GUIs.ClientSuite/frmSplash.vb b/GUIs.ClientSuite/frmSplash.vb index 4b59fbcd..62e1631c 100644 --- a/GUIs.ClientSuite/frmSplash.vb +++ b/GUIs.ClientSuite/frmSplash.vb @@ -2,12 +2,12 @@ Imports System.ServiceModel Imports System.Threading Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference +Imports DigitalData.Modules.EDMIAPI.IDBServiceReference Public NotInheritable Class frmSplash Private _Worker As New BackgroundWorker() - Private _ChannelFactory As ChannelFactory(Of IEDMServiceChannel) - Private _Channel As IEDMServiceChannel + Private _ChannelFactory As ChannelFactory(Of IIDBServiceChannel) + Private _Channel As IIDBServiceChannel Private _Logger As Logger Private _CurrentRetry As Integer = 0 @@ -98,12 +98,12 @@ Public NotInheritable Class frmSplash Thread.Sleep(SLEEP_TIME) End Sub - Private Sub bw_ProgressChanged(sender As Object, e As System.ComponentModel.ProgressChangedEventArgs) + Private Sub bw_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) pbStatus.Value = e.ProgressPercentage lblStatus.Text = e.UserState.ToString() End Sub - Private Sub bw_RunWorkerCompleted(sender As Object, e As System.ComponentModel.RunWorkerCompletedEventArgs) + Private Sub bw_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) ' Bei Fehler MsgBox anzeigen und Programm beenden If e.Error IsNot Nothing Then MsgBox(e.Error.Message, MsgBoxStyle.Critical, "Unhandled Error") diff --git a/SERVICES/DDEDM_NetworkService/App.config b/SERVICES/DDEDM_NetworkService/App.config index a1581da4..bcf47c3c 100644 --- a/SERVICES/DDEDM_NetworkService/App.config +++ b/SERVICES/DDEDM_NetworkService/App.config @@ -44,13 +44,15 @@ - - + + - + diff --git a/SERVICES/DDEDM_NetworkService/EDMService.vb b/SERVICES/DDEDM_NetworkService/IDBService.vb similarity index 90% rename from SERVICES/DDEDM_NetworkService/EDMService.vb rename to SERVICES/DDEDM_NetworkService/IDBService.vb index 7863b874..46828878 100644 --- a/SERVICES/DDEDM_NetworkService/EDMService.vb +++ b/SERVICES/DDEDM_NetworkService/IDBService.vb @@ -3,11 +3,10 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Filesystem Imports System.IO -Imports DigitalData.Services.EDMService -Public Class EDMService - Implements IEDMService +Public Class IDBService + Implements IIDBService Public Shared LogConfig As LogConfig Public Shared Database As Firebird @@ -31,7 +30,7 @@ Public Class EDMService #Region "Auth" Private Function TestUserAuth() As Boolean Try - Dim oSQL As String = $"SELECT FNICM_AUTH_USER('{_username}') FROM RDB$DATABASE;" + Dim oSQL As String = $"SELECT FNIDB_AUTH_USER('{_username}') FROM RDB$DATABASE;" Dim oResult As Boolean = Database.GetScalarValue(oSQL) Return oResult @@ -43,7 +42,7 @@ Public Class EDMService #End Region #Region "Heartbeat" - Public Function Heartbeat() As Boolean Implements IEDMService.Heartbeat + Public Function Heartbeat() As Boolean Implements IIDBService.Heartbeat Return True End Function #End Region @@ -55,13 +54,13 @@ Public Class EDMService _logger.Info("Creating request {0}/{1}", _request.Name, _request.RequestId) End Sub - Public Function CreateDatabaseRequest(Name As String, Optional Debug As Boolean = False) As String Implements IEDMService.CreateDatabaseRequest + Public Function CreateDatabaseRequest(Name As String, Optional Debug As Boolean = False) As String Implements IIDBService.CreateDatabaseRequest CreateRequest(Name, Debug) Return _request.Name End Function - Public Sub CloseDatabaseRequest() Implements IEDMService.CloseDatabaseRequest + Public Sub CloseDatabaseRequest() Implements IIDBService.CloseDatabaseRequest If IsNothing(_request) Then Exit Sub End If @@ -79,7 +78,7 @@ Public Class EDMService End If End Sub - Public Function ReturnDatatable(SQL As String) As TableResult Implements IEDMService.ReturnDatatable + Public Function ReturnDatatable(SQL As String) As TableResult Implements IIDBService.ReturnDatatable Try TestRequestCreated() @@ -95,7 +94,7 @@ Public Class EDMService End Try End Function - Public Function ReturnScalar(SQL As String) As ScalarResult Implements IEDMService.ReturnScalar + Public Function ReturnScalar(SQL As String) As ScalarResult Implements IIDBService.ReturnScalar Try TestRequestCreated() @@ -111,7 +110,7 @@ Public Class EDMService End Try End Function - Public Function ExecuteNonQuery(SQL As String) As NonQueryResult Implements IEDMService.ExecuteNonQuery + Public Function ExecuteNonQuery(SQL As String) As NonQueryResult Implements IIDBService.ExecuteNonQuery Try TestRequestCreated() @@ -130,7 +129,7 @@ Public Class EDMService #End Region #Region "Document" - Public Function NewFile(FileName As String, Contents() As Byte) As DocumentResult Implements IEDMService.NewFile + Public Function NewFile(FileName As String, Contents() As Byte) As DocumentResult Implements IIDBService.NewFile Try Dim oContainer As FileContainer Dim oContainerId As String @@ -169,7 +168,7 @@ Public Class EDMService End Try End Function - Public Function UpdateFile(DocObject As DocumentObject, Contents() As Byte) As DocumentResult Implements IEDMService.UpdateFile + Public Function UpdateFile(DocObject As DocumentObject, Contents() As Byte) As DocumentResult Implements IIDBService.UpdateFile Try TestFileExists(DocObject.ContainerId) @@ -189,7 +188,7 @@ Public Class EDMService End Try End Function - Public Function GetFile(DocObject As DocumentObject) As DocumentResult Implements IEDMService.GetFile + Public Function GetFile(DocObject As DocumentObject) As DocumentResult Implements IIDBService.GetFile Try TestFileExists(DocObject.ContainerId) @@ -204,7 +203,7 @@ Public Class EDMService End Try End Function - Public Function DeleteFile(DocObject As DocumentObject) As Boolean Implements IEDMService.DeleteFile + Public Function DeleteFile(DocObject As DocumentObject) As Boolean Implements IIDBService.DeleteFile Try TestFileExists(DocObject.ContainerId) @@ -238,9 +237,9 @@ Public Class EDMService #End Region #Region "Utils" - Public Function GetDocumentByDocumentId(DocumentId As Long) As DocumentResult Implements IEDMService.GetDocumentByDocumentId + Public Function GetDocumentByDocumentId(DocumentId As Long) As DocumentResult Implements IIDBService.GetDocumentByDocumentId Try - Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBICM_DOCUMENT WHERE GUID = {DocumentId}" + Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE GUID = {DocumentId}" Dim oTable = Database.GetDatatable(oSQL) If oTable.Rows.Count = 0 Then @@ -266,9 +265,9 @@ Public Class EDMService End Try End Function - Public Function GetDocumentByContainerId(ContainerId As String) As DocumentResult Implements IEDMService.GetDocumentByContainerId + Public Function GetDocumentByContainerId(ContainerId As String) As DocumentResult Implements IIDBService.GetDocumentByContainerId Try - Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBICM_DOCUMENT WHERE CONTAINER_ID = '{ContainerId}'" + Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE CONTAINER_ID = '{ContainerId}'" Dim oTable = Database.GetDatatable(oSQL) If oTable.Rows.Count = 0 Then @@ -296,9 +295,9 @@ Public Class EDMService #End Region #Region "Index" - Public Function NewFileIndex(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As IndexResult Implements IEDMService.NewFileIndex + Public Function NewFileIndex(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As IndexResult Implements IIDBService.NewFileIndex Try - Dim oSQL = $"SELECT FNICM_NEW_DOC_VALUE({DocObject.DocumentId},'{Syskey}','{LanguageCode}','{Value}','{_username}') FROM RDB$DATABASE;" + Dim oSQL = $"SELECT FNIDB_NEW_DOC_VALUE({DocObject.DocumentId},'{Syskey}','{LanguageCode}','{Value}','{_username}') FROM RDB$DATABASE;" Dim oIndexId As Int64 = Database.GetScalarValue(oSQL) Return New IndexResult(oIndexId) diff --git a/SERVICES/DDEDM_NetworkService/DDEDMService.vbproj b/SERVICES/DDEDM_NetworkService/IDBService.vbproj similarity index 94% rename from SERVICES/DDEDM_NetworkService/DDEDMService.vbproj rename to SERVICES/DDEDM_NetworkService/IDBService.vbproj index 4a1fe725..67e168a5 100644 --- a/SERVICES/DDEDM_NetworkService/DDEDMService.vbproj +++ b/SERVICES/DDEDM_NetworkService/IDBService.vbproj @@ -6,9 +6,9 @@ AnyCPU {A8C3F298-76AB-4359-AB3C-986E313B4336} Exe - DigitalData.Services.EDMService.WindowsService - DigitalData.Services.EDMService - EDMService + DigitalData.Services.IDBService.WindowsService + DigitalData.Services.IDBService + IDBService 512 Console v4.6.1 @@ -21,7 +21,7 @@ true true bin\Debug\ - EDMService.xml + IDBService.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -31,7 +31,7 @@ true true bin\Release\ - EDMService.xml + IDBService.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -89,12 +89,12 @@ - + Component - + True diff --git a/SERVICES/DDEDM_NetworkService/IEDMService.vb b/SERVICES/DDEDM_NetworkService/IIDBService.vb similarity index 93% rename from SERVICES/DDEDM_NetworkService/IEDMService.vb rename to SERVICES/DDEDM_NetworkService/IIDBService.vb index be7882e6..d6482826 100644 --- a/SERVICES/DDEDM_NetworkService/IEDMService.vb +++ b/SERVICES/DDEDM_NetworkService/IIDBService.vb @@ -1,8 +1,8 @@ Imports System.ServiceModel Imports DigitalData.Modules.Filesystem - -Interface IEDMService + +Interface IIDBService #Region "Heartbeat" diff --git a/SERVICES/DDEDM_NetworkService/My Project/AssemblyInfo.vb b/SERVICES/DDEDM_NetworkService/My Project/AssemblyInfo.vb index 41bda7d0..d2684566 100644 --- a/SERVICES/DDEDM_NetworkService/My Project/AssemblyInfo.vb +++ b/SERVICES/DDEDM_NetworkService/My Project/AssemblyInfo.vb @@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices ' Werte der Assemblyattribute überprüfen - + - + diff --git a/SERVICES/DDEDM_NetworkService/My Project/Resources.Designer.vb b/SERVICES/DDEDM_NetworkService/My Project/Resources.Designer.vb index d72b5069..51507018 100644 --- a/SERVICES/DDEDM_NetworkService/My Project/Resources.Designer.vb +++ b/SERVICES/DDEDM_NetworkService/My Project/Resources.Designer.vb @@ -39,7 +39,7 @@ Namespace My.Resources Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Services.EDMService.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Services.IDBService.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan diff --git a/SERVICES/DDEDM_NetworkService/My Project/Settings.Designer.vb b/SERVICES/DDEDM_NetworkService/My Project/Settings.Designer.vb index 079ac05f..7465c53a 100644 --- a/SERVICES/DDEDM_NetworkService/My Project/Settings.Designer.vb +++ b/SERVICES/DDEDM_NetworkService/My Project/Settings.Designer.vb @@ -64,9 +64,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.DigitalData.Services.EDMService.My.MySettings + Friend ReadOnly Property Settings() As Global.DigitalData.Services.IDBService.My.MySettings Get - Return Global.DigitalData.Services.EDMService.My.MySettings.Default + Return Global.DigitalData.Services.IDBService.My.MySettings.Default End Get End Property End Module diff --git a/SERVICES/DDEDM_NetworkService/SettingsModule.vb b/SERVICES/DDEDM_NetworkService/SettingsModule.vb index be327b36..a2149bf4 100644 --- a/SERVICES/DDEDM_NetworkService/SettingsModule.vb +++ b/SERVICES/DDEDM_NetworkService/SettingsModule.vb @@ -1,4 +1,4 @@ Module SettingsModule - Public Const SERVICE_NAME As String = "DDEDMSvc" - Public Const SERVICE_DISPLAY_NAME As String = "Digital Data EDM Service" + Public Const SERVICE_NAME As String = "DDIDBSvc" + Public Const SERVICE_DISPLAY_NAME As String = "Digital Data IDB Service" End Module diff --git a/SERVICES/DDEDM_NetworkService/WindowsService.vb b/SERVICES/DDEDM_NetworkService/WindowsService.vb index c6d15dbf..6987ba90 100644 --- a/SERVICES/DDEDM_NetworkService/WindowsService.vb +++ b/SERVICES/DDEDM_NetworkService/WindowsService.vb @@ -1,17 +1,13 @@ Imports System.ServiceModel Imports System.ServiceProcess -Imports System.Configuration Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Database -Imports DigitalData.Modules.Database.Exceptions -Imports System.ServiceModel.Channels -Imports System.ServiceModel.Dispatcher Public Class WindowsService Inherits ServiceBase Private _serviceHost As ServiceHost = Nothing - Private _edmService As EDMService = Nothing + Private _edmService As IDBService = Nothing Private _logConfig As LogConfig Private _logger As Logger @@ -49,24 +45,29 @@ Public Class WindowsService _logger.Info("Database connection established.") - EDMService.Database = _db - EDMService.LogConfig = _logConfig - EDMService.AppConfig = _config + IDBService.Database = _db + IDBService.LogConfig = _logConfig + IDBService.AppConfig = _config _logger.Debug("Starting WCF ServiceHost...") - _serviceHost = New ServiceHost(GetType(EDMService)) + _serviceHost = New ServiceHost(GetType(IDBService)) _serviceHost.Open() - _logger.Info("WCF ServiceHost started.") + _logger.Debug("WCF ServiceHost started.") _logger.Info("Service {0} successfully started.", SERVICE_DISPLAY_NAME) Catch ex As Exception _logger.Error(ex, "Failed to start the service host!") + GracefullyStop() End Try End Sub Protected Overrides Sub OnStop() + GracefullyStop() + End Sub + + Private Sub GracefullyStop() If _serviceHost IsNot Nothing Then _serviceHost.Close() _serviceHost = Nothing