orthanc: OrthancServer/ServerIndex.cpp comparison

comparison OrthancServer/ServerIndex.cpp @ 432:2b09d4ee86c6

refactoring

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 15 May 2013 13:36:08 +0200
parents	16b52fb8d034
children	aa50783f9550

comparison

equal deleted inserted replaced

-:16b52fb8d034
+:2b09d4ee86c6
 try
 {
 Transaction t(*this);
-int64_t patient, study, series, instance;
-ResourceType type;
-bool isNewSeries = false;
 // Do nothing if the instance already exists
-if (db_->LookupResource(hasher.HashInstance(), patient, type))
+{
-{
+ResourceType type;
-assert(type == ResourceType_Instance);
+int64_t tmp;
-return StoreStatus_AlreadyStored;
+if (db_->LookupResource(hasher.HashInstance(), tmp, type))
+{
+assert(type == ResourceType_Instance);
+return StoreStatus_AlreadyStored;
+}
 }
 // Ensure there is enough room in the storage for the new instance
 uint64_t instanceSize = 0;
 for (Attachments::const_iterator it = attachments.begin();
 }
 Recycle(instanceSize, hasher.HashPatient());
 // Create the instance
-instance = db_->CreateResource(hasher.HashInstance(), ResourceType_Instance);
+int64_t instance = db_->CreateResource(hasher.HashInstance(), ResourceType_Instance);
 DicomMap dicom;
 dicomSummary.ExtractInstanceInformation(dicom);
 db_->SetMainDicomTags(instance, dicom);
-// Create the patient/study/series/instance hierarchy
+// Detect up to which level the patient/study/series/instance
-if (!db_->LookupResource(hasher.HashSeries(), series, type))
+// hierarchy must be created
-{
+int64_t patient = -1, study = -1, series = -1;
-// This is a new series
+bool isNewPatient = false;
-isNewSeries = true;
+bool isNewStudy = false;
+bool isNewSeries = false;
+{
+ResourceType dummy;
+if (db_->LookupResource(hasher.HashSeries(), series, dummy))
+{
+assert(dummy == ResourceType_Series);
+// The patient, the study and the series already exist
+bool ok = (db_->LookupResource(hasher.HashPatient(), patient, dummy) &&
+db_->LookupResource(hasher.HashStudy(), study, dummy));
+assert(ok);
+}
+else if (db_->LookupResource(hasher.HashStudy(), study, dummy))
+{
+assert(dummy == ResourceType_Study);
+// New series: The patient and the study already exist
+isNewSeries = true;
+bool ok = db_->LookupResource(hasher.HashPatient(), patient, dummy);
+assert(ok);
+}
+else if (db_->LookupResource(hasher.HashPatient(), patient, dummy))
+{
+assert(dummy == ResourceType_Patient);
+// New study and series: The patient already exist
+isNewStudy = true;
+isNewSeries = true;
+}
+else
+{
+// New patient, study and series: Nothing exists
+isNewPatient = true;
+isNewStudy = true;
+isNewSeries = true;
+}
+}
+// Create the series if needed
+if (isNewSeries)
+{
 series = db_->CreateResource(hasher.HashSeries(), ResourceType_Series);
 dicomSummary.ExtractSeriesInformation(dicom);
 db_->SetMainDicomTags(series, dicom);
-db_->AttachChild(series, instance);
+}
-if (!db_->LookupResource(hasher.HashStudy(), study, type))
+// Create the study if needed
-{
+if (isNewStudy)
-// This is a new study
+{
 study = db_->CreateResource(hasher.HashStudy(), ResourceType_Study);
 dicomSummary.ExtractStudyInformation(dicom);
 db_->SetMainDicomTags(study, dicom);
-db_->AttachChild(study, series);
+}
-if (!db_->LookupResource(hasher.HashPatient(), patient, type))
+// Create the patient if needed
-{
+if (isNewPatient)
-// This is a new patient
+{
 patient = db_->CreateResource(hasher.HashPatient(), ResourceType_Patient);
 dicomSummary.ExtractPatientInformation(dicom);
 db_->SetMainDicomTags(patient, dicom);
-db_->AttachChild(patient, study);
+}
-}
-else
+// Create the parent-to-child links
-{
+db_->AttachChild(series, instance);
-assert(type == ResourceType_Patient);
-db_->AttachChild(patient, study);
+if (isNewSeries)
-}
+{
-}
+db_->AttachChild(study, series);
-else
+}
-{
-assert(type == ResourceType_Study);
+if (isNewStudy)
-db_->AttachChild(study, series);
+{
-}
+db_->AttachChild(patient, study);
 }
-else
-{
+// Sanity checks
-assert(type == ResourceType_Series);
+assert(patient != -1);
-db_->AttachChild(series, instance);
+assert(study != -1);
-}
+assert(series != -1);
+assert(instance != -1);
 // Attach the files to the newly created instance
 for (Attachments::const_iterator it = attachments.begin();
 it != attachments.end(); it++)
 {
 db_->AddAttachment(instance, *it);
 }
 // Attach the metadata
-db_->SetMetadata(instance, MetadataType_Instance_ReceptionDate, Toolbox::GetNowIsoString());
+std::string now = Toolbox::GetNowIsoString();
+db_->SetMetadata(instance, MetadataType_Instance_ReceptionDate, now);
+db_->SetMetadata(series, MetadataType_LastUpdate, now);
+db_->SetMetadata(study, MetadataType_LastUpdate, now);
+db_->SetMetadata(patient, MetadataType_LastUpdate, now);
 db_->SetMetadata(instance, MetadataType_Instance_RemoteAet, remoteAet);
 const DicomValue* value;
 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL ||
 (value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)

Mercurial > hg > orthanc

comparison OrthancServer/ServerIndex.cpp @ 432:2b09d4ee86c6