orthanc: OrthancServer/ServerIndex.cpp comparison

comparison OrthancServer/ServerIndex.cpp @ 3090:31244604f617 db-changes

starting optimization of SeriesIndex::GetSeriesStatus()

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sat, 05 Jan 2019 12:17:30 +0100
parents	df1b17be20f6
children	476cba12c2b0

comparison

equal deleted inserted replaced

-:fb8ee0786b1e
+:31244604f617
 LOG(INFO) << "Stopping the database flushing thread";
 }
-static void ComputeExpectedNumberOfInstances(ResourcesContent& target,
+static bool ComputeExpectedNumberOfInstances(int64_t& target,
-int64_t series,
 const DicomMap& dicomSummary)
 {
 try
 {
 const DicomValue* value;
 const DicomValue* value2;
 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL &&
-(value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS)) != NULL)
+!value->IsNull() &&
+!value->IsBinary() &&
+(value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS)) != NULL &&
+!value2->IsNull() &&
+!value2->IsBinary())
 {
 // Patch for series with temporal positions thanks to Will Ryder
 int64_t imagesInAcquisition = boost::lexical_cast<int64_t>(value->GetContent());
 int64_t countTemporalPositions = boost::lexical_cast<int64_t>(value2->GetContent());
-std::string expected = boost::lexical_cast<std::string>(imagesInAcquisition * countTemporalPositions);
+target = imagesInAcquisition * countTemporalPositions;
-target.AddMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, expected);
+return (target > 0);
 }
 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL &&
-(value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TIME_SLICES)) != NULL)
+!value->IsNull() &&
+!value->IsBinary() &&
+(value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TIME_SLICES)) != NULL &&
+!value2->IsBinary() &&
+!value2->IsNull())
 {
 // Support of Cardio-PET images
 int64_t numberOfSlices = boost::lexical_cast<int64_t>(value->GetContent());
 int64_t numberOfTimeSlices = boost::lexical_cast<int64_t>(value2->GetContent());
-std::string expected = boost::lexical_cast<std::string>(numberOfSlices * numberOfTimeSlices);
+target = numberOfSlices * numberOfTimeSlices;
-target.AddMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, expected);
+return (target > 0);
 }
-else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL)
+else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL &&
-{
+!value->IsNull() &&
-target.AddMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, value->GetContent());
+!value->IsBinary())
+{
+target = boost::lexical_cast<int64_t>(value->GetContent());
+return (target > 0);
 }
 }
 catch (OrthancException&)
 {
 }
 catch (boost::bad_lexical_cast&)
 {
 }
+return false;
 }
 boost::mutex::scoped_lock lock(mutex_);
 const DicomMap& dicomSummary = instanceToStore.GetSummary();
 const ServerIndex::MetadataMap& metadata = instanceToStore.GetMetadata();
+int64_t expectedInstances;
+const bool hasExpectedInstances =
+ComputeExpectedNumberOfInstances(expectedInstances, dicomSummary);
 instanceMetadata.clear();
 const std::string hashPatient = instanceToStore.GetHasher().HashPatient();
 const std::string hashStudy = instanceToStore.GetHasher().HashStudy();
 const std::string hashSeries = instanceToStore.GetHasher().HashSeries();
 return StoreStatus_AlreadyStored;
 }
 }
-// Warn about the creation of new resources. The order must be from instance to patient.
+// Warn about the creation of new resources. The order must be
+// from instance to patient.
+// NB: In theory, could be sped up by grouping the underlying
+// calls to "db_.LogChange()". However, this would only have an
+// impact when new patient/study/series get created, which
+// occurs far less often that creating new instances. The
+// positive impact looks marginal in practice.
 SignalNewResource(ChangeType_NewInstance, ResourceType_Instance, hashInstance, instanceId);
 if (status.isNewSeries_)
 {
 SignalNewResource(ChangeType_NewSeries, ResourceType_Series, hashSeries, status.seriesId_);
 std::string now = SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */);
 content.AddMetadata(status.seriesId_, MetadataType_LastUpdate, now);
 content.AddMetadata(status.studyId_, MetadataType_LastUpdate, now);
 content.AddMetadata(status.patientId_, MetadataType_LastUpdate, now);
+if (status.isNewSeries_ &&
+hasExpectedInstances)
+{
+content.AddMetadata(status.seriesId_, MetadataType_Series_ExpectedNumberOfInstances,
+boost::lexical_cast<std::string>(expectedInstances));
+}
 // Attach the auto-computed metadata for the instance level,
 // reflecting these additions into the input metadata map
 SetInstanceMetadata(content, instanceMetadata, instanceId,
 MetadataType_Instance_ReceptionDate, now);
 SetInstanceMetadata(content, instanceMetadata, instanceId, MetadataType_Instance_RemoteAet,
 MetadataType_Instance_IndexInSeries, value->GetContent());
 }
 }
-// Check whether the series of this new instance is now completed
-if (status.isNewSeries_)
-{
-ComputeExpectedNumberOfInstances(content, status.seriesId_, dicomSummary);
-}
 db_.SetResourcesContent(content);
 }
+// Check whether the series of this new instance is now completed
 // TODO - SPEED THIS UP
 SeriesStatus seriesStatus = GetSeriesStatus(status.seriesId_);
 if (seriesStatus == SeriesStatus_Complete)
 {
 LogChange(status.seriesId_, ChangeType_CompletedSeries, ResourceType_Series, hashSeries);
 target["CountSeries"] = static_cast<unsigned int>(db_.GetResourceCount(ResourceType_Series));
 target["CountInstances"] = static_cast<unsigned int>(db_.GetResourceCount(ResourceType_Instance));
 }
+SeriesStatus ServerIndex::GetSeriesStatus(int64_t id,
+int64_t expectedNumberOfInstances)
+{
+// Loop over the instances of this series
+std::list<int64_t> children;
+db_.GetChildrenInternalId(children, id);
+std::set<int64_t> instances;
+for (std::list<int64_t>::const_iterator
+it = children.begin(); it != children.end(); ++it)
+{
+// Get the index of this instance in the series
+int64_t index;
+if (!GetMetadataAsInteger(index, *it, MetadataType_Instance_IndexInSeries))
+{
+return SeriesStatus_Unknown;
+}
+if (!(index > 0 && index <= expectedNumberOfInstances))
+{
+// Out-of-range instance index
+return SeriesStatus_Inconsistent;
+}
+if (instances.find(index) != instances.end())
+{
+// Twice the same instance index
+return SeriesStatus_Inconsistent;
+}
+instances.insert(index);
+}
+if (static_cast<int64_t>(instances.size()) == expectedNumberOfInstances)
+{
+return SeriesStatus_Complete;
+}
+else
+{
+return SeriesStatus_Missing;
+}
+}
 SeriesStatus ServerIndex::GetSeriesStatus(int64_t id)
 {
 // Get the expected number of instances in this series (from the metadata)
 int64_t expected;
 if (!GetMetadataAsInteger(expected, id, MetadataType_Series_ExpectedNumberOfInstances))
 {
 return SeriesStatus_Unknown;
 }
-// Loop over the instances of this series
-std::list<int64_t> children;
-db_.GetChildrenInternalId(children, id);
-std::set<int64_t> instances;
-for (std::list<int64_t>::const_iterator
-it = children.begin(); it != children.end(); ++it)
-{
-// Get the index of this instance in the series
-int64_t index;
-if (!GetMetadataAsInteger(index, *it, MetadataType_Instance_IndexInSeries))
-{
-return SeriesStatus_Unknown;
-}
-if (!(index > 0 && index <= expected))
-{
-// Out-of-range instance index
-return SeriesStatus_Inconsistent;
-}
-if (instances.find(index) != instances.end())
-{
-// Twice the same instance index
-return SeriesStatus_Inconsistent;
-}
-instances.insert(index);
-}
-if (static_cast<int64_t>(instances.size()) == expected)
-{
-return SeriesStatus_Complete;
-}
 else
 {
-return SeriesStatus_Missing;
+return GetSeriesStatus(id, expected);
 }
 }
 void ServerIndex::MainDicomTagsToJson(Json::Value& target,
 target["MainDicomTags"] = Json::objectValue;
 FromDcmtkBridge::ToJson(target["MainDicomTags"], tags, true);
 }
 }
 bool ServerIndex::LookupResource(Json::Value& result,
 const std::string& publicId,
 ResourceType expectedType)
 {
 result = Json::objectValue;
 result["Type"] = "Series";
 result["Status"] = EnumerationToString(GetSeriesStatus(id));
 int64_t i;
 if (GetMetadataAsInteger(i, id, MetadataType_Series_ExpectedNumberOfInstances))
+{
 result["ExpectedNumberOfInstances"] = static_cast<int>(i);
+}
 else
+{
 result["ExpectedNumberOfInstances"] = Json::nullValue;
+}
 break;
 }
 case ResourceType_Instance:

Mercurial > hg > orthanc

comparison OrthancServer/ServerIndex.cpp @ 3090:31244604f617 db-changes