Add NewFileIndex

This commit is contained in:
Jonathan Jenne 2019-03-04 17:13:49 +01:00
parent 6f0164d010
commit bbd761c0ad
51 changed files with 408 additions and 437 deletions

View File

@ -134,32 +134,32 @@
<Compile Include="DockManagerTest.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="EntityDesigner\ClassControlBuilder.vb" />
<Compile Include="EntityDesigner\ClassControlLocalization.vb" />
<Compile Include="EntityDesigner\ClassControlUtils.vb" />
<Compile Include="EntityDesigner\ControlProperties\BaseClasses\ClassBaseProperties.vb" />
<Compile Include="EntityDesigner\ControlProperties\BaseClasses\ClassInputProperties.vb" />
<Compile Include="EntityDesigner\ControlProperties\BaseClasses\ClassMultiInputProperties.vb" />
<Compile Include="EntityDesigner\ControlProperties\Controls\ClassComboboxProperties.vb" />
<Compile Include="EntityDesigner\ControlProperties\Controls\ClassLabelProperties.vb" />
<Compile Include="EntityDesigner\ControlProperties\Controls\ClassTextboxProperties.vb" />
<Compile Include="EntityDesigner\ControlProperties\Editors\ClassStaticListEditor.vb" />
<Compile Include="EntityDesigner\ControlProperties\Editors\frmStaticListEditor.designer.vb">
<Compile Include="FormEntityDesigner\ClassControlBuilder.vb" />
<Compile Include="FormEntityDesigner\ClassControlLocalization.vb" />
<Compile Include="FormEntityDesigner\ClassControlUtils.vb" />
<Compile Include="FormEntityDesigner\ControlProperties\BaseClasses\ClassBaseProperties.vb" />
<Compile Include="FormEntityDesigner\ControlProperties\BaseClasses\ClassInputProperties.vb" />
<Compile Include="FormEntityDesigner\ControlProperties\BaseClasses\ClassMultiInputProperties.vb" />
<Compile Include="FormEntityDesigner\ControlProperties\Controls\ClassComboboxProperties.vb" />
<Compile Include="FormEntityDesigner\ControlProperties\Controls\ClassLabelProperties.vb" />
<Compile Include="FormEntityDesigner\ControlProperties\Controls\ClassTextboxProperties.vb" />
<Compile Include="FormEntityDesigner\ControlProperties\Editors\ClassStaticListEditor.vb" />
<Compile Include="FormEntityDesigner\ControlProperties\Editors\frmStaticListEditor.designer.vb">
<DependentUpon>frmStaticListEditor.vb</DependentUpon>
</Compile>
<Compile Include="EntityDesigner\ControlProperties\Editors\frmStaticListEditor.vb">
<Compile Include="FormEntityDesigner\ControlProperties\Editors\frmStaticListEditor.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="EntityDesigner\ControlSnapPanel.Designer.vb">
<Compile Include="FormEntityDesigner\ControlSnapPanel.Designer.vb">
<DependentUpon>ControlSnapPanel.vb</DependentUpon>
</Compile>
<Compile Include="EntityDesigner\ControlSnapPanel.vb">
<Compile Include="FormEntityDesigner\ControlSnapPanel.vb">
<SubType>Component</SubType>
</Compile>
<Compile Include="EntityDesigner\frmEntityDesigner.Designer.vb">
<Compile Include="FormEntityDesigner\frmEntityDesigner.Designer.vb">
<DependentUpon>frmEntityDesigner.vb</DependentUpon>
</Compile>
<Compile Include="EntityDesigner\frmEntityDesigner.vb">
<Compile Include="FormEntityDesigner\frmEntityDesigner.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="FormDefaults\BaseForm.vb">
@ -210,10 +210,10 @@
<Compile Include="frmEdit.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="UserManager\frmUserManager.Designer.vb">
<Compile Include="FormUserManager\frmUserManager.Designer.vb">
<DependentUpon>frmUserManager.vb</DependentUpon>
</Compile>
<Compile Include="UserManager\frmUserManager.vb">
<Compile Include="FormUserManager\frmUserManager.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="My Project\AssemblyInfo.vb" />
@ -244,10 +244,10 @@
<DesignTime>True</DesignTime>
<DependentUpon>ControlProperties.en.resx</DependentUpon>
</Compile>
<Compile Include="UserManager\UserControlAssignment.Designer.vb">
<Compile Include="FormUserManager\UserControlAssignment.Designer.vb">
<DependentUpon>UserControlAssignment.vb</DependentUpon>
</Compile>
<Compile Include="UserManager\UserControlAssignment.vb">
<Compile Include="FormUserManager\UserControlAssignment.vb">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Widgets\ProcessManagerWidget.Designer.vb">
@ -261,13 +261,13 @@
<EmbeddedResource Include="DockManagerTest.resx">
<DependentUpon>DockManagerTest.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EntityDesigner\ControlProperties\Editors\frmStaticListEditor.en-US.resx">
<EmbeddedResource Include="FormEntityDesigner\ControlProperties\Editors\frmStaticListEditor.en-US.resx">
<DependentUpon>frmStaticListEditor.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EntityDesigner\ControlProperties\Editors\frmStaticListEditor.resx">
<EmbeddedResource Include="FormEntityDesigner\ControlProperties\Editors\frmStaticListEditor.resx">
<DependentUpon>frmStaticListEditor.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EntityDesigner\frmEntityDesigner.resx">
<EmbeddedResource Include="FormEntityDesigner\frmEntityDesigner.resx">
<DependentUpon>frmEntityDesigner.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmDashboard.resx">
@ -291,7 +291,7 @@
<EmbeddedResource Include="frmEdit.resx">
<DependentUpon>frmEdit.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserManager\frmUserManager.resx">
<EmbeddedResource Include="FormUserManager\frmUserManager.resx">
<DependentUpon>frmUserManager.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="My Project\licenses.licx" />
@ -311,7 +311,7 @@
<LastGenOutput>ControlProperties.Designer.vb</LastGenOutput>
<CustomToolNamespace>My.Resources</CustomToolNamespace>
</EmbeddedResource>
<EmbeddedResource Include="UserManager\UserControlAssignment.resx">
<EmbeddedResource Include="FormUserManager\UserControlAssignment.resx">
<DependentUpon>UserControlAssignment.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Widgets\ProcessManagerWidget.resx">

View File

@ -1,6 +1,6 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class frmEntityDesigner
Inherits DevExpress.XtraBars.Ribbon.RibbonForm
Inherits BaseRibbonForm
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()>

View File

@ -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

View File

@ -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

View File

@ -136,6 +136,7 @@ Public Class frmEdit
}
oCheckEdit.Properties.Caption = Column.ColumnName
oCheckEdit.Properties.GlyphAlignment = DevExpress.Utils.HorzAlignment.Far
oEditor = oCheckEdit
Case Else

View File

@ -1,6 +1,6 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class frmFileTest
Inherits System.Windows.Forms.Form
Inherits BaseForm
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()>

View File

@ -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

View File

@ -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

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="IndexResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>DigitalData.Modules.EDMIFileOps.EDMIServiceReference.IndexResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

View File

@ -5,8 +5,8 @@
<xsd:import namespace="http://DigitalData.Services.EDMService" />
<xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
<xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService" />
<xsd:import namespace="http://schemas.datacontract.org/2004/07/System.Data" />
<xsd:import namespace="http://schemas.datacontract.org/2004/07/System" />
<xsd:import namespace="http://schemas.datacontract.org/2004/07/System.Data" />
<xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
</xsd:schema>
</wsdl:types>
@ -46,11 +46,11 @@
<wsdl:message name="IEDMService_ExecuteNonQuery_OutputMessage">
<wsdl:part name="parameters" element="tns:ExecuteNonQueryResponse" />
</wsdl:message>
<wsdl:message name="IEDMService_CreateFile_InputMessage">
<wsdl:part name="parameters" element="tns:CreateFile" />
<wsdl:message name="IEDMService_NewFile_InputMessage">
<wsdl:part name="parameters" element="tns:NewFile" />
</wsdl:message>
<wsdl:message name="IEDMService_CreateFile_OutputMessage">
<wsdl:part name="parameters" element="tns:CreateFileResponse" />
<wsdl:message name="IEDMService_NewFile_OutputMessage">
<wsdl:part name="parameters" element="tns:NewFileResponse" />
</wsdl:message>
<wsdl:message name="IEDMService_UpdateFile_InputMessage">
<wsdl:part name="parameters" element="tns:UpdateFile" />
@ -70,11 +70,11 @@
<wsdl:message name="IEDMService_DeleteFile_OutputMessage">
<wsdl:part name="parameters" element="tns:DeleteFileResponse" />
</wsdl:message>
<wsdl:message name="IEDMService_SetFileIndex_InputMessage">
<wsdl:part name="parameters" element="tns:SetFileIndex" />
<wsdl:message name="IEDMService_NewFileIndex_InputMessage">
<wsdl:part name="parameters" element="tns:NewFileIndex" />
</wsdl:message>
<wsdl:message name="IEDMService_SetFileIndex_OutputMessage">
<wsdl:part name="parameters" element="tns:SetFileIndexResponse" />
<wsdl:message name="IEDMService_NewFileIndex_OutputMessage">
<wsdl:part name="parameters" element="tns:NewFileIndexResponse" />
</wsdl:message>
<wsdl:portType name="IEDMService">
<wsdl:operation name="Heartbeat">
@ -101,9 +101,9 @@
<wsdl:input wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/ExecuteNonQuery" message="tns:IEDMService_ExecuteNonQuery_InputMessage" />
<wsdl:output wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/ExecuteNonQueryResponse" message="tns:IEDMService_ExecuteNonQuery_OutputMessage" />
</wsdl:operation>
<wsdl:operation name="CreateFile">
<wsdl:input wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/CreateFile" message="tns:IEDMService_CreateFile_InputMessage" />
<wsdl:output wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/CreateFileResponse" message="tns:IEDMService_CreateFile_OutputMessage" />
<wsdl:operation name="NewFile">
<wsdl:input wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/NewFile" message="tns:IEDMService_NewFile_InputMessage" />
<wsdl:output wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/NewFileResponse" message="tns:IEDMService_NewFile_OutputMessage" />
</wsdl:operation>
<wsdl:operation name="UpdateFile">
<wsdl:input wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/UpdateFile" message="tns:IEDMService_UpdateFile_InputMessage" />
@ -117,9 +117,9 @@
<wsdl:input wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/DeleteFile" message="tns:IEDMService_DeleteFile_InputMessage" />
<wsdl:output wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/DeleteFileResponse" message="tns:IEDMService_DeleteFile_OutputMessage" />
</wsdl:operation>
<wsdl:operation name="SetFileIndex">
<wsdl:input wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/SetFileIndex" message="tns:IEDMService_SetFileIndex_InputMessage" />
<wsdl:output wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/SetFileIndexResponse" message="tns:IEDMService_SetFileIndex_OutputMessage" />
<wsdl:operation name="NewFileIndex">
<wsdl:input wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/NewFileIndex" message="tns:IEDMService_NewFileIndex_InputMessage" />
<wsdl:output wsaw:Action="http://DigitalData.Services.EDMService/IEDMService/NewFileIndexResponse" message="tns:IEDMService_NewFileIndex_OutputMessage" />
</wsdl:operation>
</wsdl:portType>
</wsdl:definitions>

View File

@ -81,7 +81,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CreateFile">
<xs:element name="NewFile">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="FileName" nillable="true" type="xs:string" />
@ -89,10 +89,10 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CreateFileResponse">
<xs:element name="NewFileResponse">
<xs:complexType>
<xs:sequence>
<xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService" minOccurs="0" name="CreateFileResult" nillable="true" type="q4:DocumentResult" />
<xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService" minOccurs="0" name="NewFileResult" nillable="true" type="q4:DocumentResult" />
</xs:sequence>
</xs:complexType>
</xs:element>
@ -139,19 +139,20 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="SetFileIndex">
<xs:element name="NewFileIndex">
<xs:complexType>
<xs:sequence>
<xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" minOccurs="0" name="DocObject" nillable="true" type="q10:DocumentObject" />
<xs:element minOccurs="0" name="Syskey" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="LanguageCode" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Value" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="SetFileIndexResponse">
<xs:element name="NewFileIndexResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="SetFileIndexResult" nillable="true" type="xs:anyType" />
<xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService" minOccurs="0" name="NewFileIndexResult" nillable="true" type="q11:IndexResult" />
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@ -2,49 +2,73 @@
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
<xs:complexType name="TableResult">
<xs:sequence>
<xs:element minOccurs="0" name="ErrorMessage" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="OK" type="xs:boolean" />
<xs:element minOccurs="0" name="Table" nillable="true">
<xs:complexType>
<xs:annotation>
<xs:appinfo>
<ActualType Name="DataTable" Namespace="http://schemas.datacontract.org/2004/07/System.Data" xmlns="http://schemas.microsoft.com/2003/10/Serialization/">
</ActualType>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax" />
<xs:any minOccurs="1" namespace="urn:schemas-microsoft-com:xml-diffgram-v1" processContents="lax" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:complexContent mixed="false">
<xs:extension base="tns:BaseResult">
<xs:sequence>
<xs:element minOccurs="0" name="Table" nillable="true">
<xs:complexType>
<xs:annotation>
<xs:appinfo>
<ActualType Name="DataTable" Namespace="http://schemas.datacontract.org/2004/07/System.Data" xmlns="http://schemas.microsoft.com/2003/10/Serialization/">
</ActualType>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax" />
<xs:any minOccurs="1" namespace="urn:schemas-microsoft-com:xml-diffgram-v1" processContents="lax" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:element name="TableResult" nillable="true" type="tns:TableResult" />
<xs:complexType name="ScalarResult">
<xs:complexType name="BaseResult">
<xs:sequence>
<xs:element minOccurs="0" name="ErrorMessage" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="OK" type="xs:boolean" />
<xs:element minOccurs="0" name="Scalar" nillable="true" type="xs:anyType" />
</xs:sequence>
</xs:complexType>
<xs:element name="BaseResult" nillable="true" type="tns:BaseResult" />
<xs:complexType name="ScalarResult">
<xs:complexContent mixed="false">
<xs:extension base="tns:BaseResult">
<xs:sequence>
<xs:element minOccurs="0" name="Scalar" nillable="true" type="xs:anyType" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:element name="ScalarResult" nillable="true" type="tns:ScalarResult" />
<xs:complexType name="NonQueryResult">
<xs:sequence>
<xs:element minOccurs="0" name="ErrorMessage" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="OK" type="xs:boolean" />
</xs:sequence>
<xs:complexContent mixed="false">
<xs:extension base="tns:BaseResult">
<xs:sequence />
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:element name="NonQueryResult" nillable="true" type="tns:NonQueryResult" />
<xs:complexType name="DocumentResult">
<xs:sequence>
<xs:element name="Contents" nillable="true" type="xs:base64Binary" />
<xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" name="Document" nillable="true" type="q1:DocumentObject" />
<xs:element name="ErrorMessage" nillable="true" type="xs:string" />
<xs:element name="HasContents" type="xs:boolean" />
<xs:element name="OK" type="xs:boolean" />
</xs:sequence>
<xs:complexContent mixed="false">
<xs:extension base="tns:BaseResult">
<xs:sequence>
<xs:element name="Contents" nillable="true" type="xs:base64Binary" />
<xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" name="Document" nillable="true" type="q1:DocumentObject" />
<xs:element name="HasContents" type="xs:boolean" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:element name="DocumentResult" nillable="true" type="tns:DocumentResult" />
<xs:complexType name="IndexResult">
<xs:complexContent mixed="false">
<xs:extension base="tns:BaseResult">
<xs:sequence>
<xs:element name="IndexId" type="xs:long" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:element name="IndexResult" nillable="true" type="tns:IndexResult" />
</xs:schema>

View File

@ -27,8 +27,8 @@
<MetadataFile FileName="DigitalData.Services.EDMService.xsd" MetadataType="Schema" ID="6bd4ecfb-6ea9-4cfe-998c-0fce4cefb734" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
<MetadataFile FileName="service.xsd" MetadataType="Schema" ID="e3578761-b797-44ca-b8c5-3c9c25394c73" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
<MetadataFile FileName="DigitalData.Services.EDMService1.xsd" MetadataType="Schema" ID="32726e00-1240-449f-a580-881af6e8839c" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
<MetadataFile FileName="System.Data.xsd" MetadataType="Schema" ID="726d8c80-557e-49ba-9cfd-3da491f48c1e" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
<MetadataFile FileName="System.xsd" MetadataType="Schema" ID="d73cd0a9-b834-4be2-9d31-4d8175f9e00c" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
<MetadataFile FileName="System.Data.xsd" MetadataType="Schema" ID="726d8c80-557e-49ba-9cfd-3da491f48c1e" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
<MetadataFile FileName="DigitalData.Modules.Filesystem.xsd" MetadataType="Schema" ID="72dd325b-17bf-4ec7-8a3e-933c17eca5d5" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
</Metadata>
<Extensions>

View File

@ -18,9 +18,14 @@ Namespace EDMIServiceReference
<System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService"), _
System.SerializableAttribute()> _
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
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private OKField As Boolean
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private TableField As System.Data.DataTable
<Global.System.ComponentModel.BrowsableAttribute(false)> _
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
<System.Runtime.Serialization.DataMemberAttribute()> _
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
<System.NonSerializedAttribute()> _
Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private ErrorMessageField As String
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private OKField As Boolean
Inherits EDMIServiceReference.BaseResult
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private ScalarField As Object
<Global.System.ComponentModel.BrowsableAttribute(false)> _
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
<System.Runtime.Serialization.DataMemberAttribute()> _
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
<System.Runtime.Serialization.DataMemberAttribute()> _
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
<System.Runtime.Serialization.DataMemberAttribute()> _
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
<System.Diagnostics.DebuggerStepThroughAttribute(), _
@ -184,62 +120,7 @@ Namespace EDMIServiceReference
System.Runtime.Serialization.DataContractAttribute(Name:="NonQueryResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService"), _
System.SerializableAttribute()> _
Partial Public Class NonQueryResult
Inherits Object
Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
<System.NonSerializedAttribute()> _
Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private ErrorMessageField As String
<System.Runtime.Serialization.OptionalFieldAttribute()> _
Private OKField As Boolean
<Global.System.ComponentModel.BrowsableAttribute(false)> _
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
<System.Runtime.Serialization.DataMemberAttribute()> _
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
<System.Runtime.Serialization.DataMemberAttribute()> _
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
<System.Diagnostics.DebuggerStepThroughAttribute(), _
@ -247,32 +128,14 @@ Namespace EDMIServiceReference
System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService"), _
System.SerializableAttribute()> _
Partial Public Class DocumentResult
Inherits Object
Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
<System.NonSerializedAttribute()> _
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
<Global.System.ComponentModel.BrowsableAttribute(false)> _
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
<System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)> _
Public Property Contents() As Byte()
Get
@ -299,19 +162,6 @@ Namespace EDMIServiceReference
End Set
End Property
<System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)> _
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
<System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)> _
Public Property HasContents() As Boolean
Get
@ -324,28 +174,53 @@ Namespace EDMIServiceReference
End If
End Set
End Property
End Class
<System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="IndexResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService"), _
System.SerializableAttribute()> _
Partial Public Class IndexResult
Inherits EDMIServiceReference.BaseResult
Private IndexIdField As Long
<System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)> _
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
<System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMService"), _
System.SerializableAttribute()> _
Partial Public Class TableResult
Inherits EDMIServiceReference.BaseResult
Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
<System.Runtime.Serialization.OptionalFieldAttribute()> _
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
<System.Runtime.Serialization.DataMemberAttribute()> _
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
<System.Diagnostics.DebuggerStepThroughAttribute(), _
@ -464,11 +339,11 @@ Namespace EDMIServiceReference
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/ExecuteNonQueryResponse")> _
Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/CreateFile", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/CreateFileResponse")> _
Function CreateFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/NewFile", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/NewFileResponse")> _
Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/CreateFile", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/CreateFileResponse")> _
Function CreateFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult)
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/NewFile", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/NewFileResponse")> _
Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult)
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/UpdateFile", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/UpdateFileResponse")> _
Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult
@ -488,17 +363,11 @@ Namespace EDMIServiceReference
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/DeleteFile", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/DeleteFileResponse")> _
Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean)
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/SetFileIndex", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/SetFileIndexResponse"), _
System.ServiceModel.ServiceKnownTypeAttribute(GetType(EDMIServiceReference.TableResult)), _
System.ServiceModel.ServiceKnownTypeAttribute(GetType(EDMIServiceReference.ScalarResult)), _
System.ServiceModel.ServiceKnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)), _
System.ServiceModel.ServiceKnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult)), _
System.ServiceModel.ServiceKnownTypeAttribute(GetType(System.DBNull)), _
System.ServiceModel.ServiceKnownTypeAttribute(GetType(EDMIServiceReference.DocumentObject))> _
Function SetFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal Value As String) As Object
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/NewFileIndex", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/NewFileIndexResponse")> _
Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/SetFileIndex", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/SetFileIndexResponse")> _
Function SetFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal Value As String) As System.Threading.Tasks.Task(Of Object)
<System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMService/IEDMService/NewFileIndex", ReplyAction:="http://DigitalData.Services.EDMService/IEDMService/NewFileIndexResponse")> _
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
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")> _
@ -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

View File

@ -93,8 +93,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="CreateFile">
<soap12:operation soapAction="http://DigitalData.Services.EDMService/IEDMService/CreateFile" style="document" />
<wsdl:operation name="NewFile">
<soap12:operation soapAction="http://DigitalData.Services.EDMService/IEDMService/NewFile" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>
@ -129,8 +129,8 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="SetFileIndex">
<soap12:operation soapAction="http://DigitalData.Services.EDMService/IEDMService/SetFileIndex" style="document" />
<wsdl:operation name="NewFileIndex">
<soap12:operation soapAction="http://DigitalData.Services.EDMService/IEDMService/NewFileIndex" style="document" />
<wsdl:input>
<soap12:body use="literal" />
</wsdl:input>

View File

@ -53,32 +53,14 @@ Public Class Document
''' </summary>
''' <param name="FilePath">The filename to import</param>
''' <returns>A document object</returns>
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
''' <summary>
''' Imports a file by filename
''' </summary>
''' <param name="FilePath">The filename to import</param>
''' <returns>A document object</returns>
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

View File

@ -108,6 +108,9 @@
<None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMIFileOps.EDMIServiceReference.DocumentResult.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMIFileOps.EDMIServiceReference.IndexResult.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMIFileOps.EDMIServiceReference.NonQueryResult.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>

View File

@ -84,11 +84,13 @@
</ItemGroup>
<ItemGroup>
<Compile Include="AppConfig.vb" />
<Compile Include="ContainerResult.vb" />
<Compile Include="DocumentResult.vb" />
<Compile Include="Results\BaseResult.vb" />
<Compile Include="Results\ContainerResult.vb" />
<Compile Include="Results\DocumentResult.vb" />
<Compile Include="Exceptions.vb" />
<Compile Include="DatabaseResult.vb" />
<Compile Include="Results\DatabaseResult.vb" />
<Compile Include="EDMService.vb" />
<Compile Include="Results\IndexResult.vb" />
<Compile Include="WindowsService.vb">
<SubType>Component</SubType>
</Compile>

View File

@ -1,54 +0,0 @@
Imports System.Runtime.Serialization
<Serializable>
<DataContract>
<KnownType(GetType(DBNull))>
Public Class TableResult
<DataMember>
Public Property OK As Boolean
<DataMember>
Public Property ErrorMessage As String
<DataMember>
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
<Serializable>
<DataContract>
<KnownType(GetType(DBNull))>
Public Class ScalarResult
<DataMember>
Public Property OK As Boolean
<DataMember>
Public Property ErrorMessage As String
<DataMember>
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
<Serializable>
<DataContract>
<KnownType(GetType(DBNull))>
Public Class NonQueryResult
<DataMember>
Public Property OK As Boolean
<DataMember>
Public Property ErrorMessage As String
Public Sub New(OK As Boolean, ErrorMessage As String)
Me.OK = OK
Me.ErrorMessage = ErrorMessage
End Sub
End Class

View File

@ -1,20 +0,0 @@
Imports DigitalData.Modules.Filesystem
<Serializable>
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

View File

@ -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

View File

@ -28,7 +28,7 @@ Interface IEDMService
#Region "Document"
<OperationContract>
Function CreateFile(FileName As String, Contents As Byte()) As DocumentResult
Function NewFile(FileName As String, Contents As Byte()) As DocumentResult
<OperationContract>
Function UpdateFile(DocObject As DocumentObject, Contents As Byte()) As DocumentResult
@ -42,7 +42,7 @@ Interface IEDMService
#Region "Index"
<OperationContract>
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

View File

@ -0,0 +1,20 @@
Imports System.Runtime.Serialization
<Serializable>
<DataContract>
<KnownType(GetType(DBNull))>
Public Class BaseResult
<DataMember>
Public Property OK As Boolean
<DataMember>
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

View File

@ -0,0 +1,56 @@
Imports System.Runtime.Serialization
<Serializable>
<DataContract>
<KnownType(GetType(DBNull))>
Public Class TableResult
Inherits BaseResult
<DataMember>
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
<Serializable>
<DataContract>
<KnownType(GetType(DBNull))>
Public Class ScalarResult
Inherits BaseResult
<DataMember>
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
<Serializable>
<DataContract>
<KnownType(GetType(DBNull))>
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

View File

@ -0,0 +1,26 @@
Imports DigitalData.Modules.Filesystem
<Serializable>
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

View File

@ -0,0 +1,17 @@
Imports DigitalData.Modules.Filesystem
<Serializable>
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