orthanc-databases: Framework/Plugins/DatabaseBackendAdapterV4.cpp comparison

comparison Framework/Plugins/DatabaseBackendAdapterV4.cpp @ 377:02fe4606f5e4 db-protobuf

simplification

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 29 Mar 2023 07:57:49 +0200
parents	59bba5fbb425
children	9db9e0275ec0

comparison

equal deleted inserted replaced

-:59bba5fbb425
+:02fe4606f5e4
 class Output : public IDatabaseBackendOutput
 {
 private:
-Orthanc::DatabasePluginMessages::DeleteAttachment::Response*     deleteAttachment_;
+Orthanc::DatabasePluginMessages::DeleteAttachment::Response*         deleteAttachment_;
-Orthanc::DatabasePluginMessages::DeleteResource::Response*       deleteResource_;
+Orthanc::DatabasePluginMessages::DeleteResource::Response*           deleteResource_;
-Orthanc::DatabasePluginMessages::GetChanges::Response*           getChanges_;
+Orthanc::DatabasePluginMessages::GetChanges::Response*               getChanges_;
-Orthanc::DatabasePluginMessages::GetExportedResources::Response* getExportedResources_;
+Orthanc::DatabasePluginMessages::GetExportedResources::Response*     getExportedResources_;
-Orthanc::DatabasePluginMessages::GetLastChange::Response*        getLastChange_;
+Orthanc::DatabasePluginMessages::GetLastChange::Response*            getLastChange_;
+Orthanc::DatabasePluginMessages::GetLastExportedResource::Response*  getLastExportedResource_;
+Orthanc::DatabasePluginMessages::GetMainDicomTags::Response*         getMainDicomTags_;
 void Clear()
 {
 deleteAttachment_ = NULL;
 deleteResource_ = NULL;
 getChanges_ = NULL;
 getExportedResources_ = NULL;
 getLastChange_ = NULL;
+getLastExportedResource_ = NULL;
 }
 public:
 Output(Orthanc::DatabasePluginMessages::DeleteAttachment::Response& deleteAttachment)
 {
 Output(Orthanc::DatabasePluginMessages::GetLastChange::Response& getLastChange)
 {
 Clear();
 getLastChange_ = &getLastChange;
+}
+Output(Orthanc::DatabasePluginMessages::GetLastExportedResource::Response& getLastExportedResource)
+{
+Clear();
+getLastExportedResource_ = &getLastExportedResource;
+}
+Output(Orthanc::DatabasePluginMessages::GetMainDicomTags::Response& getMainDicomTags)
+{
+Clear();
+getMainDicomTags_ = &getMainDicomTags;
 }
 virtual void SignalDeletedAttachment(const std::string& uuid,
 int32_t            contentType,
 uint64_t           uncompressedSize,
 virtual void AnswerDicomTag(uint16_t group,
 uint16_t element,
 const std::string& value) ORTHANC_OVERRIDE
 {
-throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
+if (getMainDicomTags_ != NULL)
+{
+Orthanc::DatabasePluginMessages::GetMainDicomTags_Response_Tag* tag = getMainDicomTags_->add_tags();
+tag->set_key((static_cast<uint32_t>(group) << 16) + static_cast<uint32_t>(element));
+tag->set_value(value);
+}
+else
+{
+throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
+}
 }
 virtual void AnswerExportedResource(int64_t                    seq,
 OrthancPluginResourceType  resourceType,
 const std::string&         publicId,
 const std::string&         patientId,
 const std::string&         studyInstanceUid,
 const std::string&         seriesInstanceUid,
 const std::string&         sopInstanceUid) ORTHANC_OVERRIDE
 {
+Orthanc::DatabasePluginMessages::ExportedResource* resource;
 if (getExportedResources_ != NULL)
 {
-Orthanc::DatabasePluginMessages::ExportedResource* resource = getExportedResources_->add_resources();
+resource = getExportedResources_->add_resources();
-resource->set_seq(seq);
+}
-resource->set_resource_type(Convert(resourceType));
+else if (getLastExportedResource_ != NULL)
-resource->set_public_id(publicId);
+{
-resource->set_modality(modality);
+if (getLastExportedResource_->exists())
-resource->set_date(date);
+{
-resource->set_patient_id(patientId);
+throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
-resource->set_study_instance_uid(studyInstanceUid);
+}
-resource->set_series_instance_uid(seriesInstanceUid);
-resource->set_sop_instance_uid(sopInstanceUid);
+getLastExportedResource_->set_exists(true);
+resource = getLastExportedResource_->mutable_resource();
 }
 else
 {
 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
 }
+resource->set_seq(seq);
+resource->set_resource_type(Convert(resourceType));
+resource->set_public_id(publicId);
+resource->set_modality(modality);
+resource->set_date(date);
+resource->set_patient_id(patientId);
+resource->set_study_instance_uid(studyInstanceUid);
+resource->set_series_instance_uid(seriesInstanceUid);
+resource->set_sop_instance_uid(sopInstanceUid);
 }
 virtual void AnswerMatchingResource(const std::string& resourceId) ORTHANC_OVERRIDE
 {
 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
 }
 static void ProcessTransactionOperation(Orthanc::DatabasePluginMessages::TransactionResponse& response,
 const Orthanc::DatabasePluginMessages::TransactionRequest& request,
-IndexConnectionsPool::Accessor& transaction)
+IndexBackend& backend,
+DatabaseManager& manager)
 {
 switch (request.operation())
 {
 case Orthanc::DatabasePluginMessages::OPERATION_ROLLBACK:
 {
-transaction.GetManager().RollbackTransaction();
+manager.RollbackTransaction();
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_COMMIT:
 {
-transaction.GetManager().CommitTransaction();
+manager.CommitTransaction();
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_ADD_ATTACHMENT:
 {
 attachment.uncompressedHash = request.add_attachment().attachment().uncompressed_hash().c_str();
 attachment.compressionType = request.add_attachment().attachment().compression_type();
 attachment.compressedSize = request.add_attachment().attachment().compressed_size();
 attachment.compressedHash = request.add_attachment().attachment().compressed_hash().c_str();
-transaction.GetBackend().AddAttachment(transaction.GetManager(), request.add_attachment().id(), attachment,
+backend.AddAttachment(manager, request.add_attachment().id(), attachment, request.add_attachment().revision());
-request.add_attachment().revision());
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_CLEAR_CHANGES:
 {
-transaction.GetBackend().ClearChanges(transaction.GetManager());
+backend.ClearChanges(manager);
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_CLEAR_EXPORTED_RESOURCES:
 {
-transaction.GetBackend().ClearExportedResources(transaction.GetManager());
+backend.ClearExportedResources(manager);
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_DELETE_ATTACHMENT:
 {
 Output output(*response.mutable_delete_attachment());
-transaction.GetBackend().DeleteAttachment(
+backend.DeleteAttachment(output, manager, request.delete_attachment().id(), request.delete_attachment().type());
-output, transaction.GetManager(), request.delete_attachment().id(), request.delete_attachment().type());
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_DELETE_METADATA:
 {
-transaction.GetBackend().DeleteMetadata(
+backend.DeleteMetadata(manager, request.delete_metadata().id(), request.delete_metadata().type());
-transaction.GetManager(), request.delete_metadata().id(), request.delete_metadata().type());
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_DELETE_RESOURCE:
 {
 response.mutable_delete_resource()->set_is_remaining_ancestor(false);
 Output output(*response.mutable_delete_resource());
-transaction.GetBackend().DeleteResource(output, transaction.GetManager(), request.delete_resource().id());
+backend.DeleteResource(output, manager, request.delete_resource().id());
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_GET_ALL_METADATA:
 {
 typedef std::map<int32_t, std::string>  Values;
 Values values;
-transaction.GetBackend().GetAllMetadata(values, transaction.GetManager(), request.get_all_metadata().id());
+backend.GetAllMetadata(values, manager, request.get_all_metadata().id());
 for (Values::const_iterator it = values.begin(); it != values.end(); ++it)
 {
-Orthanc::DatabasePluginMessages::GetAllMetadata_Response_Metadata* metadata = response.mutable_get_all_metadata()->add_metadata();
+Orthanc::DatabasePluginMessages::GetAllMetadata_Response_Metadata* metadata =
+response.mutable_get_all_metadata()->add_metadata();
 metadata->set_type(it->first);
 metadata->set_value(it->second);
 }
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_GET_ALL_PUBLIC_IDS:
 {
 std::list<std::string>  values;
-transaction.GetBackend().GetAllPublicIds(values, transaction.GetManager(), Convert(request.get_all_public_ids().resource_type()));
+backend.GetAllPublicIds(values, manager, Convert(request.get_all_public_ids().resource_type()));
 for (std::list<std::string>::const_iterator it = values.begin(); it != values.end(); ++it)
 {
 response.mutable_get_all_public_ids()->add_ids(*it);
 }
 }
 case Orthanc::DatabasePluginMessages::OPERATION_GET_ALL_PUBLIC_IDS_WITH_LIMITS:
 {
 std::list<std::string>  values;
-transaction.GetBackend().GetAllPublicIds(values, transaction.GetManager(),
+backend.GetAllPublicIds(values, manager, Convert(request.get_all_public_ids_with_limits().resource_type()),
-Convert(request.get_all_public_ids_with_limits().resource_type()),
+request.get_all_public_ids_with_limits().since(),
-request.get_all_public_ids_with_limits().since(),
+request.get_all_public_ids_with_limits().limit());
-request.get_all_public_ids_with_limits().limit());
 for (std::list<std::string>::const_iterator it = values.begin(); it != values.end(); ++it)
 {
 response.mutable_get_all_public_ids_with_limits()->add_ids(*it);
 }
 case Orthanc::DatabasePluginMessages::OPERATION_GET_CHANGES:
 {
 Output output(*response.mutable_get_changes());
 bool done;
-transaction.GetBackend().GetChanges(output, done, transaction.GetManager(),
+backend.GetChanges(output, done, manager, request.get_changes().since(), request.get_changes().limit());
-request.get_changes().since(),
-request.get_changes().limit());
 response.mutable_get_changes()->set_done(done);
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_GET_CHILDREN_INTERNAL_ID:
 {
 std::list<int64_t>  values;
-transaction.GetBackend().GetChildrenInternalId(values, transaction.GetManager(), request.get_children_internal_id().id());
+backend.GetChildrenInternalId(values, manager, request.get_children_internal_id().id());
 for (std::list<int64_t>::const_iterator it = values.begin(); it != values.end(); ++it)
 {
 response.mutable_get_children_internal_id()->add_ids(*it);
 }
 }
 case Orthanc::DatabasePluginMessages::OPERATION_GET_CHILDREN_PUBLIC_ID:
 {
 std::list<std::string>  values;
-transaction.GetBackend().GetChildrenPublicId(values, transaction.GetManager(), request.get_children_public_id().id());
+backend.GetChildrenPublicId(values, manager, request.get_children_public_id().id());
 for (std::list<std::string>::const_iterator it = values.begin(); it != values.end(); ++it)
 {
 response.mutable_get_children_public_id()->add_ids(*it);
 }
 case Orthanc::DatabasePluginMessages::OPERATION_GET_EXPORTED_RESOURCES:
 {
 Output output(*response.mutable_get_exported_resources());
 bool done;
-transaction.GetBackend().GetExportedResources(output, done, transaction.GetManager(),
+backend.GetExportedResources(output, done, manager, request.get_exported_resources().since(),
-request.get_exported_resources().since(),
+request.get_exported_resources().limit());
-request.get_exported_resources().limit());
 response.mutable_get_exported_resources()->set_done(done);
 break;
 }
 case Orthanc::DatabasePluginMessages::OPERATION_GET_LAST_CHANGE:
 {
 response.mutable_get_last_change()->set_exists(false);
 Output output(*response.mutable_get_last_change());
-transaction.GetBackend().GetLastChange(output, transaction.GetManager());
+backend.GetLastChange(output, manager);
 break;
 }
+case Orthanc::DatabasePluginMessages::OPERATION_GET_LAST_EXPORTED_RESOURCE:
+{
+response.mutable_get_last_exported_resource()->set_exists(false);
+Output output(*response.mutable_get_last_exported_resource());
+backend.GetLastExportedResource(output, manager);
+break;
+}
+case Orthanc::DatabasePluginMessages::OPERATION_GET_MAIN_DICOM_TAGS:
+{
+Output output(*response.mutable_get_main_dicom_tags());
+backend.GetMainDicomTags(output, manager, request.get_main_dicom_tags().id());
+break;
+}
+case Orthanc::DatabasePluginMessages::OPERATION_GET_PUBLIC_ID:
+{
+const std::string id = backend.GetPublicId(manager, request.get_public_id().id());
+response.mutable_get_public_id()->set_id(id);
+break;
+}
+case Orthanc::DatabasePluginMessages::OPERATION_GET_RESOURCES_COUNT:
+{
+OrthancPluginResourceType type = Convert(request.get_resources_count().type());
+uint64_t count = backend.GetResourcesCount(manager, type);
+response.mutable_get_resources_count()->set_count(count);
+break;
+}
+case Orthanc::DatabasePluginMessages::OPERATION_GET_RESOURCE_TYPE:
+{
+OrthancPluginResourceType type = backend.GetResourceType(manager, request.get_public_id().id());
+response.mutable_get_resource_type()->set_type(Convert(type));
+break;
+}
+case Orthanc::DatabasePluginMessages::OPERATION_GET_TOTAL_COMPRESSED_SIZE:
+{
+response.mutable_get_total_compressed_size()->set_size(backend.GetTotalCompressedSize(manager));
+break;
+}
+case Orthanc::DatabasePluginMessages::OPERATION_GET_TOTAL_UNCOMPRESSED_SIZE:
+{
+response.mutable_get_total_uncompressed_size()->set_size(backend.GetTotalUncompressedSize(manager));
+break;
+}
 default:
 LOG(ERROR) << "Not implemented transaction operation from protobuf: " << request.operation();
 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
 }
 }
 break;
 case Orthanc::DatabasePluginMessages::REQUEST_TRANSACTION:
 {
 IndexConnectionsPool::Accessor& transaction = *reinterpret_cast<IndexConnectionsPool::Accessor*>(request.transaction_request().transaction());
-ProcessTransactionOperation(*response.mutable_transaction_response(), request.transaction_request(), transaction);
+ProcessTransactionOperation(*response.mutable_transaction_response(), request.transaction_request(),
+transaction.GetBackend(), transaction.GetManager());
 break;
 }
 default:
 LOG(ERROR) << "Not implemented request type from protobuf: " << request.type();

Mercurial > hg > orthanc-databases

comparison Framework/Plugins/DatabaseBackendAdapterV4.cpp @ 377:02fe4606f5e4 db-protobuf