--- a/OrthancServer/DatabaseWrapper.h	Fri Nov 30 12:18:44 2012 +0100
+++ b/OrthancServer/DatabaseWrapper.h	Fri Nov 30 14:22:27 2012 +0100
@@ -35,6 +35,7 @@
 #include "../Core/SQLite/Connection.h"
 #include "../Core/SQLite/Transaction.h"
 #include "../Core/DicomFormat/DicomInstanceHasher.h"
+#include "../Core/FileStorage/FileInfo.h"
 #include "IServerIndexListener.h"
 
 #include <list>
@@ -107,37 +108,12 @@
                               int64_t id,
                               MetadataType type);
 
-    void AttachFile(int64_t id,
-                    AttachedFileType contentType,
-                    const std::string& fileUuid,
-                    uint64_t compressedSize,
-                    uint64_t uncompressedSize,
-                    CompressionType compressionType);
-
-    void AttachFile(int64_t id,
-                    AttachedFileType contentType,
-                    const std::string& fileUuid,
-                    uint64_t fileSize)
-    {
-      AttachFile(id, contentType, fileUuid, fileSize, fileSize, CompressionType_None);
-    }
+    void AddAttachment(int64_t id,
+                       const FileInfo& attachment);
 
-    bool LookupFile(int64_t id,
-                    AttachedFileType contentType,
-                    std::string& fileUuid,
-                    uint64_t& compressedSize,
-                    uint64_t& uncompressedSize,
-                    CompressionType& compressionType);
-
-    bool LookupFile(int64_t id,
-                    AttachedFileType contentType,
-                    std::string& fileUuid,
-                    uint64_t& uncompressedSize)
-    {
-      uint64_t compressedSize;
-      CompressionType compressionType;
-      return LookupFile(id, contentType, fileUuid, compressedSize, uncompressedSize, compressionType);
-    }
+    bool LookupAttachment(FileInfo& attachment,
+                          int64_t id,
+                          FileType contentType);
 
     void SetMainDicomTags(int64_t id,
                           const DicomMap& tags);