diff OrthancServer/ServerIndex.h @ 1006:649d47854314 lua-scripting

proper handling of metadata in Store
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 08 Jul 2014 15:11:00 +0200
parents a226e0959d8b
children f167b672db94
line wrap: on
line diff
--- a/OrthancServer/ServerIndex.h	Tue Jul 08 14:34:11 2014 +0200
+++ b/OrthancServer/ServerIndex.h	Tue Jul 08 15:11:00 2014 +0200
@@ -102,11 +102,6 @@
                                /* in  */ int64_t id,
                                /* in  */ ResourceType type);
 
-    StoreStatus Store(const DicomMap& dicomSummary,
-                      const Attachments& attachments,
-                      const std::string& remoteAet,
-                      MetadataMap* metadata);
-
   public:
     ServerIndex(ServerContext& context,
                 const std::string& dbPath);
@@ -129,20 +124,11 @@
     // "count == 0" means no limit on the number of patients
     void SetMaximumPatientCount(unsigned int count);
 
-    StoreStatus Store(const DicomMap& dicomSummary,
-                      const Attachments& attachments,
-                      const std::string& remoteAet)
-    {
-      return Store(dicomSummary, attachments, remoteAet, NULL);
-    }
-
-    StoreStatus Store(const DicomMap& dicomSummary,
+    StoreStatus Store(std::map<MetadataType, std::string>& instanceMetadata,
+                      const DicomMap& dicomSummary,
                       const Attachments& attachments,
                       const std::string& remoteAet,
-                      MetadataMap& metadata)
-    {
-      return Store(dicomSummary, attachments, remoteAet, &metadata);
-    }
+                      const MetadataMap& metadata);
 
     void ComputeStatistics(Json::Value& target);