general clean up, add file contents to getdocumentbyx methods

SERVICES/DDEDM_NetworkService/EDMService.vb

@@ -254,7 +254,13 @@ Public Class EDMService
                 oRow.Item("ORIGINAL_FILENAME")
             )
 
-            Return New DocumentResult(oDocument)
+            TestFileExists(oDocument.ContainerId)
+
+            Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
+            Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
+            Dim oContents As Byte() = oContainer.GetFile().Contents
+
+            Return New DocumentResult(oDocument, oContents)
         Catch ex As Exception
             Return New DocumentResult(ex.Message)
         End Try
@@ -276,7 +282,13 @@ Public Class EDMService
                 oRow.Item("ORIGINAL_FILENAME")
             )
 
-            Return New DocumentResult(oDocument)
+            TestFileExists(oDocument.ContainerId)
+
+            Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
+            Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
+            Dim oContents As Byte() = oContainer.GetFile().Contents
+
+            Return New DocumentResult(oDocument, oContents)
         Catch ex As Exception
             Return New DocumentResult(ex.Message)
         End Try

SERVICES/DDEDM_NetworkService/IEDMService.vb

@@ -38,6 +38,8 @@ Interface IEDMService
 
     <OperationContract>
     Function DeleteFile(DocObject As DocumentObject) As Boolean
+
+
 #End Region
 
 #Region "Utils"

SERVICES/DDEDM_NetworkService/Results/BaseResult.vb

@@ -3,7 +3,7 @@
 <Serializable>
 <DataContract>
 <KnownType(GetType(DBNull))>
-Public Class BaseResult
+Public MustInherit Class BaseResult
     <DataMember>
     Public Property OK As Boolean
     <DataMember>