Mercurial > hg > orthanc

comparison OrthancServer/OrthancFindRequestHandler.cpp @ 1737:ec66a16aa398

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removal of DicomStringValue and DicomNullValue
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 22 Oct 2015 07:52:24 +0200
parents bd1889029cbb
children fb569ee09a69
comparison
equal deleted inserted replaced
1736:b953c6eef28d 1737:ec66a16aa398
238 /** 238 /**
239 * Retrieve the query level. 239 * Retrieve the query level.
240 **/ 240 **/
241 241
242 const DicomValue* levelTmp = input.TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL); 242 const DicomValue* levelTmp = input.TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL);
243 if (levelTmp == NULL) 243 if (levelTmp == NULL ||
244 levelTmp->IsNull() ||
245 levelTmp->IsBinary())
244 { 246 {
245 throw OrthancException(ErrorCode_BadRequest); 247 throw OrthancException(ErrorCode_BadRequest);
246 } 248 }
247 249
248 ResourceType level = StringToResourceType(levelTmp->AsString().c_str()); 250 ResourceType level = StringToResourceType(levelTmp->GetContent().c_str());
249 251
250 if (level != ResourceType_Patient && 252 if (level != ResourceType_Patient &&
251 level != ResourceType_Study && 253 level != ResourceType_Study &&
252 level != ResourceType_Series && 254 level != ResourceType_Series &&
253 level != ResourceType_Instance) 255 level != ResourceType_Instance)
263 { 265 {
264 if (!query.GetElement(i).GetValue().IsNull()) 266 if (!query.GetElement(i).GetValue().IsNull())
265 { 267 {
266 LOG(INFO) << " " << query.GetElement(i).GetTag() 268 LOG(INFO) << " " << query.GetElement(i).GetTag()
267 << " " << FromDcmtkBridge::GetName(query.GetElement(i).GetTag()) 269 << " " << FromDcmtkBridge::GetName(query.GetElement(i).GetTag())
268 << " = " << query.GetElement(i).GetValue().AsString(); 270 << " = " << query.GetElement(i).GetValue().GetContent();
269 } 271 }
270 } 272 }
271 273
272 274
273 /** 275 /**
286 tag == DICOM_TAG_SPECIFIC_CHARACTER_SET) 288 tag == DICOM_TAG_SPECIFIC_CHARACTER_SET)
287 { 289 {
288 continue; 290 continue;
289 } 291 }
290 292
291 std::string value = query.GetElement(i).GetValue().AsString(); 293 std::string value = query.GetElement(i).GetValue().GetContent();
292 if (value.size() == 0) 294 if (value.size() == 0)
293 { 295 {
294 // An empty string corresponds to a "*" wildcard constraint, so we ignore it 296 // An empty string corresponds to a "*" wildcard constraint, so we ignore it
295 continue; 297 continue;
296 } 298 }