--- a/OrthancServer/ServerContext.h	Fri Jul 04 16:51:33 2014 +0200
+++ b/OrthancServer/ServerContext.h	Tue Jul 08 14:06:05 2014 +0200
@@ -41,6 +41,7 @@
 #include "ParsedDicomFile.h"
 #include "DicomProtocol/ReusableDicomUserConnection.h"
 #include "Scheduler/ServerScheduler.h"
+#include "DicomInstanceToStore.h"
 
 namespace Orthanc
 {
@@ -86,6 +87,11 @@
     boost::mutex luaMutex_;
     LuaContext lua_;
 
+    StoreStatus Store(std::string& resultPublicId,
+                      const char* dicomBuffer,
+                      size_t dicomSize,
+                      const ServerIndex::MetadataMap& metadata = ServerIndex::MetadataMap());
+
   public:
     class DicomCacheLocker : public boost::noncopyable
     {
@@ -152,6 +158,9 @@
 
 
     // TODO SIMPLIFY THESE MANY "Store" methods!
+    StoreStatus Store(std::string& resultPublicId,
+                      DicomInstanceToStore& dicom);
+
     StoreStatus Store(const char* dicomInstance,
                       size_t dicomSize,
                       const DicomMap& dicomSummary,
@@ -170,11 +179,6 @@
                       const ServerIndex::MetadataMap& metadata = ServerIndex::MetadataMap());
 
     StoreStatus Store(std::string& resultPublicId,
-                      const char* dicomBuffer,
-                      size_t dicomSize,
-                      const ServerIndex::MetadataMap& metadata = ServerIndex::MetadataMap());
-
-    StoreStatus Store(std::string& resultPublicId,
                       const std::string& dicomContent,
                       const ServerIndex::MetadataMap& metadata = ServerIndex::MetadataMap());