orthanc: OrthancServer/ServerIndex.cpp comparison

comparison OrthancServer/ServerIndex.cpp @ 758:67e6400fca03 query-retrieve

integration mainline -> query-retrieve

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 16 Apr 2014 16:34:09 +0200
parents	3bdb5db8e839 ec69658b031b
children	c2c28dd17e87

comparison

equal deleted inserted replaced

-:3bdb5db8e839
+:67e6400fca03
 /**
 * Orthanc - A Lightweight, RESTful DICOM Store
-* Copyright (C) 2012-2013 Medical Physics Department, CHU of Liege,
+* Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege,
 * Belgium
 *
 * This program is free software: you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation, either version 3 of the
 {
 unsigned int sleep;
 try
 {
+boost::mutex::scoped_lock lock(that->mutex_);
 std::string sleepString = that->db_->GetGlobalProperty(GlobalProperty_FlushSleep);
 sleep = boost::lexical_cast<unsigned int>(sleepString);
 }
 catch (boost::bad_lexical_cast&)
 {
 {
 boost::mutex::scoped_lock lock(mutex_);
 int64_t id;
 ResourceType type;
-if (!db_->LookupResource(instanceUuid, id, type) ||
+if (!db_->LookupResource(instanceUuid, id, type))
-type != ResourceType_Instance)
 {
 throw OrthancException(ErrorCode_InternalError);
 }
 if (db_->LookupAttachment(attachment, id, contentType))
 else
 LOG(INFO) << "Patient " << publicId << " has been unprotected";
 }
+void ServerIndex::GetChildren(std::list<std::string>& result,
+const std::string& publicId)
+{
+result.clear();
+boost::mutex::scoped_lock lock(mutex_);
+ResourceType type;
+int64_t resource;
+if (!db_->LookupResource(publicId, resource, type))
+{
+throw OrthancException(ErrorCode_UnknownResource);
+}
+if (type == ResourceType_Instance)
+{
+// An instance cannot have a child
+throw OrthancException(ErrorCode_BadParameterType);
+}
+std::list<int64_t> tmp;
+db_->GetChildrenInternalId(tmp, resource);
+for (std::list<int64_t>::const_iterator
+it = tmp.begin(); it != tmp.end(); ++it)
+{
+result.push_back(db_->GetPublicId(*it));
+}
+}
 void ServerIndex::GetChildInstances(std::list<std::string>& result,
 const std::string& publicId)
 {
 result.clear();
 return db_->LookupMetadata(target, id, type);
 }
-bool ServerIndex::ListAvailableMetadata(std::list<MetadataType>& target,
+void ServerIndex::ListAvailableMetadata(std::list<MetadataType>& target,
 const std::string& publicId)
 {
 boost::mutex::scoped_lock lock(mutex_);
 ResourceType rtype;
 if (!db_->LookupResource(publicId, id, rtype))
 {
 throw OrthancException(ErrorCode_UnknownResource);
 }
-return db_->ListAvailableMetadata(target, id);
+db_->ListAvailableMetadata(target, id);
+}
+void ServerIndex::ListAvailableAttachments(std::list<FileContentType>& target,
+const std::string& publicId,
+ResourceType expectedType)
+{
+boost::mutex::scoped_lock lock(mutex_);
+ResourceType type;
+int64_t id;
+if (!db_->LookupResource(publicId, id, type) ||
+expectedType != type)
+{
+throw OrthancException(ErrorCode_UnknownResource);
+}
+db_->ListAvailableAttachments(target, id);
 }
 bool ServerIndex::LookupParent(std::string& target,
 const std::string& publicId)
 int64_t resource = toExplore.top();
 toExplore.pop();
 ResourceType thisType = db_->GetResourceType(resource);
+std::list<FileContentType> f;
+db_->ListAvailableAttachments(f, resource);
+for (std::list<FileContentType>::const_iterator
+it = f.begin(); it != f.end(); ++it)
+{
+FileInfo attachment;
+if (db_->LookupAttachment(attachment, resource, *it))
+{
+compressedSize += attachment.GetCompressedSize();
+uncompressedSize += attachment.GetUncompressedSize();
+}
+}
 if (thisType == ResourceType_Instance)
 {
-std::list<FileContentType> f;
-db_->ListAvailableAttachments(f, resource);
-for (std::list<FileContentType>::const_iterator
-it = f.begin(); it != f.end(); ++it)
-{
-FileInfo attachment;
-if (db_->LookupAttachment(attachment, resource, *it))
-{
-compressedSize += attachment.GetCompressedSize();
-uncompressedSize += attachment.GetUncompressedSize();
-}
-}
 countInstances++;
 }
 else
 {
 switch (thisType)
 result.push_back(db_->GetPublicId(*it));
 }
 }
-// TODO IS IT USEFUL???
+StoreStatus ServerIndex::AddAttachment(const FileInfo& attachment,
-void ServerIndex::LookupTagValue(std::set<std::string>& result,
+const std::string& publicId)
-DicomTag tag,
+{
-const std::string& value,
+boost::mutex::scoped_lock lock(mutex_);
-ResourceType type)
-{
+Transaction t(*this);
-std::list<std::string> lst;
-LookupTagValue(lst, tag, value, type);
+ResourceType resourceType;
+int64_t resourceId;
-result.clear();
+if (!db_->LookupResource(publicId, resourceId, resourceType))
-for (std::list<std::string>::const_iterator
+{
-it = lst.begin(); it != lst.end(); it++)
+return StoreStatus_Failure;  // Inexistent resource
-{
+}
-result.insert(*it);
-}
+// Remove possible previous attachment
-}
+db_->DeleteAttachment(resourceId, attachment.GetContentType());
+// Locate the patient of the target resource
-// TODO IS IT USEFUL???
+int64_t patientId = resourceId;
-void ServerIndex::LookupTagValue(std::set<std::string>& result,
+for (;;)
-DicomTag tag,
+{
-const std::string& value)
+int64_t parent;
-{
+if (db_->LookupParent(parent, patientId))
-std::list<std::string> lst;
+{
-LookupTagValue(lst, tag, value);
+// We have not reached the patient level yet
+patientId = parent;
-result.clear();
+}
-for (std::list<std::string>::const_iterator
+else
-it = lst.begin(); it != lst.end(); it++)
+{
-{
+// We have reached the patient level
-result.insert(*it);
+break;
 }
 }
+// Possibly apply the recycling mechanism while preserving this patient
-// TODO IS IT USEFUL???
+assert(db_->GetResourceType(patientId) == ResourceType_Patient);
-void ServerIndex::LookupTagValue(std::set<std::string>& result,
+Recycle(attachment.GetCompressedSize(), db_->GetPublicId(patientId));
-const std::string& value)
-{
+db_->AddAttachment(resourceId, attachment);
-std::list<std::string> lst;
-LookupTagValue(lst, value);
+t.Commit(attachment.GetCompressedSize());
-result.clear();
+return StoreStatus_Success;
-for (std::list<std::string>::const_iterator
+}
-it = lst.begin(); it != lst.end(); it++)
-{
-result.insert(*it);
+void ServerIndex::DeleteAttachment(const std::string& publicId,
-}
+FileContentType type)
-}
+{
+boost::mutex::scoped_lock lock(mutex_);
+listener_->Reset();
+Transaction t(*this);
+ResourceType rtype;
+int64_t id;
+if (!db_->LookupResource(publicId, id, rtype))
+{
+throw OrthancException(ErrorCode_UnknownResource);
+}
+db_->DeleteAttachment(id, type);
+t.Commit(0);
+}
 }

Mercurial > hg > orthanc

comparison OrthancServer/ServerIndex.cpp @ 758:67e6400fca03 query-retrieve