comparison Framework/Plugins/OrthancCppDatabasePlugin.h @ 70:e6c13ddd26d9 db-changes

all integration tests passing with LookupResources extension
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 03 Jan 2019 14:04:46 +0100
parents 19764fc60ade
children d40c5fecd160
comparison
equal deleted inserted replaced
69:19764fc60ade 70:e6c13ddd26d9
249 249
250 OrthancPluginDatabaseAnswerExportedResource(context_, database_, &exported); 250 OrthancPluginDatabaseAnswerExportedResource(context_, database_, &exported);
251 } 251 }
252 252
253 253
254 #if defined(ORTHANC_PLUGINS_VERSION_IS_ABOVE) // Macro introduced in Orthanc 1.3.1 254 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
255 # if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 2)
256 void AnswerMatchingResource(const std::string& resourceId) 255 void AnswerMatchingResource(const std::string& resourceId)
257 { 256 {
258 if (allowedAnswers_ != AllowedAnswers_All && 257 if (allowedAnswers_ != AllowedAnswers_All &&
259 allowedAnswers_ != AllowedAnswers_MatchingResource) 258 allowedAnswers_ != AllowedAnswers_MatchingResource)
260 { 259 {
265 match.resourceId = resourceId.c_str(); 264 match.resourceId = resourceId.c_str();
266 match.someInstanceId = NULL; 265 match.someInstanceId = NULL;
267 266
268 OrthancPluginDatabaseAnswerMatchingResource(context_, database_, &match); 267 OrthancPluginDatabaseAnswerMatchingResource(context_, database_, &match);
269 } 268 }
270 269 #endif
271 270
271
272 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
272 void AnswerMatchingResource(const std::string& resourceId, 273 void AnswerMatchingResource(const std::string& resourceId,
273 const std::string& someInstanceId) 274 const std::string& someInstanceId)
274 { 275 {
275 if (allowedAnswers_ != AllowedAnswers_All && 276 if (allowedAnswers_ != AllowedAnswers_All &&
276 allowedAnswers_ != AllowedAnswers_MatchingResource) 277 allowedAnswers_ != AllowedAnswers_MatchingResource)
282 match.resourceId = resourceId.c_str(); 283 match.resourceId = resourceId.c_str();
283 match.someInstanceId = someInstanceId.c_str(); 284 match.someInstanceId = someInstanceId.c_str();
284 285
285 OrthancPluginDatabaseAnswerMatchingResource(context_, database_, &match); 286 OrthancPluginDatabaseAnswerMatchingResource(context_, database_, &match);
286 } 287 }
287 # endif
288 #endif 288 #endif
289 }; 289 };
290 290
291 291
292 /** 292 /**