orthanc: OrthancServer/ServerIndex.cpp annotate

annotate OrthancServer/ServerIndex.cpp @ 3609:f7ade98d8229 storage-commitment

done RequestStorageCommitment()

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 20 Jan 2020 18:55:28 +0100
parents	8bf33fa68435
children	94f4a18a79cc

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	4 * Department, University Hospital of Liege, Belgium
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	11 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	13 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	22 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	34 #include "PrecompiledHeadersServer.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "ServerIndex.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
6 9d483cf71d17 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	37 #ifndef NOMINMAX
2 67a6978503b7 fixing Windows build Jodogne@Laptop parents: 0 diff changeset	38 #define NOMINMAX
6 9d483cf71d17 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	39 #endif
9d483cf71d17 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	40
3094 61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	41 #include "../Core/DicomFormat/DicomArray.h"
61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	42 #include "../Core/DicomParsing/FromDcmtkBridge.h"
61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	43 #include "../Core/DicomParsing/ParsedDicomFile.h"
61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	44 #include "../Core/Logging.h"
61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	45 #include "../Core/Toolbox.h"
61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	46
61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	47 #include "Database/ResourcesContent.h"
61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	48 #include "DicomInstanceToStore.h"
8 3a584803783e build with visual studio jodogne parents: 6 diff changeset	49 #include "EmbeddedResources.h"
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	50 #include "OrthancConfiguration.h"
3094 61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	51 #include "Search/DatabaseLookup.h"
61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	52 #include "Search/DicomTagConstraint.h"
61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	53 #include "ServerContext.h"
61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	54 #include "ServerIndexChange.h"
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	55 #include "ServerToolbox.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 #include <boost/lexical_cast.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 #include <stdio.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	60 static const uint64_t MEGA_BYTES = 1024 * 1024;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	61
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	62 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 {
3075 ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	64 static void CopyListToVector(std::vector<std::string>& target,
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	65 const std::list<std::string>& source)
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	66 {
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	67 target.resize(source.size());
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	68
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	69 size_t pos = 0;
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	70
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	71 for (std::list<std::string>::const_iterator
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	72 it = source.begin(); it != source.end(); ++it)
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	73 {
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	74 target[pos] = *it;
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	75 pos ++;
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	76 }
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	77 }
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	78
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	79
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	80 class ServerIndex::Listener : public IDatabaseListener
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	82 private:
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	83 struct FileToRemove
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	84 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	85 private:
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	86 std::string uuid_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	87 FileContentType type_;
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	88
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	89 public:
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	90 FileToRemove(const FileInfo& info) : uuid_(info.GetUuid()),
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	91 type_(info.GetContentType())
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	92 {
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	93 }
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	94
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	95 const std::string& GetUuid() const
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	96 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	97 return uuid_;
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	98 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	99
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	100 FileContentType GetContentType() const
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	101 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	102 return type_;
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	103 }
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	104 };
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	105
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	106 ServerContext& context_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	107 bool hasRemainingLevel_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	108 ResourceType remainingType_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	109 std::string remainingPublicId_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	110 std::list<FileToRemove> pendingFilesToRemove_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	111 std::list<ServerIndexChange> pendingChanges_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	112 uint64_t sizeOfFilesToRemove_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	113 bool insideTransaction_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	114
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	115 void Reset()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	116 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	117 sizeOfFilesToRemove_ = 0;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	118 hasRemainingLevel_ = false;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	119 pendingFilesToRemove_.clear();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	120 pendingChanges_.clear();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	121 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	122
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	123 public:
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	124 Listener(ServerContext& context) : context_(context),
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	125 insideTransaction_(false)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	126 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	127 Reset();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	128 assert(ResourceType_Patient < ResourceType_Study &&
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	129 ResourceType_Study < ResourceType_Series &&
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	130 ResourceType_Series < ResourceType_Instance);
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	131 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	132
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	133 void StartTransaction()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	134 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	135 Reset();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	136 insideTransaction_ = true;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	137 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	138
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	139 void EndTransaction()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	140 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	141 insideTransaction_ = false;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	142 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	143
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	144 uint64_t GetSizeOfFilesToRemove()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	145 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	146 return sizeOfFilesToRemove_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	147 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	148
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	149 void CommitFilesToRemove()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	150 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	151 for (std::list<FileToRemove>::const_iterator
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	152 it = pendingFilesToRemove_.begin();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	153 it != pendingFilesToRemove_.end(); ++it)
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	154 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	155 context_.RemoveFile(it->GetUuid(), it->GetContentType());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	156 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	157 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	158
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	159 void CommitChanges()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	160 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	161 for (std::list<ServerIndexChange>::const_iterator
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	162 it = pendingChanges_.begin();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	163 it != pendingChanges_.end(); ++it)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	164 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	165 context_.SignalChange(*it);
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	166 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	167 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	168
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	169 virtual void SignalRemainingAncestor(ResourceType parentType,
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	170 const std::string& publicId)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	171 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	172 VLOG(1) << "Remaining ancestor \"" << publicId << "\" (" << parentType << ")";
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	173
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	174 if (hasRemainingLevel_)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	175 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	176 if (parentType < remainingType_)
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	177 {
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	178 remainingType_ = parentType;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	179 remainingPublicId_ = publicId;
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	180 }
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1148 diff changeset	181 }
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	182 else
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	183 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	184 hasRemainingLevel_ = true;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	185 remainingType_ = parentType;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	186 remainingPublicId_ = publicId;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	187 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	188 }
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	189
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	190 virtual void SignalFileDeleted(const FileInfo& info)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	191 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	192 assert(Toolbox::IsUuid(info.GetUuid()));
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	193 pendingFilesToRemove_.push_back(FileToRemove(info));
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	194 sizeOfFilesToRemove_ += info.GetCompressedSize();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	195 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	196
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	197 virtual void SignalChange(const ServerIndexChange& change)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	198 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	199 VLOG(1) << "Change related to resource " << change.GetPublicId() << " of type "
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	200 << EnumerationToString(change.GetResourceType()) << ": "
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	201 << EnumerationToString(change.GetChangeType());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	202
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	203 if (insideTransaction_)
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	204 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	205 pendingChanges_.push_back(change);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	206 }
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	207 else
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	208 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	209 context_.SignalChange(change);
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	210 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	211 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	212
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	213 bool HasRemainingLevel() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	214 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	215 return hasRemainingLevel_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	216 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	217
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	218 ResourceType GetRemainingType() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	219 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	220 assert(HasRemainingLevel());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	221 return remainingType_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	222 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	223
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	224 const std::string& GetRemainingPublicId() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	225 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	226 assert(HasRemainingLevel());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	227 return remainingPublicId_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	228 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	229 };
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	232 class ServerIndex::Transaction
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	233 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	234 private:
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	235 ServerIndex& index_;
3019 8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	236 std::auto_ptr<IDatabaseWrapper::ITransaction> transaction_;
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	237 bool isCommitted_;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	238
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	239 public:
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	240 Transaction(ServerIndex& index) :
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	241 index_(index),
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	242 isCommitted_(false)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	243 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	244 transaction_.reset(index_.db_.StartTransaction());
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	245 transaction_->Begin();
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	246
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	247 index_.listener_->StartTransaction();
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	248 }
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	249
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	250 ~Transaction()
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	251 {
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	252 index_.listener_->EndTransaction();
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	253
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	254 if (!isCommitted_)
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	255 {
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	256 transaction_->Rollback();
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	257 }
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	258 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	259
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	260 void Commit(uint64_t sizeOfAddedFiles)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	261 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	262 if (!isCommitted_)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	263 {
3019 8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	264 int64_t delta = (static_cast<int64_t>(sizeOfAddedFiles) -
8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	265 static_cast<int64_t>(index_.listener_->GetSizeOfFilesToRemove()));
8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	266
8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	267 transaction_->Commit(delta);
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	268
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	269 // We can remove the files once the SQLite transaction has
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	270 // been successfully committed. Some files might have to be
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	271 // deleted because of recycling.
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	272 index_.listener_->CommitFilesToRemove();
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	273
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	274 // Send all the pending changes to the Orthanc plugins
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	275 index_.listener_->CommitChanges();
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	276
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	277 isCommitted_ = true;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	278 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	279 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	280 };
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	281
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	282
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	283 class ServerIndex::UnstableResourcePayload
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	284 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	285 private:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	286 ResourceType type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	287 std::string publicId_;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	288 boost::posix_time::ptime time_;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	289
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	290 public:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	291 UnstableResourcePayload() : type_(ResourceType_Instance)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	292 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	293 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	294
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	295 UnstableResourcePayload(Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	296 const std::string& publicId) :
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	297 type_(type),
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	298 publicId_(publicId)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	299 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	300 time_ = boost::posix_time::second_clock::local_time();
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	301 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	302
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	303 unsigned int GetAge() const
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	304 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	305 return (boost::posix_time::second_clock::local_time() - time_).total_seconds();
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	306 }
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	307
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	308 ResourceType GetResourceType() const
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	309 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	310 return type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	311 }
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	312
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	313 const std::string& GetPublicId() const
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	314 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	315 return publicId_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	316 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	317 };
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	318
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	319
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	320 class ServerIndex::MainDicomTagsRegistry : public boost::noncopyable
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	321 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	322 private:
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	323 class TagInfo
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	324 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	325 private:
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	326 ResourceType level_;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	327 DicomTagType type_;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	328
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	329 public:
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	330 TagInfo()
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	331 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	332 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	333
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	334 TagInfo(ResourceType level,
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	335 DicomTagType type) :
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	336 level_(level),
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	337 type_(type)
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	338 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	339 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	340
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	341 ResourceType GetLevel() const
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	342 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	343 return level_;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	344 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	345
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	346 DicomTagType GetType() const
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	347 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	348 return type_;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	349 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	350 };
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	351
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	352 typedef std::map<DicomTag, TagInfo> Registry;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	353
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	354
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	355 Registry registry_;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	356
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	357 void LoadTags(ResourceType level)
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	358 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	359 const DicomTag* tags = NULL;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	360 size_t size;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	361
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	362 ServerToolbox::LoadIdentifiers(tags, size, level);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	363
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	364 for (size_t i = 0; i < size; i++)
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	365 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	366 if (registry_.find(tags[i]) == registry_.end())
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	367 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	368 registry_[tags[i]] = TagInfo(level, DicomTagType_Identifier);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	369 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	370 else
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	371 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	372 // These patient-level tags are copied in the study level
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	373 assert(level == ResourceType_Study &&
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	374 (tags[i] == DICOM_TAG_PATIENT_ID \|\|
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	375 tags[i] == DICOM_TAG_PATIENT_NAME \|\|
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	376 tags[i] == DICOM_TAG_PATIENT_BIRTH_DATE));
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	377 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	378 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	379
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	380 DicomMap::LoadMainDicomTags(tags, size, level);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	381
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	382 for (size_t i = 0; i < size; i++)
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	383 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	384 if (registry_.find(tags[i]) == registry_.end())
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	385 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	386 registry_[tags[i]] = TagInfo(level, DicomTagType_Main);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	387 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	388 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	389 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	390
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	391 public:
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	392 MainDicomTagsRegistry()
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	393 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	394 LoadTags(ResourceType_Patient);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	395 LoadTags(ResourceType_Study);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	396 LoadTags(ResourceType_Series);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	397 LoadTags(ResourceType_Instance);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	398 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	399
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	400 void LookupTag(ResourceType& level,
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	401 DicomTagType& type,
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	402 const DicomTag& tag) const
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	403 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	404 Registry::const_iterator it = registry_.find(tag);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	405
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	406 if (it == registry_.end())
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	407 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	408 // Default values
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	409 level = ResourceType_Instance;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	410 type = DicomTagType_Generic;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	411 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	412 else
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	413 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	414 level = it->second.GetLevel();
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	415 type = it->second.GetType();
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	416 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	417 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	418 };
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	419
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	420
212 f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 206 diff changeset	421 bool ServerIndex::DeleteResource(Json::Value& target,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 const std::string& uuid,
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	423 ResourceType expectedType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	424 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	425 boost::mutex::scoped_lock lock(mutex_);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	426
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	427 Transaction t(*this);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	428
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	429 int64_t id;
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	430 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	431 if (!db_.LookupResource(id, type, uuid) \|\|
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	432 expectedType != type)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	436
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	437 db_.DeleteResource(id);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	439 if (listener_->HasRemainingLevel())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 {
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	441 ResourceType type = listener_->GetRemainingType();
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	442 const std::string& uuid = listener_->GetRemainingPublicId();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444 target["RemainingAncestor"] = Json::Value(Json::objectValue);
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	445 target["RemainingAncestor"]["Path"] = GetBasePath(type, uuid);
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	446 target["RemainingAncestor"]["Type"] = EnumerationToString(type);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 target["RemainingAncestor"]["ID"] = uuid;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 target["RemainingAncestor"] = Json::nullValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	454 t.Commit(0);
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	455
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456 return true;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	460 void ServerIndex::FlushThread(ServerIndex* that,
389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	461 unsigned int threadSleep)
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	462 {
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	463 // By default, wait for 10 seconds before flushing
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	464 unsigned int sleep = 10;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	465
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	466 try
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	467 {
744 ec69658b031b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 739 diff changeset	468 boost::mutex::scoped_lock lock(that->mutex_);
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	469 std::string sleepString;
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	470
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	471 if (that->db_.LookupGlobalProperty(sleepString, GlobalProperty_FlushSleep) &&
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	472 Toolbox::IsInteger(sleepString))
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	473 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	474 sleep = boost::lexical_cast<unsigned int>(sleepString);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	475 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	476 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	477 catch (boost::bad_lexical_cast&)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	478 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	479 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	480
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	481 LOG(INFO) << "Starting the database flushing thread (sleep = " << sleep << ")";
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	482
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	483 unsigned int count = 0;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	484
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	485 while (!that->done_)
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	486 {
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	487 boost::this_thread::sleep(boost::posix_time::milliseconds(threadSleep));
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	488 count++;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	489 if (count < sleep)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	490 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	491 continue;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	492 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	493
2217 4f39ab2cb453 flush Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	494 Logging::Flush();
4f39ab2cb453 flush Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	495
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	496 boost::mutex::scoped_lock lock(that->mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	497 that->db_.FlushToDisk();
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	498 count = 0;
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	499 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	500
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	501 LOG(INFO) << "Stopping the database flushing thread";
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	502 }
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	503
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	504
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	505 static bool ComputeExpectedNumberOfInstances(int64_t& target,
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	506 const DicomMap& dicomSummary)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	507 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	508 try
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	509 {
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	510 const DicomValue* value;
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	511 const DicomValue* value2;
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	512
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	513 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL &&
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	514 !value->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	515 !value->IsBinary() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	516 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS)) != NULL &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	517 !value2->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	518 !value2->IsBinary())
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	519 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	520 // Patch for series with temporal positions thanks to Will Ryder
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	521 int64_t imagesInAcquisition = boost::lexical_cast<int64_t>(value->GetContent());
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	522 int64_t countTemporalPositions = boost::lexical_cast<int64_t>(value2->GetContent());
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	523 target = imagesInAcquisition * countTemporalPositions;
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	524 return (target > 0);
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	525 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	526
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	527 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL &&
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	528 !value->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	529 !value->IsBinary() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	530 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TIME_SLICES)) != NULL &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	531 !value2->IsBinary() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	532 !value2->IsNull())
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	533 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	534 // Support of Cardio-PET images
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	535 int64_t numberOfSlices = boost::lexical_cast<int64_t>(value->GetContent());
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	536 int64_t numberOfTimeSlices = boost::lexical_cast<int64_t>(value2->GetContent());
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	537 target = numberOfSlices * numberOfTimeSlices;
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	538 return (target > 0);
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	539 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	540
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	541 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	542 !value->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	543 !value->IsBinary())
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	544 {
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	545 target = boost::lexical_cast<int64_t>(value->GetContent());
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	546 return (target > 0);
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	547 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	548 }
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	549 catch (OrthancException&)
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	550 {
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	551 }
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	552 catch (boost::bad_lexical_cast&)
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	553 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	554 }
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	555
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	556 return false;
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	557 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	558
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	559
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	560
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	561
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	562 static bool LookupStringMetadata(std::string& result,
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	563 const std::map<MetadataType, std::string>& metadata,
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	564 MetadataType type)
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	565 {
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	566 std::map<MetadataType, std::string>::const_iterator found = metadata.find(type);
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	567
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	568 if (found == metadata.end())
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	569 {
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	570 return false;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	571 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	572 else
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	573 {
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	574 result = found->second;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	575 return true;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	576 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	577 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	578
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	579
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	580 static bool LookupIntegerMetadata(int64_t& result,
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	581 const std::map<MetadataType, std::string>& metadata,
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	582 MetadataType type)
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	583 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	584 std::string s;
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	585 if (!LookupStringMetadata(s, metadata, type))
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	586 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	587 return false;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	588 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	589
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	590 try
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	591 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	592 result = boost::lexical_cast<int64_t>(s);
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	593 return true;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	594 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	595 catch (boost::bad_lexical_cast&)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	596 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	597 return false;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	598 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	599 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	600
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	601
1297 501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	602 void ServerIndex::LogChange(int64_t internalId,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	603 ChangeType changeType,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	604 ResourceType resourceType,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	605 const std::string& publicId)
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	606 {
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	607 ServerIndexChange change(changeType, resourceType, publicId);
1300 919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	608
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	609 if (changeType <= ChangeType_INTERNAL_LastLogged)
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	610 {
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	611 db_.LogChange(internalId, change);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	612 }
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	613
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	614 assert(listener_.get() != NULL);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	615 listener_->SignalChange(change);
1297 501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	616 }
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	617
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	618
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	619 uint64_t ServerIndex::IncrementGlobalSequenceInternal(GlobalProperty property)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	620 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	621 std::string oldValue;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	622
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	623 if (db_.LookupGlobalProperty(oldValue, property))
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	624 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	625 uint64_t oldNumber;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	626
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	627 try
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	628 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	629 oldNumber = boost::lexical_cast<uint64_t>(oldValue);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	630 db_.SetGlobalProperty(property, boost::lexical_cast<std::string>(oldNumber + 1));
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	631 return oldNumber + 1;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	632 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	633 catch (boost::bad_lexical_cast&)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	634 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	635 throw OrthancException(ErrorCode_InternalError);
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	636 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	637 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	638 else
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	639 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	640 // Initialize the sequence at "1"
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	641 db_.SetGlobalProperty(property, "1");
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	642 return 1;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	643 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	644 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	645
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	646
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	647
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	648 ServerIndex::ServerIndex(ServerContext& context,
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	649 IDatabaseWrapper& db,
389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	650 unsigned int threadSleep) :
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	651 done_(false),
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	652 db_(db),
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	653 maximumStorageSize_(0),
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	654 maximumPatients_(0),
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	655 overwrite_(false),
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	656 mainDicomTagsRegistry_(new MainDicomTagsRegistry)
186 f68c039b0571 preparing refactoring of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 180 diff changeset	657 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	658 listener_.reset(new Listener(context));
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	659 db_.SetListener(*listener_);
180 626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	660
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	661 // Initial recycling if the parameters have changed since the last
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	662 // execution of Orthanc
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	663 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	664
1306 8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	665 if (db.HasFlushToDisk())
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	666 {
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	667 flushThread_ = boost::thread(FlushThread, this, threadSleep);
1306 8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	668 }
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	669
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	670 unstableResourcesMonitorThread_ = boost::thread
389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	671 (UnstableResourcesMonitorThread, this, threadSleep);
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	672 }
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	673
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	674
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	675
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	676 ServerIndex::~ServerIndex()
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	677 {
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	678 if (!done_)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	679 {
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	680 LOG(ERROR) << "INTERNAL ERROR: ServerIndex::Stop() should be invoked manually to avoid mess in the destruction order!";
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	681 Stop();
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	682 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	683 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	686
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	687 void ServerIndex::Stop()
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	688 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	689 if (!done_)
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	690 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	691 done_ = true;
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	692
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	693 if (db_.HasFlushToDisk() &&
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	694 flushThread_.joinable())
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	695 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	696 flushThread_.join();
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	697 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	698
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	699 if (unstableResourcesMonitorThread_.joinable())
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	700 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	701 unstableResourcesMonitorThread_.join();
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	702 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	703 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	704 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	705
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	706
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	707 static void SetInstanceMetadata(ResourcesContent& content,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	708 std::map<MetadataType, std::string>& instanceMetadata,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	709 int64_t instance,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	710 MetadataType metadata,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	711 const std::string& value)
2188 7cfc2e0383b3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	712 {
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	713 content.AddMetadata(instance, metadata, value);
2188 7cfc2e0383b3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	714 instanceMetadata[metadata] = value;
7cfc2e0383b3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	715 }
7cfc2e0383b3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	716
7cfc2e0383b3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	717
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	718 void ServerIndex::SignalNewResource(ChangeType changeType,
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	719 ResourceType level,
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	720 const std::string& publicId,
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	721 int64_t internalId)
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	722 {
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	723 ServerIndexChange change(changeType, level, publicId);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	724 db_.LogChange(internalId, change);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	725
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	726 assert(listener_.get() != NULL);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	727 listener_->SignalChange(change);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	728 }
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	729
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	730
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	731 StoreStatus ServerIndex::Store(std::map<MetadataType, std::string>& instanceMetadata,
1822 9ed9458aa44f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	732 DicomInstanceToStore& instanceToStore,
9ed9458aa44f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	733 const Attachments& attachments)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	735 boost::mutex::scoped_lock lock(mutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736
1822 9ed9458aa44f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	737 const DicomMap& dicomSummary = instanceToStore.GetSummary();
9ed9458aa44f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	738 const ServerIndex::MetadataMap& metadata = instanceToStore.GetMetadata();
9ed9458aa44f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	739
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	740 int64_t expectedInstances;
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	741 const bool hasExpectedInstances =
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	742 ComputeExpectedNumberOfInstances(expectedInstances, dicomSummary);
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	743
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	744 instanceMetadata.clear();
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	745
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	746 const std::string hashPatient = instanceToStore.GetHasher().HashPatient();
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	747 const std::string hashStudy = instanceToStore.GetHasher().HashStudy();
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	748 const std::string hashSeries = instanceToStore.GetHasher().HashSeries();
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	749 const std::string hashInstance = instanceToStore.GetHasher().HashInstance();
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	750
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	751 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	752 {
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	753 Transaction t(*this);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	754
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	755 IDatabaseWrapper::CreateInstanceResult status;
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	756 int64_t instanceId;
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	757
2825 8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2726 diff changeset	758 // Check whether this instance is already stored
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	759 if (!db_.CreateInstance(status, instanceId, hashPatient,
3082 847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	760 hashStudy, hashSeries, hashInstance))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	761 {
3082 847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	762 // The instance already exists
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	763
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	764 if (overwrite_)
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	765 {
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	766 // Overwrite the old instance
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	767 LOG(INFO) << "Overwriting instance: " << hashInstance;
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	768 db_.DeleteResource(instanceId);
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	769
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	770 // Re-create the instance, now that the old one is removed
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	771 if (!db_.CreateInstance(status, instanceId, hashPatient,
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	772 hashStudy, hashSeries, hashInstance))
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	773 {
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	774 throw OrthancException(ErrorCode_InternalError);
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	775 }
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	776 }
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	777 else
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	778 {
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	779 // Do nothing if the instance already exists and overwriting is disabled
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	780 db_.GetAllMetadata(instanceMetadata, instanceId);
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	781 return StoreStatus_AlreadyStored;
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	782 }
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	783 }
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	784
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	785
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	786 // Warn about the creation of new resources. The order must be
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	787 // from instance to patient.
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	788
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	789 // NB: In theory, could be sped up by grouping the underlying
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	790 // calls to "db_.LogChange()". However, this would only have an
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	791 // impact when new patient/study/series get created, which
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	792 // occurs far less often that creating new instances. The
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	793 // positive impact looks marginal in practice.
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	794 SignalNewResource(ChangeType_NewInstance, ResourceType_Instance, hashInstance, instanceId);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	795
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	796 if (status.isNewSeries_)
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	797 {
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	798 SignalNewResource(ChangeType_NewSeries, ResourceType_Series, hashSeries, status.seriesId_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	799 }
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	800
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	801 if (status.isNewStudy_)
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	802 {
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	803 SignalNewResource(ChangeType_NewStudy, ResourceType_Study, hashStudy, status.studyId_);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	804 }
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	805
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	806 if (status.isNewPatient_)
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	807 {
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	808 SignalNewResource(ChangeType_NewPatient, ResourceType_Patient, hashPatient, status.patientId_);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	809 }
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	810
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	811
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	812 // Ensure there is enough room in the storage for the new instance
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	813 uint64_t instanceSize = 0;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	814 for (Attachments::const_iterator it = attachments.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	815 it != attachments.end(); ++it)
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	816 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	817 instanceSize += it->GetCompressedSize();
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	818 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	819
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	820 Recycle(instanceSize, hashPatient /* don't consider the current patient for recycling */);
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	821
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	822
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	823 // Attach the files to the newly created instance
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	824 for (Attachments::const_iterator it = attachments.begin();
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	825 it != attachments.end(); ++it)
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	826 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	827 db_.AddAttachment(instanceId, *it);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	828 }
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	829
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	830
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	831 {
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	832 ResourcesContent content;
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	833
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	834 // Populate the tags of the newly-created resources
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	835
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	836 content.AddResource(instanceId, ResourceType_Instance, dicomSummary);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	837
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	838 if (status.isNewSeries_)
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	839 {
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	840 content.AddResource(status.seriesId_, ResourceType_Series, dicomSummary);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	841 }
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	842
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	843 if (status.isNewStudy_)
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	844 {
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	845 content.AddResource(status.studyId_, ResourceType_Study, dicomSummary);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	846 }
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	847
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	848 if (status.isNewPatient_)
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	849 {
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	850 content.AddResource(status.patientId_, ResourceType_Patient, dicomSummary);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	851 }
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	852
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	853
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	854 // Attach the user-specified metadata
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	855
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	856 for (MetadataMap::const_iterator
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	857 it = metadata.begin(); it != metadata.end(); ++it)
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	858 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	859 switch (it->first.first)
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	860 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	861 case ResourceType_Patient:
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	862 content.AddMetadata(status.patientId_, it->first.second, it->second);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	863 break;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	864
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	865 case ResourceType_Study:
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	866 content.AddMetadata(status.studyId_, it->first.second, it->second);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	867 break;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	868
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	869 case ResourceType_Series:
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	870 content.AddMetadata(status.seriesId_, it->first.second, it->second);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	871 break;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	872
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	873 case ResourceType_Instance:
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	874 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	875 it->first.second, it->second);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	876 break;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	877
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	878 default:
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	879 throw OrthancException(ErrorCode_ParameterOutOfRange);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	880 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	881 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	882
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	883
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	884 // Attach the auto-computed metadata for the patient/study/series levels
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	885 std::string now = SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	886 content.AddMetadata(status.seriesId_, MetadataType_LastUpdate, now);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	887 content.AddMetadata(status.studyId_, MetadataType_LastUpdate, now);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	888 content.AddMetadata(status.patientId_, MetadataType_LastUpdate, now);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	889
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	890 if (status.isNewSeries_ &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	891 hasExpectedInstances)
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	892 {
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	893 content.AddMetadata(status.seriesId_, MetadataType_Series_ExpectedNumberOfInstances,
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	894 boost::lexical_cast<std::string>(expectedInstances));
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	895 }
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	896
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	897
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	898 // Attach the auto-computed metadata for the instance level,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	899 // reflecting these additions into the input metadata map
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	900 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	901 MetadataType_Instance_ReceptionDate, now);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	902 SetInstanceMetadata(content, instanceMetadata, instanceId, MetadataType_Instance_RemoteAet,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	903 instanceToStore.GetOrigin().GetRemoteAetC());
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	904 SetInstanceMetadata(content, instanceMetadata, instanceId, MetadataType_Instance_Origin,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	905 EnumerationToString(instanceToStore.GetOrigin().GetRequestOrigin()));
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	906
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	907
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	908 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	909 std::string s;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	910
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	911 if (instanceToStore.LookupTransferSyntax(s))
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	912 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	913 // New in Orthanc 1.2.0
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	914 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	915 MetadataType_Instance_TransferSyntax, s);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	916 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	917
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	918 if (instanceToStore.GetOrigin().LookupRemoteIp(s))
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	919 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	920 // New in Orthanc 1.4.0
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	921 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	922 MetadataType_Instance_RemoteIp, s);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	923 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	924
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	925 if (instanceToStore.GetOrigin().LookupCalledAet(s))
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	926 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	927 // New in Orthanc 1.4.0
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	928 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	929 MetadataType_Instance_CalledAet, s);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	930 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	931
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	932 if (instanceToStore.GetOrigin().LookupHttpUsername(s))
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	933 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	934 // New in Orthanc 1.4.0
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	935 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	936 MetadataType_Instance_HttpUsername, s);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	937 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	938 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	939
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	940
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	941 const DicomValue* value;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	942 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	943 !value->IsNull() &&
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	944 !value->IsBinary())
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	945 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	946 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	947 MetadataType_Instance_SopClassUid, value->GetContent());
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	948 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	949
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	950
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	951 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL \|\|
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	952 (value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	953 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	954 if (!value->IsNull() &&
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	955 !value->IsBinary())
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	956 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	957 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	958 MetadataType_Instance_IndexInSeries, value->GetContent());
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	959 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	960 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	961
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	962
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	963 db_.SetResourcesContent(content);
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	964 }
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	965
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	966
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	967 // Check whether the series of this new instance is now completed
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	968 int64_t expectedNumberOfInstances;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	969 if (ComputeExpectedNumberOfInstances(expectedNumberOfInstances, dicomSummary))
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	970 {
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	971 SeriesStatus seriesStatus = GetSeriesStatus(status.seriesId_, expectedNumberOfInstances);
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	972 if (seriesStatus == SeriesStatus_Complete)
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	973 {
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	974 LogChange(status.seriesId_, ChangeType_CompletedSeries, ResourceType_Series, hashSeries);
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	975 }
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	976 }
3087 df1b17be20f6 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3086 diff changeset	977
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	978
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	979 // Mark the parent resources of this instance as unstable
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	980 MarkAsUnstable(status.seriesId_, ResourceType_Series, hashSeries);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	981 MarkAsUnstable(status.studyId_, ResourceType_Study, hashStudy);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	982 MarkAsUnstable(status.patientId_, ResourceType_Patient, hashPatient);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	983
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	984 t.Commit(instanceSize);
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	985
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	986 return StoreStatus_Success;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	987 }
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	988 catch (OrthancException& e)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	989 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	990 LOG(ERROR) << "EXCEPTION [" << e.What() << "]";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	991 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	992
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	993 return StoreStatus_Failure;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	994 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	995
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	996
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	997 void ServerIndex::GetGlobalStatistics(/* out */ uint64_t& diskSize,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	998 /* out */ uint64_t& uncompressedSize,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	999 /* out */ uint64_t& countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1000 /* out */ uint64_t& countStudies,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1001 /* out */ uint64_t& countSeries,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1002 /* out */ uint64_t& countInstances)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1003 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	1004 boost::mutex::scoped_lock lock(mutex_);
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1005 diskSize = db_.GetTotalCompressedSize();
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1006 uncompressedSize = db_.GetTotalUncompressedSize();
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1007 countPatients = db_.GetResourceCount(ResourceType_Patient);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1008 countStudies = db_.GetResourceCount(ResourceType_Study);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1009 countSeries = db_.GetResourceCount(ResourceType_Series);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1010 countInstances = db_.GetResourceCount(ResourceType_Instance);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1011 }
187 8e673a65564d refactoring of storing new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	1012
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1013
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1014 SeriesStatus ServerIndex::GetSeriesStatus(int64_t id,
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1015 int64_t expectedNumberOfInstances)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1016 {
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1017 std::list<std::string> values;
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1018 db_.GetChildrenMetadata(values, id, MetadataType_Instance_IndexInSeries);
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1019
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1020 std::set<int64_t> instances;
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1021
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1022 for (std::list<std::string>::const_iterator
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1023 it = values.begin(); it != values.end(); ++it)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1024 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1025 int64_t index;
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1026
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1027 try
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1028 {
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1029 index = boost::lexical_cast<int64_t>(*it);
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1030 }
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1031 catch (boost::bad_lexical_cast&)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1032 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1033 return SeriesStatus_Unknown;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1034 }
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1035
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1036 if (!(index > 0 && index <= expectedNumberOfInstances))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1037 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1038 // Out-of-range instance index
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1039 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1040 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1041
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1042 if (instances.find(index) != instances.end())
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1043 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1044 // Twice the same instance index
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1045 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1046 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1047
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1048 instances.insert(index);
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1049 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1050
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1051 if (static_cast<int64_t>(instances.size()) == expectedNumberOfInstances)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1052 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1053 return SeriesStatus_Complete;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1054 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1055 else
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1056 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1057 return SeriesStatus_Missing;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1058 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1059 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1060
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1061
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	1062 void ServerIndex::MainDicomTagsToJson(Json::Value& target,
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	1063 int64_t resourceId,
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	1064 ResourceType resourceType)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1065 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1066 DicomMap tags;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1067 db_.GetMainDicomTags(tags, resourceId);
1676 f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1068
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1069 if (resourceType == ResourceType_Study)
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1070 {
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1071 DicomMap t1, t2;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1072 tags.ExtractStudyInformation(t1);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1073 tags.ExtractPatientInformation(t2);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1074
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1075 target["MainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1076 FromDcmtkBridge::ToJson(target["MainDicomTags"], t1, true);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1077
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1078 target["PatientMainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1079 FromDcmtkBridge::ToJson(target["PatientMainDicomTags"], t2, true);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1080 }
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1081 else
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1082 {
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1083 target["MainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1084 FromDcmtkBridge::ToJson(target["MainDicomTags"], tags, true);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1085 }
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1086 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1087
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1088
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1089 bool ServerIndex::LookupResource(Json::Value& result,
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1090 const std::string& publicId,
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1091 ResourceType expectedType)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1092 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1093 result = Json::objectValue;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1094
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	1095 boost::mutex::scoped_lock lock(mutex_);
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1096
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1097 // Lookup for the requested resource
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1098 int64_t id;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1099 ResourceType type;
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1100 std::string parent;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1101 if (!db_.LookupResourceAndParent(id, type, parent, publicId) \|\|
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1102 type != expectedType)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1103 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1104 return false;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1105 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1106
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1107 // Set information about the parent resource (if it exists)
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1108 if (type == ResourceType_Patient)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1109 {
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1110 if (!parent.empty())
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1111 {
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1112 throw OrthancException(ErrorCode_DatabasePlugin);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1113 }
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1114 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1115 else
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1116 {
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1117 if (parent.empty())
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1118 {
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1119 throw OrthancException(ErrorCode_DatabasePlugin);
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1120 }
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1121
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1122 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1123 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1124 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1125 result["ParentPatient"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1126 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1127
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1128 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1129 result["ParentStudy"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1130 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1131
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1132 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1133 result["ParentSeries"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1134 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1135
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1136 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1137 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1138 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1139 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1140
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1141 // List the children resources
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1142 std::list<std::string> children;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1143 db_.GetChildrenPublicId(children, id);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1144
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1145 if (type != ResourceType_Instance)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1146 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1147 Json::Value c = Json::arrayValue;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1148
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1149 for (std::list<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1150 it = children.begin(); it != children.end(); ++it)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1151 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1152 c.append(*it);
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1153 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1154
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1155 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1156 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1157 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1158 result["Studies"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1159 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1160
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1161 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1162 result["Series"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1163 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1164
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1165 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1166 result["Instances"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1167 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1168
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1169 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1170 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1171 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1172 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1173
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1174 // Extract the metadata
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1175 std::map<MetadataType, std::string> metadata;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1176 db_.GetAllMetadata(metadata, id);
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1177
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1178 // Set the resource type
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1179 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1180 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1181 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1182 result["Type"] = "Patient";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1183 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1184
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1185 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1186 result["Type"] = "Study";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1187 break;
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1188
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1189 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1190 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1191 result["Type"] = "Series";
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1192
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1193 int64_t i;
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1194 if (LookupIntegerMetadata(i, metadata, MetadataType_Series_ExpectedNumberOfInstances))
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1195 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1196 result["ExpectedNumberOfInstances"] = static_cast<int>(i);
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1197 result["Status"] = EnumerationToString(GetSeriesStatus(id, i));
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1198 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1199 else
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1200 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1201 result["ExpectedNumberOfInstances"] = Json::nullValue;
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1202 result["Status"] = EnumerationToString(SeriesStatus_Unknown);
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1203 }
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	1204
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1205 break;
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	1206 }
9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	1207
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1208 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1209 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1210 result["Type"] = "Instance";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1211
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1212 FileInfo attachment;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1213 if (!db_.LookupAttachment(attachment, id, FileContentType_Dicom))
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1214 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1215 throw OrthancException(ErrorCode_InternalError);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1216 }
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	1217
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1218 result["FileSize"] = static_cast<unsigned int>(attachment.GetUncompressedSize());
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1219 result["FileUuid"] = attachment.GetUuid();
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	1220
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1221 int64_t i;
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1222 if (LookupIntegerMetadata(i, metadata, MetadataType_Instance_IndexInSeries))
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1223 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1224 result["IndexInSeries"] = static_cast<int>(i);
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1225 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1226 else
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1227 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1228 result["IndexInSeries"] = Json::nullValue;
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	1229 }
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1230
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1231 break;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1232 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1233
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1234 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1235 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1236 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1237
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1238 // Record the remaining information
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1239 result["ID"] = publicId;
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	1240 MainDicomTagsToJson(result, id, type);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1241
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1242 std::string tmp;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1243
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1244 if (LookupStringMetadata(tmp, metadata, MetadataType_AnonymizedFrom))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1245 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1246 result["AnonymizedFrom"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1247 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1248
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1249 if (LookupStringMetadata(tmp, metadata, MetadataType_ModifiedFrom))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1250 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1251 result["ModifiedFrom"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1252 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1253
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1254 if (type == ResourceType_Patient \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1255 type == ResourceType_Study \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1256 type == ResourceType_Series)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1257 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1258 result["IsStable"] = !unstableResources_.Contains(id);
1148 ac36589f699e LastUpdate metadata is now always returned for patients, studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	1259
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1260 if (LookupStringMetadata(tmp, metadata, MetadataType_LastUpdate))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1261 {
1148 ac36589f699e LastUpdate metadata is now always returned for patients, studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	1262 result["LastUpdate"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1263 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1264 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1265
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1266 return true;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1267 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1268
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1269
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1270 bool ServerIndex::LookupAttachment(FileInfo& attachment,
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1271 const std::string& instanceUuid,
233 c11273198cef rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 232 diff changeset	1272 FileContentType contentType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1273 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	1274 boost::mutex::scoped_lock lock(mutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1275
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1276 int64_t id;
a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1277 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1278 if (!db_.LookupResource(id, type, instanceUuid))
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1279 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1280 throw OrthancException(ErrorCode_UnknownResource);
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1281 }
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1282
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1283 if (db_.LookupAttachment(attachment, id, contentType))
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1284 {
233 c11273198cef rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 232 diff changeset	1285 assert(attachment.GetContentType() == contentType);
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1286 return true;
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1287 }
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1288 else
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1289 {
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1290 return false;
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1291 }
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1292 }
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1293
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1294
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1295
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1352 diff changeset	1296 void ServerIndex::GetAllUuids(std::list<std::string>& target,
190 b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1297 ResourceType resourceType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1298 {
1357 216db29c5aa9 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	1299 boost::mutex::scoped_lock lock(mutex_);
216db29c5aa9 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	1300 db_.GetAllPublicIds(target, resourceType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1301 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1302
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1303
1509 0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1304 void ServerIndex::GetAllUuids(std::list<std::string>& target,
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1305 ResourceType resourceType,
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1306 size_t since,
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1307 size_t limit)
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1308 {
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1309 if (limit == 0)
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1310 {
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1311 target.clear();
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1312 return;
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1313 }
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1314
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1315 boost::mutex::scoped_lock lock(mutex_);
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1316 db_.GetAllPublicIds(target, resourceType, since, limit);
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1317 }
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1318
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1319
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1320 template <typename T>
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1321 static void FormatLog(Json::Value& target,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1322 const std::list<T>& log,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1323 const std::string& name,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1324 bool done,
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1325 int64_t since,
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1326 bool hasLast,
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1327 int64_t last)
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1328 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1329 Json::Value items = Json::arrayValue;
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1330 for (typename std::list<T>::const_iterator
1304 7b6925b0890d cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1300 diff changeset	1331 it = log.begin(); it != log.end(); ++it)
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1332 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1333 Json::Value item;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1334 it->Format(item);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1335 items.append(item);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1336 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1337
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1338 target = Json::objectValue;
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1339 target[name] = items;
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1340 target["Done"] = done;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1341
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1342 if (!hasLast)
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1343 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1344 // Best-effort guess of the last index in the sequence
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1345 if (log.empty())
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1346 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1347 last = since;
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1348 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1349 else
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1350 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1351 last = log.back().GetSeq();
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1352 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1353 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1354
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1355 target["Last"] = static_cast<int>(last);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1356 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1357
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1358
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1359 void ServerIndex::GetChanges(Json::Value& target,
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	1360 int64_t since,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1361 unsigned int maxResults)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1362 {
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1363 std::list<ServerIndexChange> changes;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1364 bool done;
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1365 bool hasLast = false;
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1366 int64_t last = 0;
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1367
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1368 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1369 boost::mutex::scoped_lock lock(mutex_);
2717 d33659c28c6b fix missing transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	1370
d33659c28c6b fix missing transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	1371 // Fix wrt. Orthanc <= 1.3.2: A transaction was missing, as
d33659c28c6b fix missing transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	1372 // "GetLastChange()" involves calls to "GetPublicId()"
d33659c28c6b fix missing transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	1373 Transaction transaction(*this);
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1374
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1375 db_.GetChanges(changes, done, since, maxResults);
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1376 if (changes.empty())
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1377 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1378 last = db_.GetLastChangeIndex();
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1379 hasLast = true;
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1380 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1381
2717 d33659c28c6b fix missing transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	1382 transaction.Commit(0);
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1383 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1384
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1385 FormatLog(target, changes, "Changes", done, since, hasLast, last);
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1386 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1387
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1388
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1389 void ServerIndex::GetLastChange(Json::Value& target)
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1390 {
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1391 std::list<ServerIndexChange> changes;
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1392 bool hasLast = false;
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1393 int64_t last = 0;
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1394
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1395 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1396 boost::mutex::scoped_lock lock(mutex_);
2717 d33659c28c6b fix missing transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	1397
d33659c28c6b fix missing transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	1398 // Fix wrt. Orthanc <= 1.3.2: A transaction was missing, as
d33659c28c6b fix missing transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	1399 // "GetLastChange()" involves calls to "GetPublicId()"
d33659c28c6b fix missing transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	1400 Transaction transaction(*this);
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1401
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1402 db_.GetLastChange(changes);
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1403 if (changes.empty())
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1404 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1405 last = db_.GetLastChangeIndex();
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1406 hasLast = true;
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1407 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1408
2717 d33659c28c6b fix missing transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 2668 diff changeset	1409 transaction.Commit(0);
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1410 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1411
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1412 FormatLog(target, changes, "Changes", true, 0, hasLast, last);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1413 }
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1414
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1415
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1416 void ServerIndex::LogExportedResource(const std::string& publicId,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1417 const std::string& remoteModality)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1418 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1419 boost::mutex::scoped_lock lock(mutex_);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1420 Transaction transaction(*this);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1421
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1422 int64_t id;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1423 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1424 if (!db_.LookupResource(id, type, publicId))
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1425 {
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	1426 throw OrthancException(ErrorCode_InexistentItem);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1427 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1428
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1429 std::string patientId;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1430 std::string studyInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1431 std::string seriesInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1432 std::string sopInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1433
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1434 int64_t currentId = id;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1435 ResourceType currentType = type;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1436
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1437 // Iteratively go up inside the patient/study/series/instance hierarchy
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1438 bool done = false;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1439 while (!done)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1440 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1441 DicomMap map;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1442 db_.GetMainDicomTags(map, currentId);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1443
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1444 switch (currentType)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1445 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1446 case ResourceType_Patient:
2090 1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1447 if (map.HasTag(DICOM_TAG_PATIENT_ID))
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1448 {
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1449 patientId = map.GetValue(DICOM_TAG_PATIENT_ID).GetContent();
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1450 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1451 done = true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1452 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1453
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1454 case ResourceType_Study:
2090 1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1455 if (map.HasTag(DICOM_TAG_STUDY_INSTANCE_UID))
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1456 {
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1457 studyInstanceUid = map.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent();
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1458 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1459 currentType = ResourceType_Patient;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1460 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1461
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1462 case ResourceType_Series:
2090 1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1463 if (map.HasTag(DICOM_TAG_SERIES_INSTANCE_UID))
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1464 {
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1465 seriesInstanceUid = map.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).GetContent();
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1466 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1467 currentType = ResourceType_Study;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1468 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1469
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1470 case ResourceType_Instance:
2090 1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1471 if (map.HasTag(DICOM_TAG_SOP_INSTANCE_UID))
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1472 {
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1473 sopInstanceUid = map.GetValue(DICOM_TAG_SOP_INSTANCE_UID).GetContent();
1824a02e0951 improved robustness for files with no PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1474 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1475 currentType = ResourceType_Series;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1476 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1477
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1478 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1479 throw OrthancException(ErrorCode_InternalError);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1480 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1481
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1482 // If we have not reached the Patient level, find the parent of
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1483 // the current resource
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1484 if (!done)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1485 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1486 bool ok = db_.LookupParent(currentId, currentId);
375 d1ea72f1c967 major fix of storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1487 assert(ok);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1488 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1489 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1490
1246 54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1491 ExportedResource resource(-1,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1492 type,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1493 publicId,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1494 remoteModality,
2475 8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1495 SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */),
1246 54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1496 patientId,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1497 studyInstanceUid,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1498 seriesInstanceUid,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1499 sopInstanceUid);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1500
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1501 db_.LogExportedResource(resource);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1502 transaction.Commit(0);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1503 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1504
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1505
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1506 void ServerIndex::GetExportedResources(Json::Value& target,
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1507 int64_t since,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1508 unsigned int maxResults)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1509 {
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1510 std::list<ExportedResource> exported;
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1511 bool done;
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1512
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1513 {
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1514 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1515 db_.GetExportedResources(exported, done, since, maxResults);
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1516 }
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1517
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1518 FormatLog(target, exported, "Exports", done, since, false, -1);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1519 }
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1520
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1521
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1522 void ServerIndex::GetLastExportedResource(Json::Value& target)
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1523 {
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1524 std::list<ExportedResource> exported;
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1525
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1526 {
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1527 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1528 db_.GetLastExportedResource(exported);
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1529 }
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1530
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1531 FormatLog(target, exported, "Exports", true, 0, false, -1);
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1532 }
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1533
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1534
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1535 bool ServerIndex::IsRecyclingNeeded(uint64_t instanceSize)
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1536 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1537 if (maximumStorageSize_ != 0)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1538 {
3020 d207f6ac1f86 tracking disk size by the database engine to ensure consistency across transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	1539 assert(maximumStorageSize_ >= instanceSize);
d207f6ac1f86 tracking disk size by the database engine to ensure consistency across transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	1540
d207f6ac1f86 tracking disk size by the database engine to ensure consistency across transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	1541 if (db_.IsDiskSizeAbove(maximumStorageSize_ - instanceSize))
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1542 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1543 return true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1544 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1545 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1546
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1547 if (maximumPatients_ != 0)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1548 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1549 uint64_t patientCount = db_.GetResourceCount(ResourceType_Patient);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1550 if (patientCount > maximumPatients_)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1551 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1552 return true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1553 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1554 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1555
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1556 return false;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1557 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1558
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1559
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1560 void ServerIndex::Recycle(uint64_t instanceSize,
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1561 const std::string& newPatientId)
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1562 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1563 if (!IsRecyclingNeeded(instanceSize))
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1564 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1565 return;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1566 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1567
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1568 // Check whether other DICOM instances from this patient are
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1569 // already stored
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1570 int64_t patientToAvoid;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1571 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1572 bool hasPatientToAvoid = db_.LookupResource(patientToAvoid, type, newPatientId);
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1573
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1574 if (hasPatientToAvoid && type != ResourceType_Patient)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1575 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1576 throw OrthancException(ErrorCode_InternalError);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1577 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1578
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1579 // Iteratively select patient to remove until there is enough
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1580 // space in the DICOM store
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1581 int64_t patientToRecycle;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1582 while (true)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1583 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1584 // If other instances of this patient are already in the store,
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1585 // we must avoid to recycle them
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1586 bool ok = hasPatientToAvoid ?
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1587 db_.SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1588 db_.SelectPatientToRecycle(patientToRecycle);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1589
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1590 if (!ok)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1591 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1592 throw OrthancException(ErrorCode_FullStorage);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1593 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1594
1331 77e129ba64e4 Prevent freeze on C-FIND if no DICOM tag is to be returned Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	1595 VLOG(1) << "Recycling one patient";
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1596 db_.DeleteResource(patientToRecycle);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1597
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1598 if (!IsRecyclingNeeded(instanceSize))
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1599 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1600 // OK, we're done
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1601 break;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1602 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1603 }
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1604 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1605
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1606 void ServerIndex::SetMaximumPatientCount(unsigned int count)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1607 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1608 boost::mutex::scoped_lock lock(mutex_);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1609 maximumPatients_ = count;
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1610
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1611 if (count == 0)
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1612 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1613 LOG(WARNING) << "No limit on the number of stored patients";
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1614 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1615 else
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1616 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1617 LOG(WARNING) << "At most " << count << " patients will be stored";
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1618 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1619
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1620 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1621 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1622
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1623 void ServerIndex::SetMaximumStorageSize(uint64_t size)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1624 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1625 boost::mutex::scoped_lock lock(mutex_);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1626 maximumStorageSize_ = size;
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1627
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1628 if (size == 0)
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1629 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1630 LOG(WARNING) << "No limit on the size of the storage area";
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1631 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1632 else
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1633 {
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1634 LOG(WARNING) << "At most " << (size / MEGA_BYTES) << "MB will be used for the storage area";
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1635 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1636
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1637 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1638 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1639
2825 8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2726 diff changeset	1640 void ServerIndex::SetOverwriteInstances(bool overwrite)
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2726 diff changeset	1641 {
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2726 diff changeset	1642 boost::mutex::scoped_lock lock(mutex_);
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2726 diff changeset	1643 overwrite_ = overwrite;
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2726 diff changeset	1644 }
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2726 diff changeset	1645
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2726 diff changeset	1646
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1647 void ServerIndex::StandaloneRecycling()
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1648 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1649 // WARNING: No mutex here, do not include this as a public method
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1650 Transaction t(*this);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1651 Recycle(0, "");
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1652 t.Commit(0);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1653 }
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1654
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1655
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1656 bool ServerIndex::IsProtectedPatient(const std::string& publicId)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1657 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1658 boost::mutex::scoped_lock lock(mutex_);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1659
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1660 // Lookup for the requested resource
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1661 int64_t id;
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1662 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1663 if (!db_.LookupResource(id, type, publicId) \|\|
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1664 type != ResourceType_Patient)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1665 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1666 throw OrthancException(ErrorCode_ParameterOutOfRange);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1667 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1668
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1669 return db_.IsProtectedPatient(id);
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1670 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1671
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1672
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1673 void ServerIndex::SetProtectedPatient(const std::string& publicId,
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1674 bool isProtected)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1675 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1676 boost::mutex::scoped_lock lock(mutex_);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1677 Transaction transaction(*this);
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1678
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1679 // Lookup for the requested resource
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1680 int64_t id;
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1681 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1682 if (!db_.LookupResource(id, type, publicId) \|\|
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1683 type != ResourceType_Patient)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1684 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1685 throw OrthancException(ErrorCode_ParameterOutOfRange);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1686 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1687
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1688 db_.SetProtectedPatient(id, isProtected);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1689 transaction.Commit(0);
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1690
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1691 if (isProtected)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1692 LOG(INFO) << "Patient " << publicId << " has been protected";
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1693 else
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1694 LOG(INFO) << "Patient " << publicId << " has been unprotected";
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1695 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1696
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1697
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1698 void ServerIndex::GetChildren(std::list<std::string>& result,
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1699 const std::string& publicId)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1700 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1701 result.clear();
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1702
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1703 boost::mutex::scoped_lock lock(mutex_);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1704
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1705 ResourceType type;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1706 int64_t resource;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1707 if (!db_.LookupResource(resource, type, publicId))
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1708 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1709 throw OrthancException(ErrorCode_UnknownResource);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1710 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1711
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1712 if (type == ResourceType_Instance)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1713 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1714 // An instance cannot have a child
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1715 throw OrthancException(ErrorCode_BadParameterType);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1716 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1717
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1718 std::list<int64_t> tmp;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1719 db_.GetChildrenInternalId(tmp, resource);
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1720
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1721 for (std::list<int64_t>::const_iterator
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1722 it = tmp.begin(); it != tmp.end(); ++it)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1723 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1724 result.push_back(db_.GetPublicId(*it));
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1725 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1726 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1727
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1728
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1729 void ServerIndex::GetChildInstances(std::list<std::string>& result,
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1730 const std::string& publicId)
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1731 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1732 result.clear();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1733
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1734 boost::mutex::scoped_lock lock(mutex_);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1735
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1736 ResourceType type;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1737 int64_t top;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1738 if (!db_.LookupResource(top, type, publicId))
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1739 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1740 throw OrthancException(ErrorCode_UnknownResource);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1741 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1742
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1743 if (type == ResourceType_Instance)
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1744 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1745 // The resource is already an instance: Do not go down the hierarchy
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1746 result.push_back(publicId);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1747 return;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1748 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1749
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1750 std::stack<int64_t> toExplore;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1751 toExplore.push(top);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1752
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1753 std::list<int64_t> tmp;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1754
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1755 while (!toExplore.empty())
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1756 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1757 // Get the internal ID of the current resource
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1758 int64_t resource = toExplore.top();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1759 toExplore.pop();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1760
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1761 if (db_.GetResourceType(resource) == ResourceType_Instance)
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1762 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1763 result.push_back(db_.GetPublicId(resource));
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1764 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1765 else
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1766 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1767 // Tag all the children of this resource as to be explored
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1768 db_.GetChildrenInternalId(tmp, resource);
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1769 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1770 it = tmp.begin(); it != tmp.end(); ++it)
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1771 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1772 toExplore.push(*it);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1773 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1774 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1775 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1776 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1777
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1778
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1779 void ServerIndex::SetMetadata(const std::string& publicId,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1780 MetadataType type,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1781 const std::string& value)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1782 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1783 boost::mutex::scoped_lock lock(mutex_);
1773 613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1784 Transaction t(*this);
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1785
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1786 ResourceType rtype;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1787 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1788 if (!db_.LookupResource(id, rtype, publicId))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1789 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1790 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1791 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1792
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1793 db_.SetMetadata(id, type, value);
1773 613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1794
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1795 if (IsUserMetadata(type))
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1796 {
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1797 LogChange(id, ChangeType_UpdatedMetadata, rtype, publicId);
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1798 }
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1799
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1800 t.Commit(0);
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1801 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1802
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1803
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1804 void ServerIndex::DeleteMetadata(const std::string& publicId,
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1805 MetadataType type)
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1806 {
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1807 boost::mutex::scoped_lock lock(mutex_);
1773 613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1808 Transaction t(*this);
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1809
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1810 ResourceType rtype;
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1811 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1812 if (!db_.LookupResource(id, rtype, publicId))
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1813 {
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1814 throw OrthancException(ErrorCode_UnknownResource);
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1815 }
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1816
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1817 db_.DeleteMetadata(id, type);
1773 613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1818
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1819 if (IsUserMetadata(type))
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1820 {
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1821 LogChange(id, ChangeType_UpdatedMetadata, rtype, publicId);
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1822 }
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1823
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	1824 t.Commit(0);
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1825 }
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1826
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1827
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1828 bool ServerIndex::LookupMetadata(std::string& target,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1829 const std::string& publicId,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1830 MetadataType type)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1831 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1832 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1833
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1834 ResourceType rtype;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1835 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1836 if (!db_.LookupResource(id, rtype, publicId))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1837 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1838 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1839 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1840
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1841 return db_.LookupMetadata(target, id, type);
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1842 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1843
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1844
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1845 void ServerIndex::GetAllMetadata(std::map<MetadataType, std::string>& target,
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1846 const std::string& publicId)
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1847 {
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1848 boost::mutex::scoped_lock lock(mutex_);
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1849
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1850 ResourceType type;
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1851 int64_t id;
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1852 if (!db_.LookupResource(id, type, publicId))
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1853 {
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1854 throw OrthancException(ErrorCode_UnknownResource);
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1855 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1856
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1857 return db_.GetAllMetadata(target, id);
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1858 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1859
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1860
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1861 void ServerIndex::ListAvailableAttachments(std::list<FileContentType>& target,
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1862 const std::string& publicId,
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1863 ResourceType expectedType)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1864 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1865 boost::mutex::scoped_lock lock(mutex_);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1866
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1867 ResourceType type;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1868 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1869 if (!db_.LookupResource(id, type, publicId) \|\|
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1870 expectedType != type)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1871 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1872 throw OrthancException(ErrorCode_UnknownResource);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1873 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1874
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1875 db_.ListAvailableAttachments(target, id);
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1876 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1877
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1878
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1879 bool ServerIndex::LookupParent(std::string& target,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1880 const std::string& publicId)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1881 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1882 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1883
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1884 ResourceType type;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1885 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1886 if (!db_.LookupResource(id, type, publicId))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1887 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1888 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1889 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1890
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1891 int64_t parentId;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1892 if (db_.LookupParent(parentId, id))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1893 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1894 target = db_.GetPublicId(parentId);
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1895 return true;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1896 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1897 else
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1898 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1899 return false;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1900 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1901 }
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1902
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1903
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1904 uint64_t ServerIndex::IncrementGlobalSequence(GlobalProperty sequence)
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1905 {
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1906 boost::mutex::scoped_lock lock(mutex_);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1907 Transaction transaction(*this);
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1908
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1909 uint64_t seq = IncrementGlobalSequenceInternal(sequence);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1910 transaction.Commit(0);
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1911
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1912 return seq;
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1913 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1914
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1915
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1916
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1917 void ServerIndex::LogChange(ChangeType changeType,
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1918 const std::string& publicId)
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1919 {
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1920 boost::mutex::scoped_lock lock(mutex_);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1921 Transaction transaction(*this);
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1922
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1923 int64_t id;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1924 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1925 if (!db_.LookupResource(id, type, publicId))
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1926 {
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1927 throw OrthancException(ErrorCode_UnknownResource);
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1928 }
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1929
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1930 LogChange(id, changeType, type, publicId);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1931 transaction.Commit(0);
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1932 }
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1933
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1934
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1935 void ServerIndex::DeleteChanges()
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1936 {
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1937 boost::mutex::scoped_lock lock(mutex_);
3315 8bf33fa68435 Fix missing DB transactions in some write operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	1938
8bf33fa68435 Fix missing DB transactions in some write operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	1939 Transaction transaction(*this);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	1940 db_.ClearChanges();
3315 8bf33fa68435 Fix missing DB transactions in some write operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	1941 transaction.Commit(0);
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1942 }
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1943
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1944 void ServerIndex::DeleteExportedResources()
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1945 {
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1946 boost::mutex::scoped_lock lock(mutex_);
3315 8bf33fa68435 Fix missing DB transactions in some write operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	1947
8bf33fa68435 Fix missing DB transactions in some write operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	1948 Transaction transaction(*this);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	1949 db_.ClearExportedResources();
3315 8bf33fa68435 Fix missing DB transactions in some write operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	1950 transaction.Commit(0);
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1951 }
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1952
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1953
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1954 void ServerIndex::GetResourceStatistics(/* out */ ResourceType& type,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1955 /* out */ uint64_t& diskSize,
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1956 /* out */ uint64_t& uncompressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1957 /* out */ unsigned int& countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1958 /* out */ unsigned int& countSeries,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1959 /* out */ unsigned int& countInstances,
2987 96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1960 /* out */ uint64_t& dicomDiskSize,
96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1961 /* out */ uint64_t& dicomUncompressedSize,
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1962 const std::string& publicId)
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1963 {
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1964 boost::mutex::scoped_lock lock(mutex_);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1965
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1966 int64_t top;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1967 if (!db_.LookupResource(top, type, publicId))
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1968 {
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1969 throw OrthancException(ErrorCode_UnknownResource);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1970 }
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1971
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1972 std::stack<int64_t> toExplore;
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1973 toExplore.push(top);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1974
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1975 countInstances = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1976 countSeries = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1977 countStudies = 0;
2987 96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1978 diskSize = 0;
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1979 uncompressedSize = 0;
2987 96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1980 dicomDiskSize = 0;
96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1981 dicomUncompressedSize = 0;
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1982
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1983 while (!toExplore.empty())
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1984 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1985 // Get the internal ID of the current resource
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1986 int64_t resource = toExplore.top();
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1987 toExplore.pop();
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1988
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1989 ResourceType thisType = db_.GetResourceType(resource);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1990
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1991 std::list<FileContentType> f;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1992 db_.ListAvailableAttachments(f, resource);
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1993
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1994 for (std::list<FileContentType>::const_iterator
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1995 it = f.begin(); it != f.end(); ++it)
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1996 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1997 FileInfo attachment;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1998 if (db_.LookupAttachment(attachment, resource, *it))
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1999 {
2987 96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	2000 if (attachment.GetContentType() == FileContentType_Dicom)
96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	2001 {
96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	2002 dicomDiskSize += attachment.GetCompressedSize();
96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	2003 dicomUncompressedSize += attachment.GetUncompressedSize();
96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	2004 }
96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	2005
96089d1aba4d New "DicomDiskSize" and "DicomUncompressedSize" fields in statistics about resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	2006 diskSize += attachment.GetCompressedSize();
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2007 uncompressedSize += attachment.GetUncompressedSize();
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2008 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2009 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2010
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2011 if (thisType == ResourceType_Instance)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2012 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2013 countInstances++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2014 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2015 else
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2016 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2017 switch (thisType)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2018 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2019 case ResourceType_Study:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2020 countStudies++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2021 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2022
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2023 case ResourceType_Series:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2024 countSeries++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2025 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2026
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2027 default:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2028 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2029 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2030
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2031 // Tag all the children of this resource as to be explored
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2032 std::list<int64_t> tmp;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2033 db_.GetChildrenInternalId(tmp, resource);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2034 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	2035 it = tmp.begin(); it != tmp.end(); ++it)
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2036 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2037 toExplore.push(*it);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2038 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2039 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2040 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2041
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2042 if (countStudies == 0)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2043 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2044 countStudies = 1;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2045 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2046
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2047 if (countSeries == 0)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2048 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2049 countSeries = 1;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2050 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2051 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2052
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	2053
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	2054 void ServerIndex::UnstableResourcesMonitorThread(ServerIndex* that,
389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	2055 unsigned int threadSleep)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2056 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	2057 int stableAge;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	2058
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	2059 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	2060 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	2061 stableAge = lock.GetConfiguration().GetUnsignedIntegerParameter("StableAge", 60);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	2062 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2898 diff changeset	2063
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2064 if (stableAge <= 0)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2065 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2066 stableAge = 60;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2067 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2068
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2069 LOG(INFO) << "Starting the monitor for stable resources (stable age = " << stableAge << ")";
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2070
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2071 while (!that->done_)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2072 {
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	2073 // Check for stable resources each few seconds
389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	2074 boost::this_thread::sleep(boost::posix_time::milliseconds(threadSleep));
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2075
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2076 boost::mutex::scoped_lock lock(that->mutex_);
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2077
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2078 while (!that->unstableResources_.IsEmpty() &&
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2079 that->unstableResources_.GetOldestPayload().GetAge() > static_cast<unsigned int>(stableAge))
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2080 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2081 // This DICOM resource has not received any new instance for
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2082 // some time. It can be considered as stable.
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2083
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2084 UnstableResourcePayload payload;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2085 int64_t id = that->unstableResources_.RemoveOldest(payload);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2086
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2087 // Ensure that the resource is still existing before logging the change
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2088 if (that->db_.IsExistingResource(id))
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2089 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	2090 switch (payload.GetResourceType())
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2091 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	2092 case ResourceType_Patient:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	2093 that->LogChange(id, ChangeType_StablePatient, ResourceType_Patient, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2094 break;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2095
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	2096 case ResourceType_Study:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	2097 that->LogChange(id, ChangeType_StableStudy, ResourceType_Study, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2098 break;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2099
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	2100 case ResourceType_Series:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	2101 that->LogChange(id, ChangeType_StableSeries, ResourceType_Series, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2102 break;
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2103
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2104 default:
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2105 throw OrthancException(ErrorCode_InternalError);
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2106 }
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2107
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	2108 //LOG(INFO) << "Stable resource: " << EnumerationToString(payload.type_) << " " << id;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2109 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2110 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2111 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2112
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2113 LOG(INFO) << "Closing the monitor thread for stable resources";
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2114 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2115
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2116
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2117 void ServerIndex::MarkAsUnstable(int64_t id,
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	2118 Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	2119 const std::string& publicId)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2120 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2121 // WARNING: Before calling this method, "mutex_" must be locked.
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2122
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2123 assert(type == Orthanc::ResourceType_Patient \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2124 type == Orthanc::ResourceType_Study \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2125 type == Orthanc::ResourceType_Series);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2126
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	2127 UnstableResourcePayload payload(type, publicId);
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	2128 unstableResources_.AddOrMakeMostRecent(id, payload);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2129 //LOG(INFO) << "Unstable resource: " << EnumerationToString(type) << " " << id;
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	2130
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	2131 LogChange(id, ChangeType_NewChildInstance, type, publicId);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	2132 }
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	2133
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	2134
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	2135
3034 54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	2136 void ServerIndex::LookupIdentifierExact(std::vector<std::string>& result,
1728 4941494b5dd8 rename LookupIdentifier as LookupIdentifierExact Sebastien Jodogne <s.jodogne@gmail.com> parents: 1727 diff changeset	2137 ResourceType level,
4941494b5dd8 rename LookupIdentifier as LookupIdentifierExact Sebastien Jodogne <s.jodogne@gmail.com> parents: 1727 diff changeset	2138 const DicomTag& tag,
4941494b5dd8 rename LookupIdentifier as LookupIdentifierExact Sebastien Jodogne <s.jodogne@gmail.com> parents: 1727 diff changeset	2139 const std::string& value)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	2140 {
1727 1ae29c5e52fb fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	2141 assert((level == ResourceType_Patient && tag == DICOM_TAG_PATIENT_ID) \|\|
1ae29c5e52fb fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	2142 (level == ResourceType_Study && tag == DICOM_TAG_STUDY_INSTANCE_UID) \|\|
1ae29c5e52fb fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	2143 (level == ResourceType_Study && tag == DICOM_TAG_ACCESSION_NUMBER) \|\|
1ae29c5e52fb fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	2144 (level == ResourceType_Series && tag == DICOM_TAG_SERIES_INSTANCE_UID) \|\|
1ae29c5e52fb fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	2145 (level == ResourceType_Instance && tag == DICOM_TAG_SOP_INSTANCE_UID));
1725 a7c05bbfaf6a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1721 diff changeset	2146
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	2147 result.clear();
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	2148
3034 54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	2149 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true);
54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	2150
54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	2151 std::vector<DatabaseConstraint> query;
3073 0e9d1731b1b0 refactoring to reuse DatabaseConstraint in separate projects Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	2152 query.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
3034 54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	2153
3075 ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2154 std::list<std::string> tmp;
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2155
3034 54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	2156 {
54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	2157 boost::mutex::scoped_lock lock(mutex_);
3075 ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2158 db_.ApplyLookupResources(tmp, NULL, query, level, 0);
3034 54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	2159 }
3075 ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2160
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2161 CopyListToVector(result, tmp);
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	2162 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	2163
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	2164
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2165 StoreStatus ServerIndex::AddAttachment(const FileInfo& attachment,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2166 const std::string& publicId)
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2167 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2168 boost::mutex::scoped_lock lock(mutex_);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2169
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2170 Transaction t(*this);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2171
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2172 ResourceType resourceType;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2173 int64_t resourceId;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	2174 if (!db_.LookupResource(resourceId, resourceType, publicId))
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2175 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2176 return StoreStatus_Failure; // Inexistent resource
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2177 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2178
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2179 // Remove possible previous attachment
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2180 db_.DeleteAttachment(resourceId, attachment.GetContentType());
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2181
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2182 // Locate the patient of the target resource
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2183 int64_t patientId = resourceId;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2184 for (;;)
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2185 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2186 int64_t parent;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2187 if (db_.LookupParent(parent, patientId))
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2188 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2189 // We have not reached the patient level yet
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2190 patientId = parent;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2191 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2192 else
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2193 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2194 // We have reached the patient level
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2195 break;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2196 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2197 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2198
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2199 // Possibly apply the recycling mechanism while preserving this patient
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2200 assert(db_.GetResourceType(patientId) == ResourceType_Patient);
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2201 Recycle(attachment.GetCompressedSize(), db_.GetPublicId(patientId));
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2202
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2203 db_.AddAttachment(resourceId, attachment);
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2204
1773 613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	2205 if (IsUserContentType(attachment.GetContentType()))
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	2206 {
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	2207 LogChange(resourceId, ChangeType_UpdatedAttachment, resourceType, publicId);
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	2208 }
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	2209
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2210 t.Commit(attachment.GetCompressedSize());
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2211
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2212 return StoreStatus_Success;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2213 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2214
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2215
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2216 void ServerIndex::DeleteAttachment(const std::string& publicId,
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2217 FileContentType type)
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2218 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2219 boost::mutex::scoped_lock lock(mutex_);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2220 Transaction t(*this);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2221
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2222 ResourceType rtype;
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2223 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	2224 if (!db_.LookupResource(id, rtype, publicId))
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2225 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2226 throw OrthancException(ErrorCode_UnknownResource);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2227 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2228
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2229 db_.DeleteAttachment(id, type);
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2230
1773 613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	2231 if (IsUserContentType(type))
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	2232 {
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	2233 LogChange(id, ChangeType_UpdatedAttachment, rtype, publicId);
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	2234 }
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	2235
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2236 t.Commit(0);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2237 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2238
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2239
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2240 void ServerIndex::SetGlobalProperty(GlobalProperty property,
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2241 const std::string& value)
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2242 {
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2243 boost::mutex::scoped_lock lock(mutex_);
3315 8bf33fa68435 Fix missing DB transactions in some write operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	2244
8bf33fa68435 Fix missing DB transactions in some write operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	2245 Transaction transaction(*this);
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2246 db_.SetGlobalProperty(property, value);
3315 8bf33fa68435 Fix missing DB transactions in some write operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	2247 transaction.Commit(0);
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2248 }
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2249
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2250
2668 d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	2251 bool ServerIndex::LookupGlobalProperty(std::string& value,
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	2252 GlobalProperty property)
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	2253 {
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	2254 boost::mutex::scoped_lock lock(mutex_);
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	2255 return db_.LookupGlobalProperty(value, property);
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	2256 }
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	2257
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	2258
1218 efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2259 std::string ServerIndex::GetGlobalProperty(GlobalProperty property,
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2260 const std::string& defaultValue)
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2261 {
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2262 std::string value;
2668 d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	2263
d26dd081df97 saving jobs engine on exit Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	2264 if (LookupGlobalProperty(value, property))
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2265 {
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2266 return value;
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2267 }
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2268 else
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2269 {
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2270 return defaultValue;
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2271 }
1218 efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2272 }
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2273
1352 382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2274
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2275 bool ServerIndex::GetMainDicomTags(DicomMap& result,
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2276 const std::string& publicId,
1677 a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2277 ResourceType expectedType,
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2278 ResourceType levelOfInterest)
1352 382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2279 {
1677 a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2280 // Yes, the following test could be shortened, but we wish to make it as clear as possible
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2281 if (!(expectedType == ResourceType_Patient && levelOfInterest == ResourceType_Patient) &&
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2282 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Patient) &&
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2283 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Study) &&
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2284 !(expectedType == ResourceType_Series && levelOfInterest == ResourceType_Series) &&
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2285 !(expectedType == ResourceType_Instance && levelOfInterest == ResourceType_Instance))
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2286 {
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2287 throw OrthancException(ErrorCode_ParameterOutOfRange);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2288 }
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2289
1352 382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2290 result.Clear();
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2291
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2292 boost::mutex::scoped_lock lock(mutex_);
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2293
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2294 // Lookup for the requested resource
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2295 int64_t id;
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2296 ResourceType type;
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2297 if (!db_.LookupResource(id, type, publicId) \|\|
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2298 type != expectedType)
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2299 {
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2300 return false;
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2301 }
1677 a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2302
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2303 if (type == ResourceType_Study)
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2304 {
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2305 DicomMap tmp;
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2306 db_.GetMainDicomTags(tmp, id);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2307
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2308 switch (levelOfInterest)
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2309 {
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2310 case ResourceType_Patient:
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2311 tmp.ExtractPatientInformation(result);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2312 return true;
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2313
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2314 case ResourceType_Study:
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2315 tmp.ExtractStudyInformation(result);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2316 return true;
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2317
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2318 default:
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2319 throw OrthancException(ErrorCode_InternalError);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2320 }
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2321 }
1352 382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2322 else
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2323 {
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2324 db_.GetMainDicomTags(result, id);
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2325 return true;
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2326 }
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2327 }
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2328
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2329
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2330 bool ServerIndex::GetAllMainDicomTags(DicomMap& result,
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2331 const std::string& instancePublicId)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2332 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2333 result.Clear();
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2334
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2335 boost::mutex::scoped_lock lock(mutex_);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2336
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2337 // Lookup for the requested resource
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2338 int64_t instance;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2339 ResourceType type;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2340 if (!db_.LookupResource(instance, type, instancePublicId) \|\|
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2341 type != ResourceType_Instance)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2342 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2343 return false;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2344 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2345 else
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2346 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2347 DicomMap tmp;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2348
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2349 db_.GetMainDicomTags(tmp, instance);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2350 result.Merge(tmp);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2351
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2352 int64_t series;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2353 if (!db_.LookupParent(series, instance))
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2354 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2355 throw OrthancException(ErrorCode_InternalError);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2356 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2357
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2358 tmp.Clear();
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2359 db_.GetMainDicomTags(tmp, series);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2360 result.Merge(tmp);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2361
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2362 int64_t study;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2363 if (!db_.LookupParent(study, series))
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2364 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2365 throw OrthancException(ErrorCode_InternalError);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2366 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2367
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2368 tmp.Clear();
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2369 db_.GetMainDicomTags(tmp, study);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2370 result.Merge(tmp);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2371
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2372 #ifndef NDEBUG
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2373 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2374 // Sanity test to check that all the main DICOM tags from the
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2375 // patient level are copied at the study level
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2376
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2377 int64_t patient;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2378 if (!db_.LookupParent(patient, study))
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2379 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2380 throw OrthancException(ErrorCode_InternalError);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2381 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2382
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2383 tmp.Clear();
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2384 db_.GetMainDicomTags(tmp, study);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2385
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2386 std::set<DicomTag> patientTags;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2387 tmp.GetTags(patientTags);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2388
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2389 for (std::set<DicomTag>::const_iterator
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2390 it = patientTags.begin(); it != patientTags.end(); ++it)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2391 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2392 assert(result.HasTag(*it));
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2393 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2394 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2395 #endif
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2396
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2397 return true;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2398 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2399 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2400
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2987 diff changeset	2401
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2402 bool ServerIndex::LookupResourceType(ResourceType& type,
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2403 const std::string& publicId)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2404 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2405 boost::mutex::scoped_lock lock(mutex_);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2406
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2407 int64_t id;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2408 return db_.LookupResource(id, type, publicId);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2409 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2410
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2411
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2412 unsigned int ServerIndex::GetDatabaseVersion()
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2413 {
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2414 boost::mutex::scoped_lock lock(mutex_);
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2415 return db_.GetDatabaseVersion();
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2416 }
1750 55d52567bebb LookupResource implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 1747 diff changeset	2417
55d52567bebb LookupResource implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 1747 diff changeset	2418
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2419 bool ServerIndex::LookupParent(std::string& target,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2420 const std::string& publicId,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2421 ResourceType parentType)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2422 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2423 boost::mutex::scoped_lock lock(mutex_);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2424
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2425 ResourceType type;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2426 int64_t id;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2427 if (!db_.LookupResource(id, type, publicId))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2428 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2429 throw OrthancException(ErrorCode_UnknownResource);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2430 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2431
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2432 while (type != parentType)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2433 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2434 int64_t parentId;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2435
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2436 if (type == ResourceType_Patient \|\| // Cannot further go up in hierarchy
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2437 !db_.LookupParent(parentId, id))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2438 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2439 return false;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2440 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2441
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2442 id = parentId;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2443 type = GetParentResourceType(type);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2444 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2445
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2446 target = db_.GetPublicId(id);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2447 return true;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1823 diff changeset	2448 }
2209 e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2449
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2450
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2451 void ServerIndex::ReconstructInstance(ParsedDicomFile& dicom)
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2452 {
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2453 DicomMap summary;
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2454 dicom.ExtractDicomSummary(summary);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2455
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2456 DicomInstanceHasher hasher(summary);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2457
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2458 boost::mutex::scoped_lock lock(mutex_);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2459
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2460 try
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2461 {
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2462 Transaction t(*this);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2463
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2464 int64_t patient = -1, study = -1, series = -1, instance = -1;
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2465
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2466 ResourceType dummy;
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2467 if (!db_.LookupResource(patient, dummy, hasher.HashPatient()) \|\|
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2468 !db_.LookupResource(study, dummy, hasher.HashStudy()) \|\|
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2469 !db_.LookupResource(series, dummy, hasher.HashSeries()) \|\|
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2470 !db_.LookupResource(instance, dummy, hasher.HashInstance()) \|\|
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2471 patient == -1 \|\|
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2472 study == -1 \|\|
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2473 series == -1 \|\|
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2474 instance == -1)
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2475 {
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2476 throw OrthancException(ErrorCode_InternalError);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2477 }
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2478
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2479 db_.ClearMainDicomTags(patient);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2480 db_.ClearMainDicomTags(study);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2481 db_.ClearMainDicomTags(series);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2482 db_.ClearMainDicomTags(instance);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2483
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	2484 {
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	2485 ResourcesContent content;
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	2486 content.AddResource(patient, ResourceType_Patient, summary);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	2487 content.AddResource(study, ResourceType_Study, summary);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	2488 content.AddResource(series, ResourceType_Series, summary);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	2489 content.AddResource(instance, ResourceType_Instance, summary);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	2490 db_.SetResourcesContent(content);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	2491 }
2209 e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2492
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2493 {
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2494 std::string s;
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2495 if (dicom.LookupTransferSyntax(s))
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2496 {
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2497 db_.SetMetadata(instance, MetadataType_Instance_TransferSyntax, s);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2498 }
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2499 }
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2500
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2501 const DicomValue* value;
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2502 if ((value = summary.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2503 !value->IsNull() &&
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2504 !value->IsBinary())
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2505 {
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2506 db_.SetMetadata(instance, MetadataType_Instance_SopClassUid, value->GetContent());
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2507 }
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2508
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2509 t.Commit(0); // No change in the DB size
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2510 }
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2511 catch (OrthancException& e)
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2512 {
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2513 LOG(ERROR) << "EXCEPTION [" << e.What() << "]";
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2514 }
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	2515 }
3025 039a9d262d64 preparing to speed up find in databases Sebastien Jodogne <s.jodogne@gmail.com> parents: 3020 diff changeset	2516
039a9d262d64 preparing to speed up find in databases Sebastien Jodogne <s.jodogne@gmail.com> parents: 3020 diff changeset	2517
3029 ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	2518 void ServerIndex::NormalizeLookup(std::vector<DatabaseConstraint>& target,
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2519 const DatabaseLookup& source,
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2520 ResourceType queryLevel) const
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2521 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2522 assert(mainDicomTagsRegistry_.get() != NULL);
3029 ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	2523
ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	2524 target.clear();
ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	2525 target.reserve(source.GetConstraintsCount());
3031 18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	2526
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2527 for (size_t i = 0; i < source.GetConstraintsCount(); i++)
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2528 {
3031 18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	2529 ResourceType level;
18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	2530 DicomTagType type;
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2531
3031 18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	2532 mainDicomTagsRegistry_->LookupTag(level, type, source.GetConstraint(i).GetTag());
18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	2533
18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	2534 if (type == DicomTagType_Identifier \|\|
18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	2535 type == DicomTagType_Main)
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2536 {
3029 ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	2537 // Use the fact that patient-level tags are copied at the study level
3031 18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	2538 if (level == ResourceType_Patient &&
18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	2539 queryLevel != ResourceType_Patient)
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2540 {
3031 18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	2541 level = ResourceType_Study;
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2542 }
3029 ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	2543
3073 0e9d1731b1b0 refactoring to reuse DatabaseConstraint in separate projects Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	2544 target.push_back(source.GetConstraint(i).ConvertToDatabaseConstraint(level, type));
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2545 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2546 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2547 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2548
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2549
3025 039a9d262d64 preparing to speed up find in databases Sebastien Jodogne <s.jodogne@gmail.com> parents: 3020 diff changeset	2550 void ServerIndex::ApplyLookupResources(std::vector<std::string>& resourcesId,
3036 8fd203510d8b moving LookupIdentifierQuery to the graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3034 diff changeset	2551 std::vector<std::string>* instancesId,
3025 039a9d262d64 preparing to speed up find in databases Sebastien Jodogne <s.jodogne@gmail.com> parents: 3020 diff changeset	2552 const DatabaseLookup& lookup,
039a9d262d64 preparing to speed up find in databases Sebastien Jodogne <s.jodogne@gmail.com> parents: 3020 diff changeset	2553 ResourceType queryLevel,
039a9d262d64 preparing to speed up find in databases Sebastien Jodogne <s.jodogne@gmail.com> parents: 3020 diff changeset	2554 size_t limit)
039a9d262d64 preparing to speed up find in databases Sebastien Jodogne <s.jodogne@gmail.com> parents: 3020 diff changeset	2555 {
3029 ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	2556 std::vector<DatabaseConstraint> normalized;
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2557 NormalizeLookup(normalized, lookup, queryLevel);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2558
3075 ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2559 std::list<std::string> resourcesList, instancesList;
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2560
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2561 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2562 boost::mutex::scoped_lock lock(mutex_);
3075 ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2563
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2564 if (instancesId == NULL)
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2565 {
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2566 db_.ApplyLookupResources(resourcesList, NULL, normalized, queryLevel, limit);
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2567 }
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2568 else
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2569 {
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2570 db_.ApplyLookupResources(resourcesList, &instancesList, normalized, queryLevel, limit);
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2571 }
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2572 }
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2573
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2574 CopyListToVector(resourcesId, resourcesList);
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2575
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2576 if (instancesId != NULL)
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2577 {
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists Sebastien Jodogne <s.jodogne@gmail.com> parents: 3073 diff changeset	2578 CopyListToVector(*instancesId, instancesList);
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	2579 }
3025 039a9d262d64 preparing to speed up find in databases Sebastien Jodogne <s.jodogne@gmail.com> parents: 3020 diff changeset	2580 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2581 }

Mercurial > hg > orthanc

annotate OrthancServer/ServerIndex.cpp @ 3609:f7ade98d8229 storage-commitment