orthanc: OrthancServer/OrthancRestApi/OrthancRestArchive.cpp comparison

comparison OrthancServer/OrthancRestApi/OrthancRestArchive.cpp @ 1777:0f5c416969dc

more memory-efficient ArchiveIndex

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 13 Nov 2015 11:51:19 +0100
parents	3c28f5f6c9b7
children	776573e592da

comparison

equal deleted inserted replaced

-:3c28f5f6c9b7
+:0f5c416969dc
 id_(id), dicom_(dicom)
 {
 }
 };
+// A "NULL" value for ArchiveIndex indicates a non-expanded node
 typedef std::map<std::string, ArchiveIndex*>   Resources;
-ServerIndex&           index_;
+ResourceType         level_;
-ResourceType           level_;
+Resources            resources_;   // Only at patient/study/series level
-Resources              resources_;
+std::list<Instance>  instances_;   // Only at instance level
-std::vector<Instance>  instances_;
-void AddResourceToExpand(const std::string& id)
+void AddResourceToExpand(ServerIndex& index,
-{
+const std::string& id)
-resources_[id] = NULL;
+{
-}
+if (level_ == ResourceType_Instance)
+{
+FileInfo tmp;
+if (index.LookupAttachment(tmp, id, FileContentType_Dicom))
+{
+instances_.push_back(Instance(id, tmp));
+}
+}
+else
+{
+resources_[id] = NULL;
+}
+}
 public:
-ArchiveIndex(ServerIndex& index,
+ArchiveIndex(ResourceType level) :
-ResourceType level) :
-index_(index),
 level_(level)
 {
 }
 ~ArchiveIndex()
 {
 delete it->second;
 }
 }
-void Add(const ResourceIdentifiers& resource)
+void Add(ServerIndex& index,
+const ResourceIdentifiers& resource)
 {
 const std::string& id = resource.GetIdentifier(level_);
 Resources::iterator previous = resources_.find(id);
-if (resource.GetLevel() == level_)
+if (level_ == ResourceType_Instance)
+{
+AddResourceToExpand(index, id);
+}
+else if (resource.GetLevel() == level_)
 {
 // Mark this resource for further expansion
 if (previous != resources_.end())
 {
 delete previous->second;
 resources_[id] = NULL;
 }
 else if (previous == resources_.end())
 {
 // This is the first time we meet this resource
-std::auto_ptr<ArchiveIndex> child(new ArchiveIndex(index_, GetChildResourceType(level_)));
+std::auto_ptr<ArchiveIndex> child(new ArchiveIndex(GetChildResourceType(level_)));
-child->Add(resource);
+child->Add(index, resource);
 resources_[id] = child.release();
 }
 else if (previous->second != NULL)
 {
-previous->second->Add(resource);
+previous->second->Add(index, resource);
 }
 else
 {
 // Nothing to do: This item is marked for further expansion
 }
 }
-void Expand()
+void Expand(ServerIndex& index)
 {
 if (level_ == ResourceType_Instance)
 {
-// At the instance level, locate all the DICOM files
+// Expanding an instance node makes no sense
-// associated with the instances
+return;
-instances_.reserve(resources_.size());
+}
 for (Resources::iterator it = resources_.begin();
 it != resources_.end(); ++it)
 {
-assert(it->second == NULL);
+if (it->second == NULL)
+{
-FileInfo tmp;
+// This is resource is marked for expansion
-if (index_.LookupAttachment(tmp, it->first, FileContentType_Dicom))
+std::list<std::string> children;
+index.GetChildren(children, it->first);
+std::auto_ptr<ArchiveIndex> child(new ArchiveIndex(GetChildResourceType(level_)));
+for (std::list<std::string>::const_iterator
+it2 = children.begin(); it2 != children.end(); ++it2)
 {
-instances_.push_back(Instance(it->first, tmp));
+child->AddResourceToExpand(index, *it2);
 }
-}
-}
+it->second = child.release();
-else
+}
-{
-// At the patient, study or series level
+assert(it->second != NULL);
-for (Resources::iterator it = resources_.begin();
+it->second->Expand(index);
-it != resources_.end(); ++it)
+}
-{
-if (it->second == NULL)
-{
-// This is resource is marked for expansion
-std::list<std::string> children;
-index_.GetChildren(children, it->first);
-std::auto_ptr<ArchiveIndex> child(new ArchiveIndex(index_, GetChildResourceType(level_)));
-for (std::list<std::string>::const_iterator
-it2 = children.begin(); it2 != children.end(); ++it2)
-{
-child->AddResourceToExpand(*it2);
-}
-it->second = child.release();
-}
-assert(it->second != NULL);
-it->second->Expand();
-}
-}
 }
 void Apply(IArchiveVisitor& visitor) const
 {
 if (level_ == ResourceType_Instance)
 {
-for (size_t i = 0; i < instances_.size(); i++)
+for (std::list<Instance>::const_iterator
-{
+it = instances_.begin(); it != instances_.end(); ++it)
-visitor.AddInstance(instances_[i].id_, instances_[i].dicom_);
+{
+visitor.AddInstance(it->id_, it->dicom_);
 }
 }
 else
 {
 for (Resources::const_iterator it = resources_.begin();
 Json::Value resources;
 if (call.ParseJsonRequest(resources) &&
 resources.type() == Json::arrayValue)
 {
-ArchiveIndex archive(index, ResourceType_Patient);  // root
+ArchiveIndex archive(ResourceType_Patient);  // root
 for (Json::Value::ArrayIndex i = 0; i < resources.size(); i++)
 {
 if (resources[i].type() != Json::stringValue)
 {
 return;   // Bad request
 }
 ResourceIdentifiers resource(index, resources[i].asString());
-archive.Add(resource);
+archive.Add(index, resource);
 }
-archive.Expand();
+archive.Expand(index);
 PrintVisitor v(std::cout);
 archive.Apply(v);
 StatisticsVisitor s;

Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi/OrthancRestArchive.cpp @ 1777:0f5c416969dc