comparison 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
comparison
equal deleted inserted replaced
1005:84b6d7bca6db 1006:649d47854314
100 /* out */ unsigned int& countSeries, 100 /* out */ unsigned int& countSeries,
101 /* out */ unsigned int& countInstances, 101 /* out */ unsigned int& countInstances,
102 /* in */ int64_t id, 102 /* in */ int64_t id,
103 /* in */ ResourceType type); 103 /* in */ ResourceType type);
104 104
105 StoreStatus Store(const DicomMap& dicomSummary,
106 const Attachments& attachments,
107 const std::string& remoteAet,
108 MetadataMap* metadata);
109
110 public: 105 public:
111 ServerIndex(ServerContext& context, 106 ServerIndex(ServerContext& context,
112 const std::string& dbPath); 107 const std::string& dbPath);
113 108
114 ~ServerIndex(); 109 ~ServerIndex();
127 void SetMaximumStorageSize(uint64_t size); 122 void SetMaximumStorageSize(uint64_t size);
128 123
129 // "count == 0" means no limit on the number of patients 124 // "count == 0" means no limit on the number of patients
130 void SetMaximumPatientCount(unsigned int count); 125 void SetMaximumPatientCount(unsigned int count);
131 126
132 StoreStatus Store(const DicomMap& dicomSummary, 127 StoreStatus Store(std::map<MetadataType, std::string>& instanceMetadata,
133 const Attachments& attachments, 128 const DicomMap& dicomSummary,
134 const std::string& remoteAet)
135 {
136 return Store(dicomSummary, attachments, remoteAet, NULL);
137 }
138
139 StoreStatus Store(const DicomMap& dicomSummary,
140 const Attachments& attachments, 129 const Attachments& attachments,
141 const std::string& remoteAet, 130 const std::string& remoteAet,
142 MetadataMap& metadata) 131 const MetadataMap& metadata);
143 {
144 return Store(dicomSummary, attachments, remoteAet, &metadata);
145 }
146 132
147 void ComputeStatistics(Json::Value& target); 133 void ComputeStatistics(Json::Value& target);
148 134
149 bool LookupResource(Json::Value& result, 135 bool LookupResource(Json::Value& result,
150 const std::string& publicId, 136 const std::string& publicId,