From ab1cb2c84740ab42d75f980229d2ec168a83ef86 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 14 Jun 2021 14:46:32 +0200 Subject: [PATCH] EDMI.API: Clean up Client --- Modules.EDMIAPI/Client.vb | 57 +++-- ...nce.DocumentImportIDBFOResponse.datasource | 10 - ...mportFileIntoFileObjectResponse.datasource | 10 + ...Reference.NewFileObjectResponse.datasource | 10 + ...ceReference.NewObjectIdResponse.datasource | 10 + .../DigitalData.Services.EDMIService.wsdl | 56 ++--- .../DigitalData.Services.EDMIService.xsd | 32 +-- .../EDMIServiceReference/Reference.vb | 230 ++++++++++++++---- .../EDMIServiceReference/service.wsdl | 24 +- Modules.EDMIAPI/EDMI.API.vbproj | 12 +- 10 files changed, 317 insertions(+), 134 deletions(-) delete mode 100644 Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse.datasource create mode 100644 Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource create mode 100644 Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource create mode 100644 Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource diff --git a/Modules.EDMIAPI/Client.vb b/Modules.EDMIAPI/Client.vb index 6ce65386..4a3e30d4 100644 --- a/Modules.EDMIAPI/Client.vb +++ b/Modules.EDMIAPI/Client.vb @@ -7,7 +7,6 @@ Imports System.IO Public Class Client Private ReadOnly _logger As Logger Private ReadOnly _channelFactory As ChannelFactory(Of IEDMIServiceChannel) - Private _ServiceAddress As String Private _IPAddressServer As String Private _channel As IEDMIServiceChannel @@ -34,7 +33,6 @@ Public Class Client _logger = LogConfig.GetLogger() Try - _ServiceAddress = ServiceAdress Dim oBinding = Channel.GetBinding() Dim oAddress = New EndpointAddress(ServiceAdress) Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress) @@ -281,41 +279,56 @@ Public Class Client Throw ex End Try End Function - Public Function NewFileStoreObject(IDB_OBJ_ID As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As String) As String + + Public Function CreateObjectId(pKindType As String, pWho As String, pBusinessEntity As String) As Long Try - If pExtension.StartsWith(".") Then - pExtension = pExtension.Replace(".", "") - End If - Dim oResponse = _channel.New_FileStore_Object(IDB_OBJ_ID, pStoreType, pDate, pExtension, pKeepExtension) - Return oResponse + Dim oArgs As New NewObjectIdRequest With { + .KindType = pKindType, + .BusinessEntity = pBusinessEntity, + .Who = pWho + } + Dim oResponse = _channel.NewObjectId(oArgs) + Return oResponse.ObjectId Catch ex As Exception _logger.Error(ex) Throw ex End Try End Function - Public Function NewIDB_OBJ_ID(pKindType As String, pWho As String, pBusinessEntity As String) As Long + + Public Function CreateFileStoreObject(pObjectId As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As String) As String Try - Dim oResponse = _channel.New_IDB_OBJECT(pKindType, pWho, pBusinessEntity) - Return oResponse + ' Remove dot in Extension + If pExtension.StartsWith(".") Then + pExtension = pExtension.Substring(1) + End If + + Dim oArgs As New NewFileObjectRequest With { + .ObjectId = pObjectId, + .StoreType = pStoreType, + .DateImported = pDate, + .Extension = pExtension, + .KeepExtension = pKeepExtension + } + Dim oResponse = _channel.NewFileObject(oargs) + Return oResponse.FileObjectPath Catch ex As Exception _logger.Error(ex) Throw ex End Try End Function - Public Async Function ImportIDBFOAsync(pContent As Byte(), pWho As String, pIDB_OBJ_ID As Long, pObjectStoreID As Short, pIDBFOPath As String) As Task(Of Boolean) - Try - Dim oData As New DocumentImportIDBFORequest() With { - .Contents = pContent, - .pWho = pWho, - .pIDBFilePath = pIDBFOPath, - .pIDB_OBJ_ID = pIDB_OBJ_ID, - .pObjectStoreID = pObjectStoreID - } - Dim oResponse = Await _channel.ImportNewIDBFOAsync(oData) + Public Async Function ImportFileObjectAsync(pContent As Byte(), pWho As String, pObjectId As Long, pObjectStoreID As Short, pFileObjectPath As String) As Task(Of Boolean) + Try + Dim oData As New ImportFileIntoFileObjectRequest() With { + .Contents = pContent, + .pWho = pWho, + .pIDBFilePath = pFileObjectPath, + .pIDB_OBJ_ID = pObjectId, + .pObjectStoreID = pObjectStoreID + } + Dim oResponse = Await _channel.ImportFileIntoFileObjectAsync(oData) Return oResponse.Result - Catch ex As Exception _logger.Error(ex) Return False diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse.datasource deleted file mode 100644 index 6d491231..00000000 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource new file mode 100644 index 00000000..b7120ba7 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource new file mode 100644 index 00000000..6ee8711d --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource new file mode 100644 index 00000000..dbc88508 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl index 575b7946..c6b2a311 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl @@ -1,5 +1,5 @@  - + @@ -151,31 +151,31 @@ - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + @@ -255,20 +255,20 @@ - - - - + + + + - - - - + + + + - - - - + + + + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd index 1400b999..07de0764 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd @@ -226,41 +226,41 @@ - + - - - - - + + + - + - + - + - - - + + + + + - + - + - + @@ -271,7 +271,7 @@ - + diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb index 4ae88d8b..95fd2b6c 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb @@ -444,35 +444,37 @@ Namespace EDMIServiceReference _ Function ListFilesForUserAsync(ByVal request As EDMIServiceReference.ListFilesForUserRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentListResponse) - _ - Function New_FileStore_Object(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As String + Function NewObjectId(ByVal request As EDMIServiceReference.NewObjectIdRequest) As EDMIServiceReference.NewObjectIdResponse - _ - Function New_FileStore_ObjectAsync(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As System.Threading.Tasks.Task(Of String) + _ + Function NewObjectIdAsync(ByVal request As EDMIServiceReference.NewObjectIdRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse) - _ - Function New_IDB_OBJECT(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As String + Function NewFileObject(ByVal request As EDMIServiceReference.NewFileObjectRequest) As EDMIServiceReference.NewFileObjectResponse - _ - Function New_IDB_OBJECTAsync(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As System.Threading.Tasks.Task(Of String) + _ + Function NewFileObjectAsync(ByVal request As EDMIServiceReference.NewFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse) - 'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (DocumentImportIDBFORequest) von Nachricht "DocumentImportIDBFORequest" nicht mit dem Standardwert (ImportNewIDBFO) übereinstimmt. - _ - Function ImportNewIDBFO(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As EDMIServiceReference.DocumentImportIDBFOResponse + Function ImportFileIntoFileObject(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As EDMIServiceReference.ImportFileIntoFileObjectResponse - _ - Function ImportNewIDBFOAsync(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportIDBFOResponse) + _ + Function ImportFileIntoFileObjectAsync(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse) End Interface _ - Partial Public Class DocumentImportIDBFORequest + System.ServiceModel.MessageContractAttribute(WrapperName:="NewObjectIdRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)> _ + Partial Public Class NewObjectIdRequest + + _ + Public BusinessEntity As String + + _ + Public KindType As String + + _ + Public Who As String + + Public Sub New() + MyBase.New + End Sub + + Public Sub New(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String) + MyBase.New + Me.BusinessEntity = BusinessEntity + Me.KindType = KindType + Me.Who = Who + End Sub + End Class + + _ + Partial Public Class NewObjectIdResponse + + _ + Public ObjectId As Long + + Public Sub New() + MyBase.New + End Sub + + Public Sub New(ByVal ObjectId As Long) + MyBase.New + Me.ObjectId = ObjectId + End Sub + End Class + + _ + Partial Public Class NewFileObjectRequest + + _ + Public DateImported As Date + + _ + Public Extension As String + + _ + Public KeepExtension As Boolean + + _ + Public ObjectId As Long + + _ + Public StoreType As String + + Public Sub New() + MyBase.New + End Sub + + Public Sub New(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String) + MyBase.New + Me.DateImported = DateImported + Me.Extension = Extension + Me.KeepExtension = KeepExtension + Me.ObjectId = ObjectId + Me.StoreType = StoreType + End Sub + End Class + + _ + Partial Public Class NewFileObjectResponse + + _ + Public FileObjectPath As String + + Public Sub New() + MyBase.New + End Sub + + Public Sub New(ByVal FileObjectPath As String) + MyBase.New + Me.FileObjectPath = FileObjectPath + End Sub + End Class + + _ + Partial Public Class ImportFileIntoFileObjectRequest _ Public Contents() As Byte @@ -683,8 +785,8 @@ Namespace EDMIServiceReference _ - Partial Public Class DocumentImportIDBFOResponse + System.ServiceModel.MessageContractAttribute(WrapperName:="ImportFileIntoFileObjectResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)> _ + Partial Public Class ImportFileIntoFileObjectResponse _ Public Result As Boolean @@ -912,51 +1014,93 @@ Namespace EDMIServiceReference Return CType(Me,EDMIServiceReference.IEDMIService).ListFilesForUserAsync(inValue) End Function - Public Function New_FileStore_Object(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As String Implements EDMIServiceReference.IEDMIService.New_FileStore_Object - Return MyBase.Channel.New_FileStore_Object(IDB_OBJ_ID, pStoreType, pDate, pExtension, pKeepExtension) + _ + Function EDMIServiceReference_IEDMIService_NewObjectId(ByVal request As EDMIServiceReference.NewObjectIdRequest) As EDMIServiceReference.NewObjectIdResponse Implements EDMIServiceReference.IEDMIService.NewObjectId + Return MyBase.Channel.NewObjectId(request) + End Function + + Public Function NewObjectId(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String) As Long + Dim inValue As EDMIServiceReference.NewObjectIdRequest = New EDMIServiceReference.NewObjectIdRequest() + inValue.BusinessEntity = BusinessEntity + inValue.KindType = KindType + inValue.Who = Who + Dim retVal As EDMIServiceReference.NewObjectIdResponse = CType(Me,EDMIServiceReference.IEDMIService).NewObjectId(inValue) + Return retVal.ObjectId + End Function + + _ + Function EDMIServiceReference_IEDMIService_NewObjectIdAsync(ByVal request As EDMIServiceReference.NewObjectIdRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse) Implements EDMIServiceReference.IEDMIService.NewObjectIdAsync + Return MyBase.Channel.NewObjectIdAsync(request) End Function - Public Function New_FileStore_ObjectAsync(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMIService.New_FileStore_ObjectAsync - Return MyBase.Channel.New_FileStore_ObjectAsync(IDB_OBJ_ID, pStoreType, pDate, pExtension, pKeepExtension) + Public Function NewObjectIdAsync(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse) + Dim inValue As EDMIServiceReference.NewObjectIdRequest = New EDMIServiceReference.NewObjectIdRequest() + inValue.BusinessEntity = BusinessEntity + inValue.KindType = KindType + inValue.Who = Who + Return CType(Me,EDMIServiceReference.IEDMIService).NewObjectIdAsync(inValue) End Function - Public Function New_IDB_OBJECT(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As String Implements EDMIServiceReference.IEDMIService.New_IDB_OBJECT - Return MyBase.Channel.New_IDB_OBJECT(KindType, pWho, pBusinessEntity) + _ + Function EDMIServiceReference_IEDMIService_NewFileObject(ByVal request As EDMIServiceReference.NewFileObjectRequest) As EDMIServiceReference.NewFileObjectResponse Implements EDMIServiceReference.IEDMIService.NewFileObject + Return MyBase.Channel.NewFileObject(request) End Function - Public Function New_IDB_OBJECTAsync(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMIService.New_IDB_OBJECTAsync - Return MyBase.Channel.New_IDB_OBJECTAsync(KindType, pWho, pBusinessEntity) + Public Function NewFileObject(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String) As String + Dim inValue As EDMIServiceReference.NewFileObjectRequest = New EDMIServiceReference.NewFileObjectRequest() + inValue.DateImported = DateImported + inValue.Extension = Extension + inValue.KeepExtension = KeepExtension + inValue.ObjectId = ObjectId + inValue.StoreType = StoreType + Dim retVal As EDMIServiceReference.NewFileObjectResponse = CType(Me,EDMIServiceReference.IEDMIService).NewFileObject(inValue) + Return retVal.FileObjectPath + End Function + + _ + Function EDMIServiceReference_IEDMIService_NewFileObjectAsync(ByVal request As EDMIServiceReference.NewFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse) Implements EDMIServiceReference.IEDMIService.NewFileObjectAsync + Return MyBase.Channel.NewFileObjectAsync(request) + End Function + + Public Function NewFileObjectAsync(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse) + Dim inValue As EDMIServiceReference.NewFileObjectRequest = New EDMIServiceReference.NewFileObjectRequest() + inValue.DateImported = DateImported + inValue.Extension = Extension + inValue.KeepExtension = KeepExtension + inValue.ObjectId = ObjectId + inValue.StoreType = StoreType + Return CType(Me,EDMIServiceReference.IEDMIService).NewFileObjectAsync(inValue) End Function _ - Function EDMIServiceReference_IEDMIService_ImportNewIDBFO(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As EDMIServiceReference.DocumentImportIDBFOResponse Implements EDMIServiceReference.IEDMIService.ImportNewIDBFO - Return MyBase.Channel.ImportNewIDBFO(request) + Function EDMIServiceReference_IEDMIService_ImportFileIntoFileObject(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As EDMIServiceReference.ImportFileIntoFileObjectResponse Implements EDMIServiceReference.IEDMIService.ImportFileIntoFileObject + Return MyBase.Channel.ImportFileIntoFileObject(request) End Function - Public Function ImportNewIDBFO(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As Boolean - Dim inValue As EDMIServiceReference.DocumentImportIDBFORequest = New EDMIServiceReference.DocumentImportIDBFORequest() + Public Function ImportFileIntoFileObject(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As Boolean + Dim inValue As EDMIServiceReference.ImportFileIntoFileObjectRequest = New EDMIServiceReference.ImportFileIntoFileObjectRequest() inValue.Contents = Contents inValue.pIDBFilePath = pIDBFilePath inValue.pIDB_OBJ_ID = pIDB_OBJ_ID inValue.pObjectStoreID = pObjectStoreID inValue.pWho = pWho - Dim retVal As EDMIServiceReference.DocumentImportIDBFOResponse = CType(Me,EDMIServiceReference.IEDMIService).ImportNewIDBFO(inValue) + Dim retVal As EDMIServiceReference.ImportFileIntoFileObjectResponse = CType(Me,EDMIServiceReference.IEDMIService).ImportFileIntoFileObject(inValue) Return retVal.Result End Function _ - Function EDMIServiceReference_IEDMIService_ImportNewIDBFOAsync(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportIDBFOResponse) Implements EDMIServiceReference.IEDMIService.ImportNewIDBFOAsync - Return MyBase.Channel.ImportNewIDBFOAsync(request) + Function EDMIServiceReference_IEDMIService_ImportFileIntoFileObjectAsync(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse) Implements EDMIServiceReference.IEDMIService.ImportFileIntoFileObjectAsync + Return MyBase.Channel.ImportFileIntoFileObjectAsync(request) End Function - Public Function ImportNewIDBFOAsync(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportIDBFOResponse) - Dim inValue As EDMIServiceReference.DocumentImportIDBFORequest = New EDMIServiceReference.DocumentImportIDBFORequest() + Public Function ImportFileIntoFileObjectAsync(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse) + Dim inValue As EDMIServiceReference.ImportFileIntoFileObjectRequest = New EDMIServiceReference.ImportFileIntoFileObjectRequest() inValue.Contents = Contents inValue.pIDBFilePath = pIDBFilePath inValue.pIDB_OBJ_ID = pIDB_OBJ_ID inValue.pObjectStoreID = pObjectStoreID inValue.pWho = pWho - Return CType(Me,EDMIServiceReference.IEDMIService).ImportNewIDBFOAsync(inValue) + Return CType(Me,EDMIServiceReference.IEDMIService).ImportFileIntoFileObjectAsync(inValue) End Function End Class End Namespace diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl index 54f74fff..c6ee60d8 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl @@ -225,36 +225,36 @@ - - - + + + - + - - - + + + - + - - - + + + - + diff --git a/Modules.EDMIAPI/EDMI.API.vbproj b/Modules.EDMIAPI/EDMI.API.vbproj index 44dae50c..95b88971 100644 --- a/Modules.EDMIAPI/EDMI.API.vbproj +++ b/Modules.EDMIAPI/EDMI.API.vbproj @@ -108,9 +108,6 @@ - - Reference.svcmap - Reference.svcmap @@ -123,6 +120,15 @@ Reference.svcmap + + Reference.svcmap + + + Reference.svcmap + + + Reference.svcmap + Reference.svcmap