diff --git a/EDMI_ClientSuite/ClientSuite.vbproj b/EDMI_ClientSuite/ClientSuite.vbproj index 2ec288e9..89ae5ee6 100644 --- a/EDMI_ClientSuite/ClientSuite.vbproj +++ b/EDMI_ClientSuite/ClientSuite.vbproj @@ -134,32 +134,32 @@ Form - - - - - - - - - - - + + + + + + + + + + + frmStaticListEditor.vb - + Form - + ControlSnapPanel.vb - + Component - + frmEntityDesigner.vb - + Form @@ -210,10 +210,10 @@ Form - + frmUserManager.vb - + Form @@ -244,10 +244,10 @@ True ControlProperties.en.resx - + UserControlAssignment.vb - + UserControl @@ -261,13 +261,13 @@ DockManagerTest.vb - + frmStaticListEditor.vb - + frmStaticListEditor.vb - + frmEntityDesigner.vb @@ -291,7 +291,7 @@ frmEdit.vb - + frmUserManager.vb @@ -311,7 +311,7 @@ ControlProperties.Designer.vb My.Resources - + UserControlAssignment.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ClassControlBuilder.vb b/EDMI_ClientSuite/FormEntityDesigner/ClassControlBuilder.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ClassControlBuilder.vb rename to EDMI_ClientSuite/FormEntityDesigner/ClassControlBuilder.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ClassControlLocalization.vb b/EDMI_ClientSuite/FormEntityDesigner/ClassControlLocalization.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ClassControlLocalization.vb rename to EDMI_ClientSuite/FormEntityDesigner/ClassControlLocalization.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ClassControlUtils.vb b/EDMI_ClientSuite/FormEntityDesigner/ClassControlUtils.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ClassControlUtils.vb rename to EDMI_ClientSuite/FormEntityDesigner/ClassControlUtils.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassComboboxProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassComboboxProperties.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassComboboxProperties.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassComboboxProperties.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Editors/ClassStaticListEditor.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Editors/ClassStaticListEditor.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/Editors/ClassStaticListEditor.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Editors/ClassStaticListEditor.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Editors/frmStaticListEditor.Designer.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Editors/frmStaticListEditor.Designer.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/Editors/frmStaticListEditor.Designer.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Editors/frmStaticListEditor.Designer.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Editors/frmStaticListEditor.en-US.resx b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Editors/frmStaticListEditor.en-US.resx similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/Editors/frmStaticListEditor.en-US.resx rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Editors/frmStaticListEditor.en-US.resx diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Editors/frmStaticListEditor.resx b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Editors/frmStaticListEditor.resx similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/Editors/frmStaticListEditor.resx rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Editors/frmStaticListEditor.resx diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Editors/frmStaticListEditor.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Editors/frmStaticListEditor.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlProperties/Editors/frmStaticListEditor.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Editors/frmStaticListEditor.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlSnapPanel.Designer.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlSnapPanel.Designer.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlSnapPanel.Designer.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlSnapPanel.Designer.vb diff --git a/EDMI_ClientSuite/EntityDesigner/ControlSnapPanel.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlSnapPanel.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/ControlSnapPanel.vb rename to EDMI_ClientSuite/FormEntityDesigner/ControlSnapPanel.vb diff --git a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.Designer.vb b/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.Designer.vb similarity index 99% rename from EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.Designer.vb rename to EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.Designer.vb index ea1a83f6..4d834487 100644 --- a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.Designer.vb +++ b/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.Designer.vb @@ -1,6 +1,6 @@  Partial Class frmEntityDesigner - Inherits DevExpress.XtraBars.Ribbon.RibbonForm + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.resx b/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.resx similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.resx rename to EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.resx diff --git a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb b/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.vb similarity index 100% rename from EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb rename to EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.vb diff --git a/EDMI_ClientSuite/UserManager/UserControlAssignment.Designer.vb b/EDMI_ClientSuite/FormUserManager/UserControlAssignment.Designer.vb similarity index 100% rename from EDMI_ClientSuite/UserManager/UserControlAssignment.Designer.vb rename to EDMI_ClientSuite/FormUserManager/UserControlAssignment.Designer.vb diff --git a/EDMI_ClientSuite/UserManager/UserControlAssignment.resx b/EDMI_ClientSuite/FormUserManager/UserControlAssignment.resx similarity index 100% rename from EDMI_ClientSuite/UserManager/UserControlAssignment.resx rename to EDMI_ClientSuite/FormUserManager/UserControlAssignment.resx diff --git a/EDMI_ClientSuite/UserManager/UserControlAssignment.vb b/EDMI_ClientSuite/FormUserManager/UserControlAssignment.vb similarity index 100% rename from EDMI_ClientSuite/UserManager/UserControlAssignment.vb rename to EDMI_ClientSuite/FormUserManager/UserControlAssignment.vb diff --git a/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb b/EDMI_ClientSuite/FormUserManager/frmUserManager.Designer.vb similarity index 100% rename from EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb rename to EDMI_ClientSuite/FormUserManager/frmUserManager.Designer.vb diff --git a/EDMI_ClientSuite/UserManager/frmUserManager.resx b/EDMI_ClientSuite/FormUserManager/frmUserManager.resx similarity index 100% rename from EDMI_ClientSuite/UserManager/frmUserManager.resx rename to EDMI_ClientSuite/FormUserManager/frmUserManager.resx diff --git a/EDMI_ClientSuite/UserManager/frmUserManager.vb b/EDMI_ClientSuite/FormUserManager/frmUserManager.vb similarity index 100% rename from EDMI_ClientSuite/UserManager/frmUserManager.vb rename to EDMI_ClientSuite/FormUserManager/frmUserManager.vb diff --git a/EDMI_ClientSuite/My Project/licenses.licx b/EDMI_ClientSuite/My Project/licenses.licx index bd4139f0..984bff31 100644 --- a/EDMI_ClientSuite/My Project/licenses.licx +++ b/EDMI_ClientSuite/My Project/licenses.licx @@ -1,11 +1,12 @@ -DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/EDMI_ClientSuite/frmConfigUser.Designer.vb b/EDMI_ClientSuite/frmConfigUser.Designer.vb index 7d598497..d0d93885 100644 --- a/EDMI_ClientSuite/frmConfigUser.Designer.vb +++ b/EDMI_ClientSuite/frmConfigUser.Designer.vb @@ -49,7 +49,7 @@ Partial Class frmConfigUser Me.TabPageSupport.Controls.Add(Me.chkLogErrorsOnly) Me.TabPageSupport.ImageOptions.Image = CType(resources.GetObject("TabPageSupport.ImageOptions.Image"), System.Drawing.Image) Me.TabPageSupport.Name = "TabPageSupport" - Me.TabPageSupport.Size = New System.Drawing.Size(700, 444) + Me.TabPageSupport.Size = New System.Drawing.Size(703, 448) Me.TabPageSupport.Text = "Support" ' 'btnAppFolder @@ -124,7 +124,7 @@ Partial Class frmConfigUser Me.TabPageMain.Controls.Add(Me.cmbLanguage) Me.TabPageMain.ImageOptions.Image = CType(resources.GetObject("TabPageMain.ImageOptions.Image"), System.Drawing.Image) Me.TabPageMain.Name = "TabPageMain" - Me.TabPageMain.Size = New System.Drawing.Size(700, 444) + Me.TabPageMain.Size = New System.Drawing.Size(703, 448) Me.TabPageMain.Text = "Allgemein" ' 'Label1 diff --git a/EDMI_ClientSuite/frmEdit.vb b/EDMI_ClientSuite/frmEdit.vb index 1f1534a7..8076c20a 100644 --- a/EDMI_ClientSuite/frmEdit.vb +++ b/EDMI_ClientSuite/frmEdit.vb @@ -136,6 +136,7 @@ Public Class frmEdit } oCheckEdit.Properties.Caption = Column.ColumnName + oCheckEdit.Properties.GlyphAlignment = DevExpress.Utils.HorzAlignment.Far oEditor = oCheckEdit Case Else diff --git a/EDMI_ClientSuite/frmFileTest.Designer.vb b/EDMI_ClientSuite/frmFileTest.Designer.vb index ac37c75f..dc217c3f 100644 --- a/EDMI_ClientSuite/frmFileTest.Designer.vb +++ b/EDMI_ClientSuite/frmFileTest.Designer.vb @@ -1,6 +1,6 @@  Partial Class frmFileTest - Inherits System.Windows.Forms.Form + Inherits BaseForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/EDMI_ClientSuite/frmFileTest.vb b/EDMI_ClientSuite/frmFileTest.vb index 1f4faa3f..eaf6b68b 100644 --- a/EDMI_ClientSuite/frmFileTest.vb +++ b/EDMI_ClientSuite/frmFileTest.vb @@ -5,13 +5,6 @@ Imports DigitalData.Modules.Logging Public Class frmFileTest Private _fileOp As Document - Private _Logger As Logger - - Public Sub New() - InitializeComponent() - - _Logger = My.LogConfig.GetLogger() - End Sub Private Sub frmFileTest_Load(sender As Object, e As EventArgs) Handles Me.Load Try diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb index 4c54d777..d03fa66e 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -26,13 +26,9 @@ Public Class frmMain If My.Application.Service.Online Then LabelServiceOnline.Visibility = DevExpress.XtraBars.BarItemVisibility.Always LabelServiceOffline.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - 'LabelServiceOnline.Caption = "Service Online" - 'LabelServiceOnline.ItemAppearance.Normal.ForeColor = Color.Green Else LabelServiceOnline.Visibility = DevExpress.XtraBars.BarItemVisibility.Never LabelServiceOffline.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - 'LabelServiceOnline.Caption = "Service Offline" - 'LabelServiceOnline.ItemAppearance.Normal.ForeColor = Color.Red End If End Sub diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIFileOps.EDMIServiceReference.IndexResult.datasource b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIFileOps.EDMIServiceReference.IndexResult.datasource new file mode 100644 index 00000000..2a2da06e --- /dev/null +++ b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMIFileOps.EDMIServiceReference.IndexResult.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMIFileOps.EDMIServiceReference.IndexResult, Connected Services.EDMIServiceReference.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.Services.EDMService.wsdl b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.wsdl index f0e6a0cc..00043716 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.wsdl +++ b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.wsdl @@ -5,8 +5,8 @@ - + @@ -46,11 +46,11 @@ - - + + - - + + @@ -70,11 +70,11 @@ - - + + - - + + @@ -101,9 +101,9 @@ - - - + + + @@ -117,9 +117,9 @@ - - - + + + \ 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/EDMIServiceReference/DigitalData.Services.EDMService.xsd index 477a2919..161f2f9d 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.xsd +++ b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService.xsd @@ -81,7 +81,7 @@ - + @@ -89,10 +89,10 @@ - + - + @@ -139,19 +139,20 @@ - + + - + - + diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService1.xsd b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService1.xsd index f45af9fe..e60af79b 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService1.xsd +++ b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Services.EDMService1.xsd @@ -2,49 +2,73 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + - - - - + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.svcmap b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.svcmap index dbd80746..7dc5a656 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.svcmap +++ b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.svcmap @@ -27,8 +27,8 @@ - + diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb index fa0afbfe..7005bd4b 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb +++ b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb @@ -18,9 +18,14 @@ Namespace EDMIServiceReference _ - Partial Public Class TableResult + System.Runtime.Serialization.DataContractAttribute(Name:="BaseResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService"), _ + System.SerializableAttribute(), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ScalarResult)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult))> _ + Partial Public Class BaseResult Inherits Object Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged @@ -33,9 +38,6 @@ Namespace EDMIServiceReference _ Private OKField As Boolean - _ - Private TableField As System.Data.DataTable - _ Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData Get @@ -72,19 +74,6 @@ Namespace EDMIServiceReference End Set End Property - _ - 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 - Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged Protected Sub RaisePropertyChanged(ByVal propertyName As String) @@ -100,62 +89,18 @@ Namespace EDMIServiceReference System.Runtime.Serialization.DataContractAttribute(Name:="ScalarResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService"), _ System.SerializableAttribute(), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResult)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentObject))> _ Partial Public Class ScalarResult - 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 + Inherits EDMIServiceReference.BaseResult _ Private ScalarField As Object - _ - 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 Property Scalar() As Object Get @@ -168,15 +113,6 @@ Namespace EDMIServiceReference 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 NonQueryResult - 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 + Inherits EDMIServiceReference.BaseResult End Class _ Partial Public Class DocumentResult - Inherits Object - Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - - _ - Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject + Inherits EDMIServiceReference.BaseResult Private ContentsField() As Byte Private DocumentField As EDMIServiceReference.DocumentObject - Private ErrorMessageField As String - Private HasContentsField As Boolean - 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 Contents() As Byte() Get @@ -299,19 +162,6 @@ Namespace EDMIServiceReference 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 HasContents() As Boolean Get @@ -324,28 +174,53 @@ Namespace EDMIServiceReference End If End Set End Property + End Class + + _ + Partial Public Class IndexResult + Inherits EDMIServiceReference.BaseResult + + Private IndexIdField As Long _ - Public Property OK() As Boolean + Public Property IndexId() As Long Get - Return Me.OKField + Return Me.IndexIdField End Get Set - If (Me.OKField.Equals(value) <> true) Then - Me.OKField = value - Me.RaisePropertyChanged("OK") + 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 - Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged + _ + Private TableField As System.Data.DataTable - 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 + _ + 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 _ Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) - _ - Function CreateFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult + _ + Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult - _ - Function CreateFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of 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 @@ -488,17 +363,11 @@ Namespace EDMIServiceReference _ Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) - _ - Function SetFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal Value As String) As Object + _ + Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult - _ - Function SetFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal Value As String) As System.Threading.Tasks.Task(Of Object) + _ + 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 _ @@ -580,12 +449,12 @@ Namespace EDMIServiceReference Return MyBase.Channel.ExecuteNonQueryAsync(SQL) End Function - Public Function CreateFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMService.CreateFile - Return MyBase.Channel.CreateFile(FileName, Contents) + 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 CreateFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMService.CreateFileAsync - Return MyBase.Channel.CreateFileAsync(FileName, Contents) + 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 @@ -612,12 +481,12 @@ Namespace EDMIServiceReference Return MyBase.Channel.DeleteFileAsync(DocObject) End Function - Public Function SetFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal Value As String) As Object Implements EDMIServiceReference.IEDMService.SetFileIndex - Return MyBase.Channel.SetFileIndex(DocObject, Syskey, Value) + 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 SetFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal Value As String) As System.Threading.Tasks.Task(Of Object) Implements EDMIServiceReference.IEDMService.SetFileIndexAsync - Return MyBase.Channel.SetFileIndexAsync(DocObject, Syskey, Value) + 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/service.wsdl b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/service.wsdl index abced3f1..8e188766 100644 --- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/service.wsdl +++ b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/service.wsdl @@ -93,8 +93,8 @@ - - + + @@ -129,8 +129,8 @@ - - + + diff --git a/EDMI_FILE_OPs/Document.vb b/EDMI_FILE_OPs/Document.vb index 939d5bd5..0728652a 100644 --- a/EDMI_FILE_OPs/Document.vb +++ b/EDMI_FILE_OPs/Document.vb @@ -53,32 +53,14 @@ Public Class Document ''' ''' The filename to import ''' A document object - Public Async Function ImportFileAsync(FilePath As String) As Task(Of DocumentResult) - Try - Return Await CreateDocument(FilePath) - Catch ex As Exception - _logger.Error(ex) - Throw ex - End Try - End Function - - Public Async Function SetFileIndex(DocObject As DocumentObject, Syskey As String, Value As String) As Task - Try - Dim oResult As DocumentResult = _channel - Catch ex As Exception - _logger.Error(ex) - Throw ex - End Try - End Function - - Private Async Function CreateDocument(FilePath As String) As Task(Of DocumentResult) + Public Function ImportFile(FilePath As String) As DocumentResult Try Dim oContents As Byte() = File.ReadAllBytes(FilePath) Dim oInfo As New FileInfo(FilePath) Dim oName As String = oInfo.Name Dim oExtension As String = oInfo.Extension.Substring(1) - Dim oDocObject = Await _channel.CreateFileAsync(oName, oContents) + Dim oDocObject = _channel.NewFile(oName, oContents) Return oDocObject Catch ex As Exception _logger.Error(ex) @@ -86,6 +68,48 @@ Public Class Document End Try End Function + ''' + ''' Imports a file by filename + ''' + ''' The filename to import + ''' A document object + Public Async Function ImportFileAsync(FilePath As String) As Task(Of DocumentResult) + Try + Dim oContents As Byte() = File.ReadAllBytes(FilePath) + Dim oInfo As New FileInfo(FilePath) + Dim oName As String = oInfo.Name + Dim oExtension As String = oInfo.Extension.Substring(1) + + Dim oDocObject = Await _channel.NewFileAsync(oName, oContents) + Return oDocObject + Catch ex As Exception + _logger.Error(ex) + Throw ex + End Try + End Function + + Public Async Function NewFileIndexAsync(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As Task(Of IndexResult) + Try + Dim oResult As IndexResult = Await _channel.NewFileIndexAsync(DocObject, Syskey, LanguageCode, Value) + + Return oResult + Catch ex As Exception + _logger.Error(ex) + Throw ex + End Try + End Function + + Public Function NewFileIndex(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As IndexResult + Try + Dim oResult As IndexResult = _channel.NewFileIndex(DocObject, Syskey, LanguageCode, Value) + + Return oResult + Catch ex As Exception + _logger.Error(ex) + Throw ex + End Try + End Function + 'Public Async Function New_EDMI_File(oFILENAME As String, oUserName As String) As Task(Of String) ' Try ' Dim oFileGUID As DocumentResult = Await CreateDocument(oFILENAME) @@ -127,18 +151,18 @@ Public Class Document ' Return Nothing ' End Try 'End Function - Public Async Function Load_EDMIFile_2TempPath(oEDMIFile_GUID As String) As Task(Of String) - 'Try - ' Dim oResult As EDMIServiceReference.ContainerResult = Await _channel.GetFileAsync(oEDMIFile_GUID) - ' Dim oTempPath = Path.Combine(Path.GetTempPath(), "EDMI_FileContainer") - ' Directory.CreateDirectory(oTempPath) - ' Dim oFilePath = Path.Combine(oTempPath, $"{oResult.Container.FileId}.{oResult.Container.Extension}") - ' File.WriteAllBytes(oFilePath, oResult.Container.Contents) - ' ' Process.Start(oTempPath) - ' Return oTempPath - 'Catch ex As Exception - ' _logger.Error(ex) - ' Return Nothing - 'End Try - End Function + 'Public Async Function Load_EDMIFile_2TempPath(oEDMIFile_GUID As String) As Task(Of String) + 'Try + ' Dim oResult As EDMIServiceReference.ContainerResult = Await _channel.GetFileAsync(oEDMIFile_GUID) + ' Dim oTempPath = Path.Combine(Path.GetTempPath(), "EDMI_FileContainer") + ' Directory.CreateDirectory(oTempPath) + ' Dim oFilePath = Path.Combine(oTempPath, $"{oResult.Container.FileId}.{oResult.Container.Extension}") + ' File.WriteAllBytes(oFilePath, oResult.Container.Contents) + ' ' Process.Start(oTempPath) + ' Return oTempPath + 'Catch ex As Exception + ' _logger.Error(ex) + ' Return Nothing + 'End Try + 'End Function End Class diff --git a/EDMI_FILE_OPs/EDMIAPI.vbproj b/EDMI_FILE_OPs/EDMIAPI.vbproj index 2ba79cea..c115f0d0 100644 --- a/EDMI_FILE_OPs/EDMIAPI.vbproj +++ b/EDMI_FILE_OPs/EDMIAPI.vbproj @@ -108,6 +108,9 @@ Reference.svcmap + + Reference.svcmap + Reference.svcmap diff --git a/SERVICES/DDEDM_NetworkService/DDEDMService.vbproj b/SERVICES/DDEDM_NetworkService/DDEDMService.vbproj index 35835a38..4a1fe725 100644 --- a/SERVICES/DDEDM_NetworkService/DDEDMService.vbproj +++ b/SERVICES/DDEDM_NetworkService/DDEDMService.vbproj @@ -84,11 +84,13 @@ - - + + + - + + Component diff --git a/SERVICES/DDEDM_NetworkService/DatabaseResult.vb b/SERVICES/DDEDM_NetworkService/DatabaseResult.vb deleted file mode 100644 index 45c957d3..00000000 --- a/SERVICES/DDEDM_NetworkService/DatabaseResult.vb +++ /dev/null @@ -1,54 +0,0 @@ -Imports System.Runtime.Serialization - - - - -Public Class TableResult - - Public Property OK As Boolean - - Public Property ErrorMessage As String - - Public Property Table As DataTable - - Public Sub New(OK As Boolean, Table As DataTable, ErrorMessage As String) - Me.OK = OK - Me.ErrorMessage = ErrorMessage - Me.Table = Table - End Sub -End Class - - - - -Public Class ScalarResult - - Public Property OK As Boolean - - Public Property ErrorMessage As String - - Public Property Scalar As Object - - Public Sub New(OK As Boolean, Scalar As Object, ErrorMessage As String) - Me.OK = OK - Me.ErrorMessage = ErrorMessage - Me.Scalar = Scalar - End Sub -End Class - - - - -Public Class NonQueryResult - - Public Property OK As Boolean - - Public Property ErrorMessage As String - - Public Sub New(OK As Boolean, ErrorMessage As String) - Me.OK = OK - Me.ErrorMessage = ErrorMessage - End Sub -End Class - - diff --git a/SERVICES/DDEDM_NetworkService/DocumentResult.vb b/SERVICES/DDEDM_NetworkService/DocumentResult.vb deleted file mode 100644 index bbc4e5e8..00000000 --- a/SERVICES/DDEDM_NetworkService/DocumentResult.vb +++ /dev/null @@ -1,20 +0,0 @@ -Imports DigitalData.Modules.Filesystem - - -Public Class DocumentResult - Public ReadOnly OK As Boolean - Public ReadOnly ErrorMessage As String - Public Document As DocumentObject - Public HasContents As Boolean - Public Contents As Byte() - - Public Sub New() - OK = True - ErrorMessage = Nothing - End Sub - - Public Sub New(ErrorMessage As String) - OK = False - Me.ErrorMessage = ErrorMessage - End Sub -End Class diff --git a/SERVICES/DDEDM_NetworkService/EDMService.vb b/SERVICES/DDEDM_NetworkService/EDMService.vb index cadca5da..d2f24d1a 100644 --- a/SERVICES/DDEDM_NetworkService/EDMService.vb +++ b/SERVICES/DDEDM_NetworkService/EDMService.vb @@ -86,11 +86,11 @@ Public Class EDMService _request.LogDebug($"ReturnDatatable, SQL: {SQL}") Dim oResult As DataTable = Database.GetDatatableWithConnection(SQL, _request.Connection) - Return New TableResult(True, oResult, Nothing) + Return New TableResult(oResult) Catch ex As Exception _logger.Error(ex) _request.LogError(ex.Message) - Return New TableResult(False, Nothing, ex.Message) + Return New TableResult(ex.Message) End Try End Function @@ -102,11 +102,11 @@ Public Class EDMService _request.LogDebug($"ReturnScalar, SQL: {SQL}") Dim oResult As Object = Database.GetScalarValueWithConnection(SQL, _request.Connection) - Return New ScalarResult(True, oResult, Nothing) + Return New ScalarResult(oResult) Catch ex As Exception _logger.Error(ex) _request.LogError(ex.Message) - Return New ScalarResult(False, Nothing, ex.Message) + Return New ScalarResult(ex.Message) End Try End Function @@ -118,24 +118,24 @@ Public Class EDMService _request.LogDebug($"ExecuteNonQuery, SQL: {SQL}") Dim oResult As Boolean = Database.ExecuteNonQueryWithConnection(SQL, _request.Connection) - Return New NonQueryResult(True, Nothing) + Return New NonQueryResult() Catch ex As Exception _logger.Error(ex) _request.LogError(ex.Message) - Return New NonQueryResult(False, ex.Message) + Return New NonQueryResult(ex.Message) End Try End Function #End Region #Region "Document" - Public Function CreateFile(FileName As String, Contents() As Byte) As DocumentResult Implements IEDMService.CreateFile + Public Function NewFile(FileName As String, Contents() As Byte) As DocumentResult Implements IEDMService.NewFile Try Dim oContainer As FileContainer Dim oContainerId As String If Not TestUserAuth() Then - Throw New Exception("User not authorized") + Throw New Exception($"User {_username} not authorized.") End If oContainer = FileContainer.Create(LogConfig, AppConfig.ContainerPassword) @@ -160,9 +160,8 @@ Public Class EDMService _logger.Debug("File saved in Container!", FileName) - Return New DocumentResult() With { - .Document = New DocumentObject(oContainerId, oDocId, FileName) - } + Dim oDocument = New DocumentObject(oContainerId, oDocId, FileName) + Return New DocumentResult(oDocument) Catch ex As Exception _logger.Error(ex) Return New DocumentResult(ex.Message) @@ -181,9 +180,8 @@ Public Class EDMService oFileContainer.SetFile(Contents, oFileContainer.GetFile.FileName) oFileContainer.Save() - Return New DocumentResult() With { - .Document = DocObject - } + + Return New DocumentResult(DocObject) Catch ex As Exception _logger.Error(ex) Return Nothing @@ -198,10 +196,7 @@ Public Class EDMService Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath) Dim oContents As Byte() = oContainer.GetFile().Contents - Return New DocumentResult With { - .Document = DocObject, - .Contents = oContents - } + Return New DocumentResult(DocObject, oContents) Catch ex As Exception _logger.Error(ex) Return New DocumentResult(ex.Message) @@ -224,7 +219,6 @@ Public Class EDMService End Try End Function - Private Function GetContainerPath(ContainerId As String) As String Return Path.Combine(AppConfig.ContainerPath, GetContainerName(ContainerId)) End Function @@ -243,8 +237,16 @@ Public Class EDMService #End Region #Region "Index" - Public Function SetFileIndex(DocObject As DocumentObject, Syskey As String, Value As String) As Object Implements IEDMService.SetFileIndex - Throw New NotImplementedException() + Public Function NewFileIndex(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As IndexResult Implements IEDMService.NewFileIndex + Try + Dim oSQL = $"SELECT FNICM_NEW_OBJECT_VALUE({DocObject.DocumentId},'{Syskey}','{LanguageCode}','{Value}','{_username}') FROM RDB$DATABASE;" + Dim oIndexId As Int64 = Database.GetScalarValue(oSQL) + + Return New IndexResult(oIndexId) + Catch ex As Exception + _logger.Error(ex) + Return New IndexResult(ex.Message) + End Try End Function #End Region End Class \ No newline at end of file diff --git a/SERVICES/DDEDM_NetworkService/IEDMService.vb b/SERVICES/DDEDM_NetworkService/IEDMService.vb index 47666711..342ae67f 100644 --- a/SERVICES/DDEDM_NetworkService/IEDMService.vb +++ b/SERVICES/DDEDM_NetworkService/IEDMService.vb @@ -28,7 +28,7 @@ Interface IEDMService #Region "Document" - Function CreateFile(FileName As String, Contents As Byte()) As DocumentResult + Function NewFile(FileName As String, Contents As Byte()) As DocumentResult Function UpdateFile(DocObject As DocumentObject, Contents As Byte()) As DocumentResult @@ -42,7 +42,7 @@ Interface IEDMService #Region "Index" - Function SetFileIndex(DocObject As DocumentObject, Syskey As String, Value As String) + Function NewFileIndex(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As IndexResult #End Region End Interface \ No newline at end of file diff --git a/SERVICES/DDEDM_NetworkService/Results/BaseResult.vb b/SERVICES/DDEDM_NetworkService/Results/BaseResult.vb new file mode 100644 index 00000000..175523b5 --- /dev/null +++ b/SERVICES/DDEDM_NetworkService/Results/BaseResult.vb @@ -0,0 +1,20 @@ +Imports System.Runtime.Serialization + + + + +Public Class BaseResult + + Public Property OK As Boolean + + Public Property ErrorMessage As String + + Public Sub New() + Me.OK = OK + End Sub + + Public Sub New(ErrorMessage As String) + OK = False + Me.ErrorMessage = ErrorMessage + End Sub +End Class diff --git a/SERVICES/DDEDM_NetworkService/ContainerResult.vb b/SERVICES/DDEDM_NetworkService/Results/ContainerResult.vb similarity index 100% rename from SERVICES/DDEDM_NetworkService/ContainerResult.vb rename to SERVICES/DDEDM_NetworkService/Results/ContainerResult.vb diff --git a/SERVICES/DDEDM_NetworkService/Results/DatabaseResult.vb b/SERVICES/DDEDM_NetworkService/Results/DatabaseResult.vb new file mode 100644 index 00000000..e98741e5 --- /dev/null +++ b/SERVICES/DDEDM_NetworkService/Results/DatabaseResult.vb @@ -0,0 +1,56 @@ +Imports System.Runtime.Serialization + + + + +Public Class TableResult + Inherits BaseResult + + + Public Property Table As DataTable + + Public Sub New(Table As DataTable) + MyBase.New() + Me.Table = Table + End Sub + + Public Sub New(ErrorMessage As String) + MyBase.New(ErrorMessage) + End Sub +End Class + + + + +Public Class ScalarResult + Inherits BaseResult + + + Public Property Scalar As Object + + Public Sub New(Scalar As Object) + MyBase.New() + Me.Scalar = Scalar + End Sub + + Public Sub New(ErrorMessage As String) + MyBase.New(ErrorMessage) + End Sub +End Class + + + + +Public Class NonQueryResult + Inherits BaseResult + + Public Sub New() + MyBase.New() + End Sub + + Public Sub New(ErrorMessage As String) + MyBase.New(ErrorMessage) + End Sub +End Class + + diff --git a/SERVICES/DDEDM_NetworkService/Results/DocumentResult.vb b/SERVICES/DDEDM_NetworkService/Results/DocumentResult.vb new file mode 100644 index 00000000..c9d6f3c3 --- /dev/null +++ b/SERVICES/DDEDM_NetworkService/Results/DocumentResult.vb @@ -0,0 +1,26 @@ +Imports DigitalData.Modules.Filesystem + + +Public Class DocumentResult + Inherits BaseResult + + Public Document As DocumentObject + Public HasContents As Boolean = False + Public Contents As Byte() + + Public Sub New(Document As DocumentObject) + MyBase.New() + Me.Document = Document + End Sub + + Public Sub New(Document As DocumentObject, Contents As Byte()) + MyBase.New() + Me.Document = Document + Me.Contents = Contents + Me.HasContents = True + End Sub + + Public Sub New(ErrorMessage As String) + MyBase.New(ErrorMessage) + End Sub +End Class diff --git a/SERVICES/DDEDM_NetworkService/Results/IndexResult.vb b/SERVICES/DDEDM_NetworkService/Results/IndexResult.vb new file mode 100644 index 00000000..38e970ab --- /dev/null +++ b/SERVICES/DDEDM_NetworkService/Results/IndexResult.vb @@ -0,0 +1,17 @@ +Imports DigitalData.Modules.Filesystem + + +Public Class IndexResult + Inherits BaseResult + + Public ReadOnly IndexId As Int64 + + Public Sub New(IndexId As Int64) + MyBase.New() + Me.IndexId = IndexId + End Sub + + Public Sub New(ErrorMessage As String) + MyBase.New(ErrorMessage) + End Sub +End Class