Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.cpp @ 4285:544120b34c09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 04 Nov 2020 16:27:59 +0100
parents 756126cd2219
children 5b254bd435d3
comparison
equal deleted inserted replaced
4284:756126cd2219 4285:544120b34c09
77 << DIMSE_dumpMessage(str, *response, DIMSE_INCOMING); 77 << DIMSE_dumpMessage(str, *response, DIMSE_INCOMING);
78 } 78 }
79 79
80 if (responseIdentifiers != NULL) 80 if (responseIdentifiers != NULL)
81 { 81 {
82 CLOG(TRACE, DICOM) << "Response Identifiers " << responseCount << ":" << std::endl 82 std::stringstream s; // This is necessary for VS2008
83 << DcmObject::PrintHelper(*responseIdentifiers); 83 s << DcmObject::PrintHelper(*responseIdentifiers);
84 CLOG(TRACE, DICOM) << "Response Identifiers " << responseCount << ":" << std::endl << s.str();
84 } 85 }
85 86
86 if (responseIdentifiers != NULL) 87 if (responseIdentifiers != NULL)
87 { 88 {
88 FindPayload& payload = *reinterpret_cast<FindPayload*>(callbackData); 89 FindPayload& payload = *reinterpret_cast<FindPayload*>(callbackData);
280 #if DCMTK_VERSION_NUMBER >= 364 281 #if DCMTK_VERSION_NUMBER >= 364
281 int responseCount; 282 int responseCount;
282 #endif 283 #endif
283 284
284 { 285 {
286 std::stringstream s; // This is necessary for VS2008
287 s << DcmObject::PrintHelper(*dataset);
288
285 OFString str; 289 OFString str;
286 CLOG(TRACE, DICOM) << "Sending Find Request:" << std::endl 290 CLOG(TRACE, DICOM) << "Sending Find Request:" << std::endl
287 << DIMSE_dumpMessage(str, request, DIMSE_OUTGOING, NULL, presID) << std::endl 291 << DIMSE_dumpMessage(str, request, DIMSE_OUTGOING, NULL, presID) << std::endl
288 << DcmObject::PrintHelper(*dataset); 292 << s.str();
289 } 293 }
290 294
291 OFCondition cond = DIMSE_findUser( 295 OFCondition cond = DIMSE_findUser(
292 &association_->GetDcmtkAssociation(), presID, &request, dataset, 296 &association_->GetDcmtkAssociation(), presID, &request, dataset,
293 #if DCMTK_VERSION_NUMBER >= 364 297 #if DCMTK_VERSION_NUMBER >= 364