orthanc: OrthancServer/ServerIndex.cpp annotate

annotate OrthancServer/ServerIndex.cpp @ 1715:c3baf74e443f db-changes

simplify

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 16 Oct 2015 18:34:53 +0200
parents	5ebd6cbb3da8
children	2ca7888f8600

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
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	4 * Department, University Hospital of Liege, Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	10 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	11 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	12 * 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	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	15 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	16 * 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	17 * 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	18 * 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	19 * 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	20 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	21 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * 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	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 **/
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
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	33 #include "PrecompiledHeadersServer.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "ServerIndex.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
6 9d483cf71d17 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	36 #ifndef NOMINMAX
2 67a6978503b7 fixing Windows build Jodogne@Laptop parents: 0 diff changeset	37 #define NOMINMAX
6 9d483cf71d17 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	38 #endif
9d483cf71d17 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	39
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1196 diff changeset	40 #include "ServerIndexChange.h"
8 3a584803783e build with visual studio jodogne parents: 6 diff changeset	41 #include "EmbeddedResources.h"
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	42 #include "OrthancInitialization.h"
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	43 #include "ServerToolbox.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 #include "../Core/Toolbox.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1453 diff changeset	45 #include "../Core/Logging.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 #include "../Core/Uuid.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 #include "../Core/DicomFormat/DicomArray.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1453 diff changeset	48
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 #include "FromDcmtkBridge.h"
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	50 #include "ServerContext.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 #include <boost/lexical_cast.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 #include <stdio.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	55 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	56
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	57 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	59 class ServerIndex::Listener : public IDatabaseListener
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	61 private:
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	62 struct FileToRemove
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	63 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	64 private:
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	65 std::string uuid_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	66 FileContentType type_;
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	67
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	68 public:
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	69 FileToRemove(const FileInfo& info) : uuid_(info.GetUuid()),
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	70 type_(info.GetContentType())
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	71 {
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	72 }
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	73
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	74 const std::string& GetUuid() const
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	75 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	76 return uuid_;
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	77 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	78
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	79 FileContentType GetContentType() const
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	80 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	81 return type_;
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	82 }
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	83 };
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	84
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	85 ServerContext& context_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	86 bool hasRemainingLevel_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	87 ResourceType remainingType_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	88 std::string remainingPublicId_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	89 std::list<FileToRemove> pendingFilesToRemove_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	90 std::list<ServerIndexChange> pendingChanges_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	91 uint64_t sizeOfFilesToRemove_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	92 bool insideTransaction_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	93
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	94 void Reset()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	95 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	96 sizeOfFilesToRemove_ = 0;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	97 hasRemainingLevel_ = false;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	98 pendingFilesToRemove_.clear();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	99 pendingChanges_.clear();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	100 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	101
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	102 public:
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	103 Listener(ServerContext& context) : context_(context),
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	104 insideTransaction_(false)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	105 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	106 Reset();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	107 assert(ResourceType_Patient < ResourceType_Study &&
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	108 ResourceType_Study < ResourceType_Series &&
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	109 ResourceType_Series < ResourceType_Instance);
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	110 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	111
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	112 void StartTransaction()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	113 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	114 Reset();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	115 insideTransaction_ = true;
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
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	118 void EndTransaction()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	119 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	120 insideTransaction_ = false;
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 uint64_t GetSizeOfFilesToRemove()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	124 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	125 return sizeOfFilesToRemove_;
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
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	128 void CommitFilesToRemove()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	129 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	130 for (std::list<FileToRemove>::const_iterator
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	131 it = pendingFilesToRemove_.begin();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	132 it != pendingFilesToRemove_.end(); ++it)
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	133 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	134 context_.RemoveFile(it->GetUuid(), it->GetContentType());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	135 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	136 }
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 void CommitChanges()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	139 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	140 for (std::list<ServerIndexChange>::const_iterator
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	141 it = pendingChanges_.begin();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	142 it != pendingChanges_.end(); ++it)
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 context_.SignalChange(*it);
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 }
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 virtual void SignalRemainingAncestor(ResourceType parentType,
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	149 const std::string& publicId)
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 VLOG(1) << "Remaining ancestor \"" << publicId << "\" (" << parentType << ")";
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	152
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	153 if (hasRemainingLevel_)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	154 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	155 if (parentType < remainingType_)
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	156 {
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	157 remainingType_ = parentType;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	158 remainingPublicId_ = publicId;
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	159 }
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1148 diff changeset	160 }
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	161 else
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	162 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	163 hasRemainingLevel_ = true;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	164 remainingType_ = parentType;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	165 remainingPublicId_ = publicId;
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 }
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	168
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	169 virtual void SignalFileDeleted(const FileInfo& info)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	170 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	171 assert(Toolbox::IsUuid(info.GetUuid()));
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	172 pendingFilesToRemove_.push_back(FileToRemove(info));
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	173 sizeOfFilesToRemove_ += info.GetCompressedSize();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	174 }
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 virtual void SignalChange(const ServerIndexChange& change)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	177 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	178 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	179 << EnumerationToString(change.GetResourceType()) << ": "
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	180 << EnumerationToString(change.GetChangeType());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	181
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	182 if (insideTransaction_)
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 pendingChanges_.push_back(change);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	185 }
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	186 else
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	187 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	188 context_.SignalChange(change);
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	189 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	190 }
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 bool HasRemainingLevel() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	193 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	194 return hasRemainingLevel_;
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 ResourceType GetRemainingType() const
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 assert(HasRemainingLevel());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	200 return remainingType_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	201 }
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 const std::string& GetRemainingPublicId() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	204 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	205 assert(HasRemainingLevel());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	206 return remainingPublicId_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	207 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	208 };
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	211 class ServerIndex::Transaction
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	212 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	213 private:
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	214 ServerIndex& index_;
1235 9b4977e3c19d abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	215 std::auto_ptr<SQLite::ITransaction> transaction_;
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	216 bool isCommitted_;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	217
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	218 public:
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	219 Transaction(ServerIndex& index) :
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	220 index_(index),
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	221 isCommitted_(false)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	222 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	223 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	224 transaction_->Begin();
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	225
1270 cf5bd2dc3b7a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1249 diff changeset	226 assert(index_.currentStorageSize_ == index_.db_.GetTotalCompressedSize());
cf5bd2dc3b7a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1249 diff changeset	227
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	228 index_.listener_->StartTransaction();
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	229 }
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	230
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	231 ~Transaction()
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	232 {
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	233 index_.listener_->EndTransaction();
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	234
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	235 if (!isCommitted_)
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	236 {
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	237 transaction_->Rollback();
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	238 }
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	239 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	240
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	241 void Commit(uint64_t sizeOfAddedFiles)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	242 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	243 if (!isCommitted_)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	244 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	245 transaction_->Commit();
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	246
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	247 // 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	248 // 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	249 // deleted because of recycling.
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	250 index_.listener_->CommitFilesToRemove();
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	251
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	252 index_.currentStorageSize_ += sizeOfAddedFiles;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	253
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	254 assert(index_.currentStorageSize_ >= index_.listener_->GetSizeOfFilesToRemove());
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	255 index_.currentStorageSize_ -= index_.listener_->GetSizeOfFilesToRemove();
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	256
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	257 // Send all the pending changes to the Orthanc plugins
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	258 index_.listener_->CommitChanges();
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	259
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	260 isCommitted_ = true;
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 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	263 };
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	264
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	265
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	266 class ServerIndex::UnstableResourcePayload
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	267 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	268 private:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	269 ResourceType type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	270 std::string publicId_;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	271 boost::posix_time::ptime time_;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	272
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	273 public:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	274 UnstableResourcePayload() : type_(ResourceType_Instance)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	275 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	276 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	277
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	278 UnstableResourcePayload(Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	279 const std::string& publicId) :
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	280 type_(type),
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	281 publicId_(publicId)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	282 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	283 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	284 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	285
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	286 unsigned int GetAge() const
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	287 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	288 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	289 }
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	290
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	291 ResourceType GetResourceType() const
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	292 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	293 return type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	294 }
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	295
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	296 const std::string& GetPublicId() const
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	297 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	298 return publicId_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	299 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	300 };
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
212 f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 206 diff changeset	303 bool ServerIndex::DeleteResource(Json::Value& target,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304 const std::string& uuid,
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	305 ResourceType expectedType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	307 boost::mutex::scoped_lock lock(mutex_);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	308
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	309 Transaction t(*this);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	310
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	311 int64_t id;
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	312 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	313 if (!db_.LookupResource(id, type, uuid) \|\|
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	314 expectedType != type)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	318
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	319 db_.DeleteResource(id);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	321 if (listener_->HasRemainingLevel())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 {
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	323 ResourceType type = listener_->GetRemainingType();
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	324 const std::string& uuid = listener_->GetRemainingPublicId();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 target["RemainingAncestor"] = Json::Value(Json::objectValue);
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	327 target["RemainingAncestor"]["Path"] = GetBasePath(type, uuid);
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	328 target["RemainingAncestor"]["Type"] = EnumerationToString(type);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 target["RemainingAncestor"]["ID"] = uuid;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 target["RemainingAncestor"] = Json::nullValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	336 t.Commit(0);
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	337
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 return true;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	342 void ServerIndex::FlushThread(ServerIndex* that)
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	343 {
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	344 // 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	345 unsigned int sleep = 10;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	346
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	347 try
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	348 {
744 ec69658b031b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 739 diff changeset	349 boost::mutex::scoped_lock lock(that->mutex_);
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	350 std::string sleepString;
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	351
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	352 if (that->db_.LookupGlobalProperty(sleepString, GlobalProperty_FlushSleep) &&
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	353 Toolbox::IsInteger(sleepString))
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	354 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	355 sleep = boost::lexical_cast<unsigned int>(sleepString);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	356 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	357 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	358 catch (boost::bad_lexical_cast&)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	359 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	360 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	361
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	362 LOG(INFO) << "Starting the database flushing thread (sleep = " << sleep << ")";
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	363
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	364 unsigned int count = 0;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	365
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	366 while (!that->done_)
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	367 {
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	368 boost::this_thread::sleep(boost::posix_time::seconds(1));
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	369 count++;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	370 if (count < sleep)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	371 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	372 continue;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	373 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	374
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	375 boost::mutex::scoped_lock lock(that->mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	376 that->db_.FlushToDisk();
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	377 count = 0;
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	378 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	379
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	380 LOG(INFO) << "Stopping the database flushing thread";
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	381 }
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	382
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	383
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	384 static void ComputeExpectedNumberOfInstances(IDatabaseWrapper& db,
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	385 int64_t series,
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	386 const DicomMap& dicomSummary)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	387 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	388 try
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	389 {
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	390 const DicomValue* value;
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	391 const DicomValue* value2;
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	392
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	393 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL &&
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	394 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS)) != NULL)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	395 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	396 // Patch for series with temporal positions thanks to Will Ryder
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	397 int64_t imagesInAcquisition = boost::lexical_cast<int64_t>(value->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	398 int64_t countTemporalPositions = boost::lexical_cast<int64_t>(value2->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	399 std::string expected = boost::lexical_cast<std::string>(imagesInAcquisition * countTemporalPositions);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	400 db.SetMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, expected);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	401 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	402
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	403 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL &&
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	404 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TIME_SLICES)) != NULL)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	405 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	406 // Support of Cardio-PET images
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	407 int64_t numberOfSlices = boost::lexical_cast<int64_t>(value->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	408 int64_t numberOfTimeSlices = boost::lexical_cast<int64_t>(value2->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	409 std::string expected = boost::lexical_cast<std::string>(numberOfSlices * numberOfTimeSlices);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	410 db.SetMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, expected);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	411 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	412
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	413 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	414 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	415 db.SetMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, value->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	416 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	417 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	418 catch (boost::bad_lexical_cast)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	419 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	420 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	421 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	422
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	423
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	424
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	425
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	426 bool ServerIndex::GetMetadataAsInteger(int64_t& result,
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	427 int64_t id,
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	428 MetadataType type)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	429 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	430 std::string s;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	431 if (!db_.LookupMetadata(s, id, type))
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	432 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	433 return false;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	434 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	435
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	436 try
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	437 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	438 result = boost::lexical_cast<int64_t>(s);
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	439 return true;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	440 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	441 catch (boost::bad_lexical_cast&)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	442 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	443 return false;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	444 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	445 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	446
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	447
1297 501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	448 void ServerIndex::LogChange(int64_t internalId,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	449 ChangeType changeType,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	450 ResourceType resourceType,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	451 const std::string& publicId)
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	452 {
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	453 ServerIndexChange change(changeType, resourceType, publicId);
1300 919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	454
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	455 if (changeType <= ChangeType_INTERNAL_LastLogged)
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	456 {
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	457 db_.LogChange(internalId, change);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	458 }
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	459
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	460 assert(listener_.get() != NULL);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	461 listener_->SignalChange(change);
1297 501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	462 }
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	463
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	464
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	465 uint64_t ServerIndex::IncrementGlobalSequenceInternal(GlobalProperty property)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	466 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	467 std::string oldValue;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	468
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	469 if (db_.LookupGlobalProperty(oldValue, property))
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	470 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	471 uint64_t oldNumber;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	472
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	473 try
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	474 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	475 oldNumber = boost::lexical_cast<uint64_t>(oldValue);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	476 db_.SetGlobalProperty(property, boost::lexical_cast<std::string>(oldNumber + 1));
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	477 return oldNumber + 1;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	478 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	479 catch (boost::bad_lexical_cast&)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	480 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	481 throw OrthancException(ErrorCode_InternalError);
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	482 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	483 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	484 else
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	485 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	486 // Initialize the sequence at "1"
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	487 db_.SetGlobalProperty(property, "1");
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	488 return 1;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	489 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	490 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	491
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	492
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	493
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	494 int64_t ServerIndex::CreateResource(const std::string& publicId,
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	495 ResourceType type)
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	496 {
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	497 int64_t id = db_.CreateResource(publicId, type);
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	498
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	499 ChangeType changeType;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	500 switch (type)
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	501 {
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	502 case ResourceType_Patient:
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	503 changeType = ChangeType_NewPatient;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	504 break;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	505
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	506 case ResourceType_Study:
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	507 changeType = ChangeType_NewStudy;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	508 break;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	509
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	510 case ResourceType_Series:
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	511 changeType = ChangeType_NewSeries;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	512 break;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	513
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	514 case ResourceType_Instance:
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	515 changeType = ChangeType_NewInstance;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	516 break;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	517
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	518 default:
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	519 throw OrthancException(ErrorCode_InternalError);
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	520 }
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	521
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	522 ServerIndexChange change(changeType, type, publicId);
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	523 db_.LogChange(id, change);
1300 919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	524
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	525 assert(listener_.get() != NULL);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	526 listener_->SignalChange(change);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	527
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	528 return id;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	529 }
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	530
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	531
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	532 ServerIndex::ServerIndex(ServerContext& context,
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	533 IDatabaseWrapper& db) :
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	534 done_(false),
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	535 db_(db),
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	536 maximumStorageSize_(0),
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	537 maximumPatients_(0)
186 f68c039b0571 preparing refactoring of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 180 diff changeset	538 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	539 listener_.reset(new Listener(context));
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	540 db_.SetListener(*listener_);
180 626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	541
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	542 currentStorageSize_ = db_.GetTotalCompressedSize();
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	543
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	544 // 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	545 // execution of Orthanc
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	546 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	547
1306 8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	548 if (db.HasFlushToDisk())
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	549 {
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	550 flushThread_ = boost::thread(FlushThread, this);
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	551 }
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	552
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	553 unstableResourcesMonitorThread_ = boost::thread(UnstableResourcesMonitorThread, this);
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	554 }
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	555
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	556
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	557
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	558 ServerIndex::~ServerIndex()
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	559 {
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	560 if (!done_)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	561 {
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	562 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	563 Stop();
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	564 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	567
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	568
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	569 void ServerIndex::Stop()
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	570 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	571 if (!done_)
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	572 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	573 done_ = true;
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	574
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	575 if (db_.HasFlushToDisk() &&
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	576 flushThread_.joinable())
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	577 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	578 flushThread_.join();
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	579 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	580
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	581 if (unstableResourcesMonitorThread_.joinable())
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	582 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	583 unstableResourcesMonitorThread_.join();
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	584 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	585 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	586 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	587
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	588
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	589
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	590 StoreStatus ServerIndex::Store(std::map<MetadataType, std::string>& instanceMetadata,
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	591 const DicomMap& dicomSummary,
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	592 const Attachments& attachments,
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	593 const std::string& remoteAet,
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	594 const MetadataMap& metadata)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	596 boost::mutex::scoped_lock lock(mutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	598 instanceMetadata.clear();
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	599
178 5739b4d10a4b hashing Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	600 DicomInstanceHasher hasher(dicomSummary);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 {
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	604 Transaction t(*this);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	605
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	606 // Do nothing if the instance already exists
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607 {
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	608 ResourceType type;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	609 int64_t tmp;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	610 if (db_.LookupResource(tmp, type, hasher.HashInstance()))
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	611 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	612 assert(type == ResourceType_Instance);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	613 db_.GetAllMetadata(instanceMetadata, tmp);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	614 return StoreStatus_AlreadyStored;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	615 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	618 // 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	619 uint64_t instanceSize = 0;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	620 for (Attachments::const_iterator it = attachments.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	621 it != attachments.end(); ++it)
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	622 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	623 instanceSize += it->GetCompressedSize();
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	624 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	625
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	626 Recycle(instanceSize, hasher.HashPatient());
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	627
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	628 // Create the instance
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	629 int64_t instance = CreateResource(hasher.HashInstance(), ResourceType_Instance);
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	630 Toolbox::SetMainDicomTags(db_, instance, ResourceType_Instance, dicomSummary, true);
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	631
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	632 // Detect up to which level the patient/study/series/instance
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	633 // hierarchy must be created
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	634 int64_t patient = -1, study = -1, series = -1;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	635 bool isNewPatient = false;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	636 bool isNewStudy = false;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	637 bool isNewSeries = false;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	638
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639 {
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	640 ResourceType dummy;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	641
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	642 if (db_.LookupResource(series, dummy, hasher.HashSeries()))
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	643 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	644 assert(dummy == ResourceType_Series);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	645 // The patient, the study and the series already exist
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	646
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	647 bool ok = (db_.LookupResource(patient, dummy, hasher.HashPatient()) &&
910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	648 db_.LookupResource(study, dummy, hasher.HashStudy()));
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	649 assert(ok);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	650 }
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	651 else if (db_.LookupResource(study, dummy, hasher.HashStudy()))
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	652 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	653 assert(dummy == ResourceType_Study);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	654
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	655 // New series: The patient and the study already exist
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	656 isNewSeries = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	657
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	658 bool ok = db_.LookupResource(patient, dummy, hasher.HashPatient());
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	659 assert(ok);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	660 }
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	661 else if (db_.LookupResource(patient, dummy, hasher.HashPatient()))
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	662 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	663 assert(dummy == ResourceType_Patient);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	664
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	665 // New study and series: The patient already exist
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	666 isNewStudy = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	667 isNewSeries = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	668 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	669 else
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	670 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	671 // New patient, study and series: Nothing exists
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	672 isNewPatient = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	673 isNewStudy = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	674 isNewSeries = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	675 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	676 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	677
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	678 // Create the series if needed
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	679 if (isNewSeries)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	680 {
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	681 series = CreateResource(hasher.HashSeries(), ResourceType_Series);
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	682 Toolbox::SetMainDicomTags(db_, series, ResourceType_Series, dicomSummary, true);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	683 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	684
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	685 // Create the study if needed
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	686 if (isNewStudy)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	687 {
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	688 study = CreateResource(hasher.HashStudy(), ResourceType_Study);
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	689 Toolbox::SetMainDicomTags(db_, study, ResourceType_Study, dicomSummary, true);
1711 5ebd6cbb3da8 Backed out changeset 2ad22b2970a2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1709 diff changeset	690 Toolbox::SetMainDicomTags(db_, study, ResourceType_Patient, dicomSummary, false); // New in version 0.9.5 (db v6)
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	691 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	692
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	693 // Create the patient if needed
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	694 if (isNewPatient)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	695 {
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	696 patient = CreateResource(hasher.HashPatient(), ResourceType_Patient);
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	697 Toolbox::SetMainDicomTags(db_, patient, ResourceType_Patient, dicomSummary, true);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	698 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	699
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	700 // Create the parent-to-child links
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	701 db_.AttachChild(series, instance);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	702
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	703 if (isNewSeries)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	704 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	705 db_.AttachChild(study, series);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	706 }
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	707
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	708 if (isNewStudy)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	710 db_.AttachChild(patient, study);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	712
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	713 // Sanity checks
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	714 assert(patient != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	715 assert(study != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	716 assert(series != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	717 assert(instance != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	718
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	719 // Attach the files to the newly created instance
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	720 for (Attachments::const_iterator it = attachments.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	721 it != attachments.end(); ++it)
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	722 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	723 db_.AddAttachment(instance, *it);
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	724 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	725
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	726 // Attach the user-specified metadata
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	727 for (MetadataMap::const_iterator
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	728 it = metadata.begin(); it != metadata.end(); ++it)
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	729 {
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	730 switch (it->first.first)
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	731 {
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	732 case ResourceType_Patient:
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	733 db_.SetMetadata(patient, it->first.second, it->second);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	734 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	735
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	736 case ResourceType_Study:
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	737 db_.SetMetadata(study, it->first.second, it->second);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	738 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	739
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	740 case ResourceType_Series:
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	741 db_.SetMetadata(series, it->first.second, it->second);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	742 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	743
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	744 case ResourceType_Instance:
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	745 db_.SetMetadata(instance, it->first.second, it->second);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	746 instanceMetadata[it->first.second] = it->second;
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	747 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	748
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	749 default:
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	750 throw OrthancException(ErrorCode_ParameterOutOfRange);
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	751 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	752 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	753
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	754 // Attach the auto-computed metadata for the patient/study/series levels
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	755 std::string now = Toolbox::GetNowIsoString();
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	756 db_.SetMetadata(series, MetadataType_LastUpdate, now);
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	757 db_.SetMetadata(study, MetadataType_LastUpdate, now);
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	758 db_.SetMetadata(patient, MetadataType_LastUpdate, now);
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	759
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	760 // Attach the auto-computed metadata for the instance level,
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	761 // reflecting these additions into the input metadata map
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	762 db_.SetMetadata(instance, MetadataType_Instance_ReceptionDate, now);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	763 instanceMetadata[MetadataType_Instance_ReceptionDate] = now;
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	764
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	765 db_.SetMetadata(instance, MetadataType_Instance_RemoteAet, remoteAet);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	766 instanceMetadata[MetadataType_Instance_RemoteAet] = remoteAet;
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	767
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	768 const DicomValue* value;
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	769 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL \|\|
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	770 (value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	771 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	772 db_.SetMetadata(instance, MetadataType_Instance_IndexInSeries, value->AsString());
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	773 instanceMetadata[MetadataType_Instance_IndexInSeries] = value->AsString();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	774 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	775
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	776 // Check whether the series of this new instance is now completed
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	777 if (isNewSeries)
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	778 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	779 ComputeExpectedNumberOfInstances(db_, series, dicomSummary);
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	780 }
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	781
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	782 SeriesStatus seriesStatus = GetSeriesStatus(series);
6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	783 if (seriesStatus == SeriesStatus_Complete)
6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	784 {
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	785 LogChange(series, ChangeType_CompletedSeries, ResourceType_Series, hasher.HashSeries());
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	786 }
6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	787
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	788 // Mark the parent resources of this instance as unstable
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	789 MarkAsUnstable(series, ResourceType_Series, hasher.HashSeries());
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	790 MarkAsUnstable(study, ResourceType_Study, hasher.HashStudy());
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	791 MarkAsUnstable(patient, ResourceType_Patient, hasher.HashPatient());
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	792
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	793 t.Commit(instanceSize);
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	794
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	795 return StoreStatus_Success;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796 }
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	797 catch (OrthancException& e)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	798 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	799 LOG(ERROR) << "EXCEPTION [" << e.What() << "]";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	800 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	801
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	802 return StoreStatus_Failure;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	803 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	805
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	806 void ServerIndex::ComputeStatistics(Json::Value& target)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	808 boost::mutex::scoped_lock lock(mutex_);
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	809 target = Json::objectValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	810
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	811 uint64_t cs = currentStorageSize_;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	812 assert(cs == db_.GetTotalCompressedSize());
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	813 uint64_t us = db_.GetTotalUncompressedSize();
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	814 target["TotalDiskSize"] = boost::lexical_cast<std::string>(cs);
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	815 target["TotalUncompressedSize"] = boost::lexical_cast<std::string>(us);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	816 target["TotalDiskSizeMB"] = static_cast<unsigned int>(cs / MEGA_BYTES);
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	817 target["TotalUncompressedSizeMB"] = static_cast<unsigned int>(us / MEGA_BYTES);
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	818
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	819 target["CountPatients"] = static_cast<unsigned int>(db_.GetResourceCount(ResourceType_Patient));
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	820 target["CountStudies"] = static_cast<unsigned int>(db_.GetResourceCount(ResourceType_Study));
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	821 target["CountSeries"] = static_cast<unsigned int>(db_.GetResourceCount(ResourceType_Series));
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	822 target["CountInstances"] = static_cast<unsigned int>(db_.GetResourceCount(ResourceType_Instance));
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	823 }
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	824
187 8e673a65564d refactoring of storing new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	825
8e673a65564d refactoring of storing new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	826
585 b2357f1f026f fix types jodogne parents: 521 diff changeset	827 SeriesStatus ServerIndex::GetSeriesStatus(int64_t id)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	828 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	829 // Get the expected number of instances in this series (from the metadata)
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	830 int64_t expected;
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	831 if (!GetMetadataAsInteger(expected, id, MetadataType_Series_ExpectedNumberOfInstances))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	832 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	833 return SeriesStatus_Unknown;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	834 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	835
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	836 // Loop over the instances of this series
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	837 std::list<int64_t> children;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	838 db_.GetChildrenInternalId(children, id);
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	839
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	840 std::set<int64_t> instances;
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	841 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	842 it = children.begin(); it != children.end(); ++it)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	843 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	844 // Get the index of this instance in the series
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	845 int64_t index;
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	846 if (!GetMetadataAsInteger(index, *it, MetadataType_Instance_IndexInSeries))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	847 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	848 return SeriesStatus_Unknown;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	849 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	850
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	851 if (!(index > 0 && index <= expected))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	852 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	853 // Out-of-range instance index
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	854 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	855 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	856
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	857 if (instances.find(index) != instances.end())
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	858 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	859 // Twice the same instance index
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	860 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	861 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	862
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	863 instances.insert(index);
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	864 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	865
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	866 if (static_cast<int64_t>(instances.size()) == expected)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	867 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	868 return SeriesStatus_Complete;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	869 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	870 else
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	871 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	872 return SeriesStatus_Missing;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	873 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	874 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	875
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	876
1677 a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	877 static std::string GetPatientIdOfStudy(IDatabaseWrapper& db,
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	878 int64_t resourceId)
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	879 {
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	880 int64_t patient;
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	881 if (!db.LookupParent(patient, resourceId))
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	882 {
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	883 throw OrthancException(ErrorCode_InternalError);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	884 }
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	885
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	886 DicomMap tags;
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	887 db.GetMainDicomTags(tags, patient);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	888
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	889 if (tags.HasTag(DICOM_TAG_PATIENT_ID))
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	890 {
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	891 return tags.GetValue(DICOM_TAG_PATIENT_ID).AsString();
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	892 }
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	893 else
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	894 {
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	895 return "";
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	896 }
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	897 }
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	898
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	899
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	900 void ServerIndex::MainDicomTagsToJson(Json::Value& target,
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	901 int64_t resourceId,
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	902 ResourceType resourceType)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	903 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	904 DicomMap tags;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	905 db_.GetMainDicomTags(tags, resourceId);
1676 f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	906
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	907 if (resourceType == ResourceType_Study)
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	908 {
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	909 DicomMap t1, t2;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	910 tags.ExtractStudyInformation(t1);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	911 tags.ExtractPatientInformation(t2);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	912
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	913 target["MainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	914 FromDcmtkBridge::ToJson(target["MainDicomTags"], t1, true);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	915
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	916 target["PatientMainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	917 FromDcmtkBridge::ToJson(target["PatientMainDicomTags"], t2, true);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	918
1677 a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	919 target["PatientMainDicomTags"]["PatientID"] = GetPatientIdOfStudy(db_, resourceId);
1676 f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	920 }
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	921 else
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	922 {
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	923 target["MainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	924 FromDcmtkBridge::ToJson(target["MainDicomTags"], tags, true);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	925 }
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	926 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	927
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	928 bool ServerIndex::LookupResource(Json::Value& result,
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	929 const std::string& publicId,
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	930 ResourceType expectedType)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	931 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	932 result = Json::objectValue;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	933
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	934 boost::mutex::scoped_lock lock(mutex_);
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	935
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	936 // Lookup for the requested resource
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	937 int64_t id;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	938 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	939 if (!db_.LookupResource(id, type, publicId) \|\|
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	940 type != expectedType)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	941 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	942 return false;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	943 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	944
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	945 // Find the parent resource (if it exists)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	946 if (type != ResourceType_Patient)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	947 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	948 int64_t parentId;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	949 if (!db_.LookupParent(parentId, id))
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	950 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	951 throw OrthancException(ErrorCode_InternalError);
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	952 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	953
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	954 std::string parent = db_.GetPublicId(parentId);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	955
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	956 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	957 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	958 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	959 result["ParentPatient"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	960 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	961
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	962 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	963 result["ParentStudy"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	964 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	965
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	966 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	967 result["ParentSeries"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	968 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	969
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	970 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	971 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	972 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	973 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	974
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	975 // List the children resources
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	976 std::list<std::string> children;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	977 db_.GetChildrenPublicId(children, id);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	978
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	979 if (type != ResourceType_Instance)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	980 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	981 Json::Value c = Json::arrayValue;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	982
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	983 for (std::list<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	984 it = children.begin(); it != children.end(); ++it)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	985 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	986 c.append(*it);
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	987 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	988
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	989 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	990 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	991 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	992 result["Studies"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	993 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	994
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	995 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	996 result["Series"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	997 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	998
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	999 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1000 result["Instances"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1001 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1002
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1003 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1004 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1005 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1006 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1007
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1008 // Set the resource type
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1009 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1010 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1011 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1012 result["Type"] = "Patient";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1013 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1014
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1015 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1016 result["Type"] = "Study";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1017 break;
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1018
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1019 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1020 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1021 result["Type"] = "Series";
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	1022 result["Status"] = EnumerationToString(GetSeriesStatus(id));
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1023
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1024 int64_t i;
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1025 if (GetMetadataAsInteger(i, id, MetadataType_Series_ExpectedNumberOfInstances))
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1026 result["ExpectedNumberOfInstances"] = static_cast<int>(i);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1027 else
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1028 result["ExpectedNumberOfInstances"] = Json::nullValue;
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	1029
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1030 break;
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	1031 }
9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	1032
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1033 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1034 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1035 result["Type"] = "Instance";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1036
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1037 FileInfo attachment;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1038 if (!db_.LookupAttachment(attachment, id, FileContentType_Dicom))
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1039 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1040 throw OrthancException(ErrorCode_InternalError);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1041 }
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	1042
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1043 result["FileSize"] = static_cast<unsigned int>(attachment.GetUncompressedSize());
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1044 result["FileUuid"] = attachment.GetUuid();
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	1045
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1046 int64_t i;
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1047 if (GetMetadataAsInteger(i, id, MetadataType_Instance_IndexInSeries))
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1048 result["IndexInSeries"] = static_cast<int>(i);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1049 else
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1050 result["IndexInSeries"] = Json::nullValue;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1051
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1052 break;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1053 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1054
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1055 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1056 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1057 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1058
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1059 // Record the remaining information
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1060 result["ID"] = publicId;
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	1061 MainDicomTagsToJson(result, id, type);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1062
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1063 std::string tmp;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1064
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1065 if (db_.LookupMetadata(tmp, id, MetadataType_AnonymizedFrom))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1066 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1067 result["AnonymizedFrom"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1068 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1069
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1070 if (db_.LookupMetadata(tmp, id, MetadataType_ModifiedFrom))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1071 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1072 result["ModifiedFrom"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1073 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1074
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1075 if (type == ResourceType_Patient \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1076 type == ResourceType_Study \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1077 type == ResourceType_Series)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1078 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1079 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	1080
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1081 if (db_.LookupMetadata(tmp, id, MetadataType_LastUpdate))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1082 {
1148 ac36589f699e LastUpdate metadata is now always returned for patients, studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	1083 result["LastUpdate"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1084 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1085 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1086
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1087 return true;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1088 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1089
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1090
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1091 bool ServerIndex::LookupAttachment(FileInfo& attachment,
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1092 const std::string& instanceUuid,
233 c11273198cef rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 232 diff changeset	1093 FileContentType contentType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: 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_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1096
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1097 int64_t id;
a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1098 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1099 if (!db_.LookupResource(id, type, instanceUuid))
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1100 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1101 throw OrthancException(ErrorCode_UnknownResource);
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1102 }
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1103
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1104 if (db_.LookupAttachment(attachment, id, contentType))
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1105 {
233 c11273198cef rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 232 diff changeset	1106 assert(attachment.GetContentType() == contentType);
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1107 return true;
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1108 }
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1109 else
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1110 {
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1111 return false;
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1112 }
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1113 }
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1114
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1115
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1116
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1352 diff changeset	1117 void ServerIndex::GetAllUuids(std::list<std::string>& target,
190 b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1118 ResourceType resourceType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1119 {
1357 216db29c5aa9 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	1120 boost::mutex::scoped_lock lock(mutex_);
216db29c5aa9 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	1121 db_.GetAllPublicIds(target, resourceType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1122 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1123
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1124
1509 0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1125 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	1126 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	1127 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	1128 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	1129 {
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1130 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	1131 {
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1132 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	1133 return;
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1134 }
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1135
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1136 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	1137 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	1138 }
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1139
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	1140
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1141 template <typename T>
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1142 static void FormatLog(Json::Value& target,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1143 const std::list<T>& log,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1144 const std::string& name,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1145 bool done,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1146 int64_t since)
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1147 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1148 Json::Value items = Json::arrayValue;
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1149 for (typename std::list<T>::const_iterator
1304 7b6925b0890d cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1300 diff changeset	1150 it = log.begin(); it != log.end(); ++it)
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1151 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1152 Json::Value item;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1153 it->Format(item);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1154 items.append(item);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1155 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1156
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1157 target = Json::objectValue;
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1158 target[name] = items;
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1159 target["Done"] = done;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1160
1305 536515f87cb4 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	1161 int64_t last = (log.empty() ? since : log.back().GetSeq());
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1162 target["Last"] = static_cast<int>(last);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1163 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1164
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1165
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1166 void ServerIndex::GetChanges(Json::Value& target,
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	1167 int64_t since,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1168 unsigned int maxResults)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1169 {
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1170 std::list<ServerIndexChange> changes;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1171 bool done;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1172
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1173 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1174 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1175 db_.GetChanges(changes, done, since, maxResults);
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1176 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1177
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1178 FormatLog(target, changes, "Changes", done, since);
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1179 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1180
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1181
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1182 void ServerIndex::GetLastChange(Json::Value& target)
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1183 {
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1184 std::list<ServerIndexChange> changes;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1185
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1186 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1187 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1188 db_.GetLastChange(changes);
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1189 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1190
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1191 FormatLog(target, changes, "Changes", true, 0);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1192 }
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1193
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1194
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1195 void ServerIndex::LogExportedResource(const std::string& publicId,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1196 const std::string& remoteModality)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1197 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1198 boost::mutex::scoped_lock lock(mutex_);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1199 Transaction transaction(*this);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1200
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1201 int64_t id;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1202 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1203 if (!db_.LookupResource(id, type, publicId))
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1204 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1205 throw OrthancException(ErrorCode_InternalError);
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1206 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1207
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1208 std::string patientId;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1209 std::string studyInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1210 std::string seriesInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1211 std::string sopInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1212
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1213 int64_t currentId = id;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1214 ResourceType currentType = type;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1215
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1216 // Iteratively go up inside the patient/study/series/instance hierarchy
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1217 bool done = false;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1218 while (!done)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1219 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1220 DicomMap map;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1221 db_.GetMainDicomTags(map, currentId);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1222
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1223 switch (currentType)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1224 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1225 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1226 patientId = map.GetValue(DICOM_TAG_PATIENT_ID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1227 done = true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1228 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1229
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1230 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1231 studyInstanceUid = map.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1232 currentType = ResourceType_Patient;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1233 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1234
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1235 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1236 seriesInstanceUid = map.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1237 currentType = ResourceType_Study;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1238 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1239
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1240 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1241 sopInstanceUid = map.GetValue(DICOM_TAG_SOP_INSTANCE_UID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1242 currentType = ResourceType_Series;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1243 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1244
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1245 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1246 throw OrthancException(ErrorCode_InternalError);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1247 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1248
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1249 // 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	1250 // the current resource
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1251 if (!done)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1252 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1253 bool ok = db_.LookupParent(currentId, currentId);
375 d1ea72f1c967 major fix of storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1254 assert(ok);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1255 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1256 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1257
1246 54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1258 ExportedResource resource(-1,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1259 type,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1260 publicId,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1261 remoteModality,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1262 Toolbox::GetNowIsoString(),
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1263 patientId,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1264 studyInstanceUid,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1265 seriesInstanceUid,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1266 sopInstanceUid);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1267
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1268 db_.LogExportedResource(resource);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1269 transaction.Commit(0);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1270 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1271
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1272
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1273 void ServerIndex::GetExportedResources(Json::Value& target,
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1274 int64_t since,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1275 unsigned int maxResults)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1276 {
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1277 std::list<ExportedResource> exported;
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1278 bool done;
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1279
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1280 {
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1281 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1282 db_.GetExportedResources(exported, done, since, maxResults);
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1283 }
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1284
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1285 FormatLog(target, exported, "Exports", done, since);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1286 }
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1287
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1288
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1289 void ServerIndex::GetLastExportedResource(Json::Value& target)
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1290 {
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1291 std::list<ExportedResource> exported;
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1292
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1293 {
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1294 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1295 db_.GetLastExportedResource(exported);
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1296 }
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1297
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1298 FormatLog(target, exported, "Exports", true, 0);
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1299 }
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1300
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1301
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1302 bool ServerIndex::IsRecyclingNeeded(uint64_t instanceSize)
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1303 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1304 if (maximumStorageSize_ != 0)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1305 {
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1306 uint64_t currentSize = currentStorageSize_ - listener_->GetSizeOfFilesToRemove();
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1307 assert(db_.GetTotalCompressedSize() == currentSize);
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1308
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1309 if (currentSize + instanceSize > maximumStorageSize_)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1310 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1311 return true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1312 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1313 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1314
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1315 if (maximumPatients_ != 0)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1316 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1317 uint64_t patientCount = db_.GetResourceCount(ResourceType_Patient);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1318 if (patientCount > maximumPatients_)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1319 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1320 return true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1321 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1322 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1323
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1324 return false;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1325 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1326
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1327
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1328 void ServerIndex::Recycle(uint64_t instanceSize,
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1329 const std::string& newPatientId)
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1330 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1331 if (!IsRecyclingNeeded(instanceSize))
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1332 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1333 return;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1334 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1335
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1336 // Check whether other DICOM instances from this patient are
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1337 // already stored
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1338 int64_t patientToAvoid;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1339 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1340 bool hasPatientToAvoid = db_.LookupResource(patientToAvoid, type, newPatientId);
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1341
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1342 if (hasPatientToAvoid && type != ResourceType_Patient)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1343 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1344 throw OrthancException(ErrorCode_InternalError);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1345 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1346
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1347 // Iteratively select patient to remove until there is enough
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1348 // space in the DICOM store
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1349 int64_t patientToRecycle;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1350 while (true)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1351 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1352 // 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	1353 // we must avoid to recycle them
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1354 bool ok = hasPatientToAvoid ?
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1355 db_.SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1356 db_.SelectPatientToRecycle(patientToRecycle);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1357
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1358 if (!ok)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1359 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1360 throw OrthancException(ErrorCode_FullStorage);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1361 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1362
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	1363 VLOG(1) << "Recycling one patient";
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1364 db_.DeleteResource(patientToRecycle);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1365
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1366 if (!IsRecyclingNeeded(instanceSize))
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1367 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1368 // OK, we're done
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1369 break;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1370 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1371 }
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1372 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1373
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1374 void ServerIndex::SetMaximumPatientCount(unsigned int count)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1375 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1376 boost::mutex::scoped_lock lock(mutex_);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1377 maximumPatients_ = count;
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1378
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1379 if (count == 0)
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1380 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1381 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	1382 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1383 else
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1384 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1385 LOG(WARNING) << "At most " << count << " patients will be stored";
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1386 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1387
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1388 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1389 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1390
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1391 void ServerIndex::SetMaximumStorageSize(uint64_t size)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1392 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1393 boost::mutex::scoped_lock lock(mutex_);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1394 maximumStorageSize_ = size;
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1395
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1396 if (size == 0)
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1397 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1398 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	1399 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1400 else
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1401 {
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1402 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	1403 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1404
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1405 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1406 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1407
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1408 void ServerIndex::StandaloneRecycling()
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1409 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1410 // 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	1411 Transaction t(*this);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1412 Recycle(0, "");
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1413 t.Commit(0);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1414 }
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1415
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1416
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1417 bool ServerIndex::IsProtectedPatient(const std::string& publicId)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1418 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1419 boost::mutex::scoped_lock lock(mutex_);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1420
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1421 // Lookup for the requested resource
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1422 int64_t id;
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 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) \|\|
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1425 type != ResourceType_Patient)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1426 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1427 throw OrthancException(ErrorCode_ParameterOutOfRange);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1428 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1429
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1430 return db_.IsProtectedPatient(id);
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1431 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1432
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1433
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1434 void ServerIndex::SetProtectedPatient(const std::string& publicId,
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1435 bool isProtected)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1436 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1437 boost::mutex::scoped_lock lock(mutex_);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1438 Transaction transaction(*this);
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1439
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1440 // Lookup for the requested resource
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1441 int64_t id;
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1442 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1443 if (!db_.LookupResource(id, type, publicId) \|\|
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1444 type != ResourceType_Patient)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1445 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1446 throw OrthancException(ErrorCode_ParameterOutOfRange);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1447 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1448
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1449 db_.SetProtectedPatient(id, isProtected);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1450 transaction.Commit(0);
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1451
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1452 if (isProtected)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1453 LOG(INFO) << "Patient " << publicId << " has been protected";
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1454 else
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1455 LOG(INFO) << "Patient " << publicId << " has been unprotected";
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1456 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1457
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1458
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1459 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	1460 const std::string& publicId)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1461 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1462 result.clear();
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1463
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1464 boost::mutex::scoped_lock lock(mutex_);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1465
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1466 ResourceType type;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1467 int64_t resource;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1468 if (!db_.LookupResource(resource, type, publicId))
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1469 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1470 throw OrthancException(ErrorCode_UnknownResource);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1471 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1472
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1473 if (type == ResourceType_Instance)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1474 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1475 // An instance cannot have a child
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1476 throw OrthancException(ErrorCode_BadParameterType);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1477 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1478
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1479 std::list<int64_t> tmp;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1480 db_.GetChildrenInternalId(tmp, resource);
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1481
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1482 for (std::list<int64_t>::const_iterator
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1483 it = tmp.begin(); it != tmp.end(); ++it)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1484 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1485 result.push_back(db_.GetPublicId(*it));
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1486 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1487 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1488
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1489
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1490 void ServerIndex::GetChildInstances(std::list<std::string>& result,
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1491 const std::string& publicId)
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1492 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1493 result.clear();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1494
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1495 boost::mutex::scoped_lock lock(mutex_);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1496
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1497 ResourceType type;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1498 int64_t top;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1499 if (!db_.LookupResource(top, type, publicId))
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1500 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1501 throw OrthancException(ErrorCode_UnknownResource);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1502 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1503
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1504 if (type == ResourceType_Instance)
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1505 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1506 // The resource is already an instance: Do not go down the hierarchy
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1507 result.push_back(publicId);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1508 return;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1509 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1510
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1511 std::stack<int64_t> toExplore;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1512 toExplore.push(top);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1513
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1514 std::list<int64_t> tmp;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1515
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1516 while (!toExplore.empty())
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1517 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1518 // Get the internal ID of the current resource
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1519 int64_t resource = toExplore.top();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1520 toExplore.pop();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1521
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1522 if (db_.GetResourceType(resource) == ResourceType_Instance)
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1523 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1524 result.push_back(db_.GetPublicId(resource));
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1525 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1526 else
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1527 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1528 // Tag all the children of this resource as to be explored
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1529 db_.GetChildrenInternalId(tmp, resource);
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1530 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1531 it = tmp.begin(); it != tmp.end(); ++it)
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1532 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1533 toExplore.push(*it);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1534 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1535 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1536 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1537 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1538
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1539
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1540 void ServerIndex::SetMetadata(const std::string& publicId,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1541 MetadataType type,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1542 const std::string& value)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1543 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1544 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1545
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1546 ResourceType rtype;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1547 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1548 if (!db_.LookupResource(id, rtype, publicId))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1549 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1550 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1551 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1552
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1553 db_.SetMetadata(id, type, value);
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1554 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1555
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1556
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1557 void ServerIndex::DeleteMetadata(const std::string& publicId,
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1558 MetadataType type)
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1559 {
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1560 boost::mutex::scoped_lock lock(mutex_);
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1561
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1562 ResourceType rtype;
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1563 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1564 if (!db_.LookupResource(id, rtype, publicId))
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1565 {
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1566 throw OrthancException(ErrorCode_UnknownResource);
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1567 }
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1568
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1569 db_.DeleteMetadata(id, type);
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1570 }
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1571
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1572
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1573 bool ServerIndex::LookupMetadata(std::string& target,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1574 const std::string& publicId,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1575 MetadataType type)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1576 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1577 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1578
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1579 ResourceType rtype;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1580 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1581 if (!db_.LookupResource(id, rtype, publicId))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1582 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1583 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1584 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1585
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1586 return db_.LookupMetadata(target, id, type);
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1587 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1588
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1589
739 696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 714 diff changeset	1590 void ServerIndex::ListAvailableMetadata(std::list<MetadataType>& target,
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1591 const std::string& publicId)
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1592 {
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1593 boost::mutex::scoped_lock lock(mutex_);
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1594
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1595 ResourceType rtype;
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1596 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1597 if (!db_.LookupResource(id, rtype, publicId))
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1598 {
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1599 throw OrthancException(ErrorCode_UnknownResource);
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1600 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1601
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1602 db_.ListAvailableMetadata(target, id);
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1603 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1604
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1605
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1606 void ServerIndex::ListAvailableAttachments(std::list<FileContentType>& target,
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1607 const std::string& publicId,
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1608 ResourceType expectedType)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1609 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1610 boost::mutex::scoped_lock lock(mutex_);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1611
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1612 ResourceType type;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1613 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1614 if (!db_.LookupResource(id, type, publicId) \|\|
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1615 expectedType != type)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1616 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1617 throw OrthancException(ErrorCode_UnknownResource);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1618 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1619
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1620 db_.ListAvailableAttachments(target, id);
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1621 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1622
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1623
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1624 bool ServerIndex::LookupParent(std::string& target,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1625 const std::string& publicId)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1626 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1627 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1628
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1629 ResourceType type;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1630 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1631 if (!db_.LookupResource(id, type, publicId))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1632 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1633 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1634 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1635
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1636 int64_t parentId;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1637 if (db_.LookupParent(parentId, id))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1638 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1639 target = db_.GetPublicId(parentId);
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1640 return true;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1641 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1642 else
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1643 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1644 return false;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1645 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1646 }
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1647
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1648
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1649 uint64_t ServerIndex::IncrementGlobalSequence(GlobalProperty sequence)
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1650 {
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1651 boost::mutex::scoped_lock lock(mutex_);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1652 Transaction transaction(*this);
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1653
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1654 uint64_t seq = IncrementGlobalSequenceInternal(sequence);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1655 transaction.Commit(0);
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1656
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1657 return seq;
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1658 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1659
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1660
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1661
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1662 void ServerIndex::LogChange(ChangeType changeType,
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1663 const std::string& publicId)
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1664 {
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1665 boost::mutex::scoped_lock lock(mutex_);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1666 Transaction transaction(*this);
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1667
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1668 int64_t id;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1669 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1670 if (!db_.LookupResource(id, type, publicId))
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1671 {
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1672 throw OrthancException(ErrorCode_UnknownResource);
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1673 }
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1674
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1675 LogChange(id, changeType, type, publicId);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1676 transaction.Commit(0);
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1677 }
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1678
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1679
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1680 void ServerIndex::DeleteChanges()
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1681 {
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1682 boost::mutex::scoped_lock lock(mutex_);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	1683 db_.ClearChanges();
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1684 }
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1685
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1686 void ServerIndex::DeleteExportedResources()
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1687 {
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1688 boost::mutex::scoped_lock lock(mutex_);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	1689 db_.ClearExportedResources();
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1690 }
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1691
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1692
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1693 void ServerIndex::GetStatisticsInternal(/* out */ uint64_t& compressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1694 /* out */ uint64_t& uncompressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1695 /* out */ unsigned int& countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1696 /* out */ unsigned int& countSeries,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1697 /* out */ unsigned int& countInstances,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1698 /* in */ int64_t id,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1699 /* in */ ResourceType type)
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1700 {
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1701 std::stack<int64_t> toExplore;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1702 toExplore.push(id);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1703
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1704 countInstances = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1705 countSeries = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1706 countStudies = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1707 compressedSize = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1708 uncompressedSize = 0;
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1709
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1710 while (!toExplore.empty())
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1711 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1712 // 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	1713 int64_t resource = toExplore.top();
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1714 toExplore.pop();
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1715
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1716 ResourceType thisType = db_.GetResourceType(resource);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1717
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1718 std::list<FileContentType> f;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1719 db_.ListAvailableAttachments(f, resource);
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1720
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1721 for (std::list<FileContentType>::const_iterator
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1722 it = f.begin(); it != f.end(); ++it)
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1723 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1724 FileInfo attachment;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1725 if (db_.LookupAttachment(attachment, resource, *it))
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1726 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1727 compressedSize += attachment.GetCompressedSize();
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1728 uncompressedSize += attachment.GetUncompressedSize();
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1729 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1730 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1731
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1732 if (thisType == ResourceType_Instance)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1733 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1734 countInstances++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1735 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1736 else
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1737 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1738 switch (thisType)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1739 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1740 case ResourceType_Study:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1741 countStudies++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1742 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1743
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1744 case ResourceType_Series:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1745 countSeries++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1746 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1747
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1748 default:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1749 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1750 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1751
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1752 // 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	1753 std::list<int64_t> tmp;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1754 db_.GetChildrenInternalId(tmp, resource);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1755 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1756 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	1757 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1758 toExplore.push(*it);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1759 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1760 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1761 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1762
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1763 if (countStudies == 0)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1764 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1765 countStudies = 1;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1766 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1767
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1768 if (countSeries == 0)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1769 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1770 countSeries = 1;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1771 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1772 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1773
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1774
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1775
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1776 void ServerIndex::GetStatistics(Json::Value& target,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1777 const std::string& publicId)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1778 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1779 boost::mutex::scoped_lock lock(mutex_);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1780
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1781 ResourceType type;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1782 int64_t top;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1783 if (!db_.LookupResource(top, type, publicId))
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1784 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1785 throw OrthancException(ErrorCode_UnknownResource);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1786 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1787
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1788 uint64_t uncompressedSize;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1789 uint64_t compressedSize;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1790 unsigned int countStudies;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1791 unsigned int countSeries;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1792 unsigned int countInstances;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1793 GetStatisticsInternal(compressedSize, uncompressedSize, countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1794 countSeries, countInstances, top, type);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1795
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1796 target = Json::objectValue;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1797 target["DiskSize"] = boost::lexical_cast<std::string>(compressedSize);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1798 target["DiskSizeMB"] = static_cast<unsigned int>(compressedSize / MEGA_BYTES);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1799 target["UncompressedSize"] = boost::lexical_cast<std::string>(uncompressedSize);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	1800 target["UncompressedSizeMB"] = static_cast<unsigned int>(uncompressedSize / MEGA_BYTES);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1801
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1802 switch (type)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1803 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1804 // Do NOT add "break" below this point!
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1805 case ResourceType_Patient:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1806 target["CountStudies"] = countStudies;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1807
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1808 case ResourceType_Study:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1809 target["CountSeries"] = countSeries;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1810
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1811 case ResourceType_Series:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1812 target["CountInstances"] = countInstances;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1813
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1814 case ResourceType_Instance:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1815 default:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1816 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1817 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1818 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1819
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1820
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1821 void ServerIndex::GetStatistics(/* out */ uint64_t& compressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1822 /* out */ uint64_t& uncompressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1823 /* out */ unsigned int& countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1824 /* out */ unsigned int& countSeries,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1825 /* out */ unsigned int& countInstances,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1826 const std::string& publicId)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1827 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1828 boost::mutex::scoped_lock lock(mutex_);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1829
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1830 ResourceType type;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1831 int64_t top;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1832 if (!db_.LookupResource(top, type, publicId))
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1833 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1834 throw OrthancException(ErrorCode_UnknownResource);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1835 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1836
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1837 GetStatisticsInternal(compressedSize, uncompressedSize, countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1838 countSeries, countInstances, top, type);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1839 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1840
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1841
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1842 void ServerIndex::UnstableResourcesMonitorThread(ServerIndex* that)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1843 {
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1844 int stableAge = Configuration::GetGlobalIntegerParameter("StableAge", 60);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1845 if (stableAge <= 0)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1846 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1847 stableAge = 60;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1848 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1849
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1850 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	1851
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1852 while (!that->done_)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1853 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1854 // Check for stable resources each second
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1855 boost::this_thread::sleep(boost::posix_time::seconds(1));
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1856
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1857 boost::mutex::scoped_lock lock(that->mutex_);
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1858
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1859 while (!that->unstableResources_.IsEmpty() &&
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1860 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	1861 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1862 // 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	1863 // 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	1864
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1865 UnstableResourcePayload payload;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1866 int64_t id = that->unstableResources_.RemoveOldest(payload);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1867
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1868 // Ensure that the resource is still existing before logging the change
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1869 if (that->db_.IsExistingResource(id))
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1870 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1871 switch (payload.GetResourceType())
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1872 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1873 case ResourceType_Patient:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1874 that->LogChange(id, ChangeType_StablePatient, ResourceType_Patient, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1875 break;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1876
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1877 case ResourceType_Study:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1878 that->LogChange(id, ChangeType_StableStudy, ResourceType_Study, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1879 break;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1880
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1881 case ResourceType_Series:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1882 that->LogChange(id, ChangeType_StableSeries, ResourceType_Series, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1883 break;
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1884
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1885 default:
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1886 throw OrthancException(ErrorCode_InternalError);
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1887 }
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1888
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1889 //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	1890 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1891 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1892 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1893
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1894 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	1895 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1896
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1897
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1898 void ServerIndex::MarkAsUnstable(int64_t id,
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1899 Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1900 const std::string& publicId)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1901 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1902 // 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	1903
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1904 assert(type == Orthanc::ResourceType_Patient \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1905 type == Orthanc::ResourceType_Study \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1906 type == Orthanc::ResourceType_Series);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1907
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1908 UnstableResourcePayload payload(type, publicId);
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1909 unstableResources_.AddOrMakeMostRecent(id, payload);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1910 //LOG(INFO) << "Unstable resource: " << EnumerationToString(type) << " " << id;
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	1911
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1912 LogChange(id, ChangeType_NewChildInstance, type, publicId);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1913 }
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1914
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1915
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1916
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1917 void ServerIndex::LookupIdentifier(std::list<std::string>& result,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1918 const DicomTag& tag,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1919 const std::string& value,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1920 ResourceType type)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1921 {
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1922 result.clear();
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1923
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1924 boost::mutex::scoped_lock lock(mutex_);
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1925
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1926 std::list<int64_t> id;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1927 db_.LookupIdentifier(id, tag, value);
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1928
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1929 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1930 it = id.begin(); it != id.end(); ++it)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1931 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1932 if (db_.GetResourceType(*it) == type)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1933 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1934 result.push_back(db_.GetPublicId(*it));
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1935 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1936 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1937 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1938
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1939
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1940 void ServerIndex::LookupIdentifier(std::list<std::string>& result,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1941 const DicomTag& tag,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1942 const std::string& value)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1943 {
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1944 result.clear();
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1945
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1946 boost::mutex::scoped_lock lock(mutex_);
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1947
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1948 std::list<int64_t> id;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1949 db_.LookupIdentifier(id, tag, value);
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1950
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1951 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1952 it = id.begin(); it != id.end(); ++it)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1953 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1954 result.push_back(db_.GetPublicId(*it));
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1955 }
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1956 }
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1957
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1958
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1959 void ServerIndex::LookupIdentifier(std::list< std::pair<ResourceType, std::string> >& result,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1960 const std::string& value)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1961 {
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1962 result.clear();
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1963
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1964 boost::mutex::scoped_lock lock(mutex_);
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1965
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1966 std::list<int64_t> id;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1967 db_.LookupIdentifier(id, value);
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1968
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1969 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1970 it = id.begin(); it != id.end(); ++it)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1971 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1972 result.push_back(std::make_pair(db_.GetResourceType(*it),
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1973 db_.GetPublicId(*it)));
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1974 }
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1975 }
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1976
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1977
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1978 StoreStatus ServerIndex::AddAttachment(const FileInfo& attachment,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1979 const std::string& publicId)
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1980 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1981 boost::mutex::scoped_lock lock(mutex_);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1982
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1983 Transaction t(*this);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1984
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1985 ResourceType resourceType;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1986 int64_t resourceId;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1987 if (!db_.LookupResource(resourceId, resourceType, publicId))
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1988 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1989 return StoreStatus_Failure; // Inexistent resource
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1990 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1991
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1992 // Remove possible previous attachment
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1993 db_.DeleteAttachment(resourceId, attachment.GetContentType());
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1994
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1995 // Locate the patient of the target resource
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1996 int64_t patientId = resourceId;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1997 for (;;)
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1998 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1999 int64_t parent;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2000 if (db_.LookupParent(parent, patientId))
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2001 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2002 // We have not reached the patient level yet
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2003 patientId = parent;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2004 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2005 else
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2006 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2007 // We have reached the patient level
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2008 break;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2009 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2010 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2011
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2012 // Possibly apply the recycling mechanism while preserving this patient
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2013 assert(db_.GetResourceType(patientId) == ResourceType_Patient);
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2014 Recycle(attachment.GetCompressedSize(), db_.GetPublicId(patientId));
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	2015
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2016 db_.AddAttachment(resourceId, attachment);
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2017
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2018 t.Commit(attachment.GetCompressedSize());
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2019
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2020 return StoreStatus_Success;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2021 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	2022
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2023
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2024 void ServerIndex::DeleteAttachment(const std::string& publicId,
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2025 FileContentType type)
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2026 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2027 boost::mutex::scoped_lock lock(mutex_);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2028 Transaction t(*this);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2029
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2030 ResourceType rtype;
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2031 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	2032 if (!db_.LookupResource(id, rtype, publicId))
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2033 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2034 throw OrthancException(ErrorCode_UnknownResource);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2035 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2036
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2037 db_.DeleteAttachment(id, type);
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2038
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2039 t.Commit(0);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2040 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2041
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2042
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2043 bool ServerIndex::GetMetadata(Json::Value& target,
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2044 const std::string& publicId)
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2045 {
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2046 boost::mutex::scoped_lock lock(mutex_);
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2047
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2048 target = Json::objectValue;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2049
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2050 ResourceType type;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2051 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	2052 if (!db_.LookupResource(id, type, publicId))
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2053 {
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2054 return false;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2055 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2056
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2057 std::list<MetadataType> metadata;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2058 db_.ListAvailableMetadata(metadata, id);
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2059
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2060 for (std::list<MetadataType>::const_iterator
1304 7b6925b0890d cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1300 diff changeset	2061 it = metadata.begin(); it != metadata.end(); ++it)
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2062 {
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2063 std::string key = EnumerationToString(*it);
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2064
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2065 std::string value;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2066 if (!db_.LookupMetadata(value, id, *it))
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2067 {
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2068 value.clear();
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2069 }
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2070
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2071 target[key] = value;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2072 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2073
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2074 return true;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2075 }
1218 efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2076
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2077
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2078 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	2079 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	2080 {
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2081 boost::mutex::scoped_lock lock(mutex_);
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2082 db_.SetGlobalProperty(property, value);
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2083 }
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2084
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2085
1218 efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2086 std::string ServerIndex::GetGlobalProperty(GlobalProperty property,
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2087 const std::string& defaultValue)
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2088 {
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2089 boost::mutex::scoped_lock lock(mutex_);
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2090
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2091 std::string value;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2092 if (db_.LookupGlobalProperty(value, property))
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2093 {
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2094 return value;
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2095 }
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2096 else
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2097 {
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2098 return defaultValue;
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2099 }
1218 efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2100 }
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2101
1352 382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2102
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2103 bool ServerIndex::GetMainDicomTags(DicomMap& result,
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2104 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	2105 ResourceType expectedType,
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2106 ResourceType levelOfInterest)
1352 382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2107 {
1677 a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2108 // 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	2109 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	2110 !(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	2111 !(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	2112 !(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	2113 !(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	2114 {
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2115 throw OrthancException(ErrorCode_ParameterOutOfRange);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2116 }
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2117
1352 382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2118 result.Clear();
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2119
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2120 boost::mutex::scoped_lock lock(mutex_);
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2121
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2122 // Lookup for the requested resource
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2123 int64_t id;
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2124 ResourceType type;
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2125 if (!db_.LookupResource(id, type, publicId) \|\|
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2126 type != expectedType)
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2127 {
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2128 return false;
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2129 }
1677 a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2130
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2131 if (type == ResourceType_Study)
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2132 {
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2133 DicomMap tmp;
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2134 db_.GetMainDicomTags(tmp, id);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2135
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2136 switch (levelOfInterest)
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2137 {
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2138 case ResourceType_Patient:
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2139 tmp.ExtractPatientInformation(result);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2140 result.SetValue(DICOM_TAG_PATIENT_ID, GetPatientIdOfStudy(db_, id));
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2141 return true;
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2142
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2143 case ResourceType_Study:
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2144 tmp.ExtractStudyInformation(result);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2145 return true;
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2146
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2147 default:
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2148 throw OrthancException(ErrorCode_InternalError);
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2149 }
a903d57d9f0c adaptation of search with patient tags at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1676 diff changeset	2150 }
1352 382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2151 else
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2152 {
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2153 db_.GetMainDicomTags(result, id);
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2154 return true;
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2155 }
382439943749 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1331 diff changeset	2156 }
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2157
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2158
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2159 bool ServerIndex::LookupResourceType(ResourceType& type,
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2160 const std::string& publicId)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2161 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2162 boost::mutex::scoped_lock lock(mutex_);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2163
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2164 int64_t id;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2165 return db_.LookupResource(id, type, publicId);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2166 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2167
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2168
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2169 unsigned int ServerIndex::GetDatabaseVersion()
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2170 {
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2171 boost::mutex::scoped_lock lock(mutex_);
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2172 return db_.GetDatabaseVersion();
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	2173 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2174 }

Mercurial > hg > orthanc

annotate OrthancServer/ServerIndex.cpp @ 1715:c3baf74e443f db-changes