Mercurial > hg > orthanc
comparison OrthancServer/Internals/FindScp.cpp @ 102:7593b57dc1bf
switch to google log
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 03 Oct 2012 16:28:13 +0200 |
parents | 428784e59dcd |
children | e759f777cb72 |
comparison
equal
deleted
inserted
replaced
101:428784e59dcd | 102:7593b57dc1bf |
---|---|
20 | 20 |
21 #include "FindScp.h" | 21 #include "FindScp.h" |
22 | 22 |
23 #include "../FromDcmtkBridge.h" | 23 #include "../FromDcmtkBridge.h" |
24 #include "../ToDcmtkBridge.h" | 24 #include "../ToDcmtkBridge.h" |
25 #include "DcmtkLogging.h" | |
26 #include "../../Core/OrthancException.h" | 25 #include "../../Core/OrthancException.h" |
27 | 26 |
28 #include <dcmtk/dcmdata/dcfilefo.h> | 27 #include <dcmtk/dcmdata/dcfilefo.h> |
29 #include <dcmtk/dcmdata/dcmetinf.h> | 28 #include <dcmtk/dcmdata/dcmetinf.h> |
30 #include <dcmtk/dcmdata/dcostrmb.h> | 29 #include <dcmtk/dcmdata/dcostrmb.h> |
31 #include <dcmtk/dcmdata/dcdeftag.h> | 30 #include <dcmtk/dcmdata/dcdeftag.h> |
32 #include <dcmtk/dcmnet/diutil.h> | 31 #include <dcmtk/dcmnet/diutil.h> |
32 #include <glog/logging.h> | |
33 | 33 |
34 | 34 |
35 namespace Orthanc | 35 namespace Orthanc |
36 { | 36 { |
37 namespace | 37 namespace |
70 data.handler_->Handle(data.input_, data.answers_); | 70 data.handler_->Handle(data.input_, data.answers_); |
71 } | 71 } |
72 catch (OrthancException& e) | 72 catch (OrthancException& e) |
73 { | 73 { |
74 // Internal error! | 74 // Internal error! |
75 LOG4CPP_ERROR(Internals::GetLogger(), "IFindRequestHandler Failed: " + std::string(e.What())); | 75 LOG(ERROR) << "IFindRequestHandler Failed: " << e.What(); |
76 response->DimseStatus = STATUS_FIND_Failed_UnableToProcess; | 76 response->DimseStatus = STATUS_FIND_Failed_UnableToProcess; |
77 *responseIdentifiers = NULL; | 77 *responseIdentifiers = NULL; |
78 return; | 78 return; |
79 } | 79 } |
80 | 80 |
118 | 118 |
119 // if some error occured, dump corresponding information and remove the outfile if necessary | 119 // if some error occured, dump corresponding information and remove the outfile if necessary |
120 if (cond.bad()) | 120 if (cond.bad()) |
121 { | 121 { |
122 OFString temp_str; | 122 OFString temp_str; |
123 LOG4CPP_ERROR(Internals::GetLogger(), "Find SCP Failed: " + std::string(cond.text())); | 123 LOG(ERROR) << "Find SCP Failed: " << cond.text(); |
124 } | 124 } |
125 | 125 |
126 return cond; | 126 return cond; |
127 } | 127 } |
128 } | 128 } |