Mercurial > hg > orthanc
annotate OrthancServer/ToDcmtkBridge.cpp @ 1870:a6c431193c79
Improved logging information if upgrade fails
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sat, 05 Dec 2015 12:45:19 +0100 |
| parents | ec66a16aa398 |
| children | b1291df2f780 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics |
|
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
| 0 | 5 * |
| 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 | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 136 | 10 * |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 0 | 22 * |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
| 32 | |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
33 #include "PrecompiledHeadersServer.h" |
| 0 | 34 #include "ToDcmtkBridge.h" |
| 35 | |
| 36 #include <memory> | |
| 37 #include <dcmtk/dcmnet/diutil.h> | |
| 38 | |
| 39 | |
| 62 | 40 namespace Orthanc |
| 0 | 41 { |
| 42 DcmTagKey ToDcmtkBridge::Convert(const DicomTag& tag) | |
| 43 { | |
| 44 return DcmTagKey(tag.GetGroup(), tag.GetElement()); | |
| 45 } | |
| 46 | |
| 47 | |
| 48 DcmDataset* ToDcmtkBridge::Convert(const DicomMap& map) | |
| 49 { | |
| 50 std::auto_ptr<DcmDataset> result(new DcmDataset); | |
| 51 | |
| 52 for (DicomMap::Map::const_iterator | |
| 656 | 53 it = map.map_.begin(); it != map.map_.end(); ++it) |
| 0 | 54 { |
|
1737
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
55 if (!it->second->IsNull()) |
|
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
56 { |
|
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
57 std::string s = it->second->GetContent(); |
|
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
58 DU_putStringDOElement(result.get(), Convert(it->first), s.c_str()); |
|
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
59 } |
| 0 | 60 } |
| 61 | |
| 62 return result.release(); | |
| 63 } | |
| 64 } |