orthanc: OrthancServer/ServerIndex.cpp comparison

comparison OrthancServer/ServerIndex.cpp @ 187:8e673a65564d

refactoring of storing new instances

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 12 Nov 2012 17:29:11 +0100
parents	f68c039b0571
children	090cefdab1d1

comparison

equal deleted inserted replaced

-:f68c039b0571
+:8e673a65564d
 void ServerIndex::CreateInstance(DicomInstanceHasher& hasher,
 const DicomMap& dicomSummary,
 const std::string& fileUuid,
 uint64_t fileSize,
 const std::string& jsonUuid,
-const std::string& distantAet)
+const std::string& remoteAet)
 {
 SQLite::Statement s2(db_, SQLITE_FROM_HERE, "INSERT INTO Resources VALUES(?, ?)");
 s2.BindString(0, hasher.HashInstance());
 s2.BindInt(1, ResourceType_Instance);
 s2.Run();
 s.BindString(1, hasher.HashSeries());
 s.BindString(2, hasher.GetInstanceUid());
 s.BindString(3, fileUuid);
 s.BindInt64(4, fileSize);
 s.BindString(5, jsonUuid);
-s.BindString(6, distantAet);
+s.BindString(6, remoteAet);
 const DicomValue* indexInSeries;
 if ((indexInSeries = dicomSummary.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL ||
 (indexInSeries = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)
 {
 db_.Execute(query);
 }
 }
-StoreStatus ServerIndex::Store(std::string& instanceUuid,
+StoreStatus ServerIndex::Store2(const DicomMap& dicomSummary,
-const DicomMap& dicomSummary,
+const std::string& fileUuid,
+uint64_t uncompressedFileSize,
+const std::string& jsonUuid,
+const std::string& remoteAet)
+{
+boost::mutex::scoped_lock scoped_lock(mutex_);
+DicomInstanceHasher hasher(dicomSummary);
+try
+{
+std::auto_ptr<SQLite::Transaction> t(db2_->StartTransaction());
+t->Begin();
+int64_t patient, study, series, instance;
+ResourceType type;
+bool isNewSeries = false;
+// Do nothing if the instance already exists
+if (db2_->FindResource(hasher.HashInstance(), patient, type))
+{
+assert(type == ResourceType_Patient);
+return StoreStatus_AlreadyStored;
+}
+// Create the patient/study/series/instance hierarchy
+instance = db2_->CreateResource(hasher.HashInstance(), ResourceType_Instance);
+if (!db2_->FindResource(hasher.HashSeries(), series, type))
+{
+// This is a new series
+isNewSeries = true;
+series = db2_->CreateResource(hasher.HashSeries(), ResourceType_Series);
+db2_->AttachChild(series, instance);
+if (!db2_->FindResource(hasher.HashStudy(), study, type))
+{
+// This is a new study
+study = db2_->CreateResource(hasher.HashStudy(), ResourceType_Study);
+db2_->AttachChild(study, series);
+if (!db2_->FindResource(hasher.HashPatient(), patient, type))
+{
+// This is a new patient
+patient = db2_->CreateResource(hasher.HashPatient(), ResourceType_Patient);
+db2_->AttachChild(patient, study);
+}
+else
+{
+assert(type == ResourceType_Patient);
+}
+}
+else
+{
+assert(type == ResourceType_Study);
+}
+}
+else
+{
+assert(type == ResourceType_Series);
+}
+// Attach the files to the newly created instance
+db2_->AttachFile(instance, "_dicom", fileUuid, uncompressedFileSize);
+db2_->AttachFile(instance, "_json", jsonUuid, 0);  // TODO "0"
+// Attach the metadata
+db2_->SetMetadata(instance, MetadataType_Instance_ReceptionDate, Toolbox::GetNowIsoString());
+db2_->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)
+{
+db2_->SetMetadata(instance, MetadataType_Instance_IndexInSeries, value->AsString());
+}
+if (isNewSeries)
+{
+if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL ||
+(value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL)
+{
+db2_->SetMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, value->AsString());
+}
+}
+t->Commit();
+}
+catch (OrthancException& e)
+{
+LOG(ERROR) << "EXCEPTION2 [" << e.What() << "]" << " " << db_.GetErrorMessage();
+}
+return StoreStatus_Failure;
+}
+StoreStatus ServerIndex::Store(const DicomMap& dicomSummary,
 const std::string& fileUuid,
 uint64_t uncompressedFileSize,
 const std::string& jsonUuid,
-const std::string& distantAet)
+const std::string& remoteAet)
 {
+Store2(dicomSummary, fileUuid, uncompressedFileSize, jsonUuid, remoteAet);
 boost::mutex::scoped_lock scoped_lock(mutex_);
 DicomInstanceHasher hasher(dicomSummary);
 try
 {
 CreateSeries(hasher, dicomSummary);
 }
 CreateInstance(hasher, dicomSummary, fileUuid,
-uncompressedFileSize, jsonUuid, distantAet);
+uncompressedFileSize, jsonUuid, remoteAet);
 t.Commit();
 return StoreStatus_Success;
 //t.Rollback();
 }
 return StoreStatus_Failure;
 }
-StoreStatus ServerIndex::Store(std::string& instanceUuid,
+StoreStatus ServerIndex::Store(FileStorage& storage,
-FileStorage& storage,
 const char* dicomFile,
 size_t dicomSize,
 const DicomMap& dicomSummary,
 const Json::Value& dicomJson,
-const std::string& distantAet)
+const std::string& remoteAet)
 {
 std::string fileUuid = storage.Create(dicomFile, dicomSize);
 std::string jsonUuid = storage.Create(dicomJson.toStyledString());
-StoreStatus status = Store(instanceUuid, dicomSummary, fileUuid,
+StoreStatus status = Store(dicomSummary, fileUuid, dicomSize, jsonUuid, remoteAet);
-dicomSize, jsonUuid, distantAet);
 if (status != StoreStatus_Success)
 {
 storage.Remove(fileUuid);
 storage.Remove(jsonUuid);
 }
 switch (status)
 {
 case StoreStatus_Success:
-LOG(WARNING) << "New instance stored: " << GetTotalSize() << " bytes";
+LOG(WARNING) << "New instance stored";
 break;
 case StoreStatus_AlreadyStored:
 LOG(WARNING) << "Already stored";
 break;
 }
 return status;
 }
-uint64_t ServerIndex::GetTotalSize()
+uint64_t ServerIndex::GetTotalCompressedSize()
 {
 boost::mutex::scoped_lock scoped_lock(mutex_);
-SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT SUM(fileSize) FROM Instances");
+return db2_->GetTotalCompressedSize();
-s.Run();
+}
-return s.ColumnInt64(0);
-}
+uint64_t ServerIndex::GetTotalUncompressedSize()
+{
+boost::mutex::scoped_lock scoped_lock(mutex_);
+return db2_->GetTotalUncompressedSize();
+}
 SeriesStatus ServerIndex::GetSeriesStatus(const std::string& seriesUuid)
 {
 SQLite::Statement s1(db_, SQLITE_FROM_HERE, "SELECT expectedNumberOfInstances FROM Series WHERE uuid=?");

Mercurial > hg > orthanc

comparison OrthancServer/ServerIndex.cpp @ 187:8e673a65564d