Mercurial > hg > orthanc

comparison OrthancServer/Internals/MoveScp.cpp @ 62:a70bb32802ae orthanc-renaming

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renaming Server
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 16 Sep 2012 09:33:19 +0200
parents 4bc019d2f969
children 428784e59dcd
comparison
equal deleted inserted replaced
61:d1c511efd6b1 62:a70bb32802ae
1 /** 1 /**
2 * Palanthir - A Lightweight, RESTful DICOM Store 2 * Orthanc - A Lightweight, RESTful DICOM Store
3 * Copyright (C) 2012 Medical Physics Department, CHU of Liege, 3 * Copyright (C) 2012 Medical Physics Department, CHU of Liege,
4 * Belgium 4 * Belgium
5 * 5 *
6 * This program is free software: you can redistribute it and/or 6 * This program is free software: you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License as 7 * modify it under the terms of the GNU General Public License as
22 22
23 #include <memory> 23 #include <memory>
24 24
25 #include "../FromDcmtkBridge.h" 25 #include "../FromDcmtkBridge.h"
26 #include "../ToDcmtkBridge.h" 26 #include "../ToDcmtkBridge.h"
27 #include "../../Core/PalanthirException.h" 27 #include "../../Core/OrthancException.h"
28 28
29 #include <dcmtk/dcmdata/dcfilefo.h> 29 #include <dcmtk/dcmdata/dcfilefo.h>
30 #include <dcmtk/dcmdata/dcmetinf.h> 30 #include <dcmtk/dcmdata/dcmetinf.h>
31 #include <dcmtk/dcmdata/dcostrmb.h> 31 #include <dcmtk/dcmdata/dcostrmb.h>
32 #include <dcmtk/dcmdata/dcdeftag.h> 32 #include <dcmtk/dcmdata/dcdeftag.h>
33 #include <dcmtk/dcmnet/diutil.h> 33 #include <dcmtk/dcmnet/diutil.h>
34 34
35 35
36 namespace Palanthir 36 namespace Orthanc
37 { 37 {
38 namespace Internals 38 namespace Internals
39 { 39 {
40 extern OFLogger Logger; 40 extern OFLogger Logger;
41 } 41 }
82 data.iterator_.reset(data.handler_->Handle(data.target_, data.input_)); 82 data.iterator_.reset(data.handler_->Handle(data.target_, data.input_));
83 data.subOperationCount_ = data.iterator_->GetSubOperationCount(); 83 data.subOperationCount_ = data.iterator_->GetSubOperationCount();
84 data.failureCount_ = 0; 84 data.failureCount_ = 0;
85 data.warningCount_ = 0; 85 data.warningCount_ = 0;
86 } 86 }
87 catch (PalanthirException& e) 87 catch (OrthancException& e)
88 { 88 {
89 // Internal error! 89 // Internal error!
90 OFLOG_ERROR(Internals::Logger, "IMoveRequestHandler Failed: " << e.What()); 90 OFLOG_ERROR(Internals::Logger, "IMoveRequestHandler Failed: " << e.What());
91 response->DimseStatus = STATUS_MOVE_Failed_UnableToProcess; 91 response->DimseStatus = STATUS_MOVE_Failed_UnableToProcess;
92 return; 92 return;
111 111
112 try 112 try
113 { 113 {
114 status = data.iterator_->DoNext(); 114 status = data.iterator_->DoNext();
115 } 115 }
116 catch (PalanthirException& e) 116 catch (OrthancException& e)
117 { 117 {
118 // Internal error! 118 // Internal error!
119 OFLOG_ERROR(Internals::Logger, "IMoveRequestHandler Failed: " << e.What()); 119 OFLOG_ERROR(Internals::Logger, "IMoveRequestHandler Failed: " << e.What());
120 response->DimseStatus = STATUS_MOVE_Failed_UnableToProcess; 120 response->DimseStatus = STATUS_MOVE_Failed_UnableToProcess;
121 return; 121 return;