Mercurial > hg > orthanc

changeset 5906:573c538a2405 get-scu

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup
author Alain Mazy <am@orthanc.team>
date Fri, 06 Dec 2024 12:17:47 +0100
parents dad78aa9141e
children 8329d28611ad
files OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.cpp OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp
diffstat 2 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.cpp	Fri Dec 06 12:06:05 2024 +0100
+++ b/OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.cpp	Fri Dec 06 12:17:47 2024 +0100
@@ -537,11 +537,9 @@
     {
       case ResourceType_Patient:
         sopClass = UID_GETPatientRootQueryRetrieveInformationModel;
-        // DU_putStringDOElement(queryDataset, DCM_QueryRetrieveLevel, ResourceTypeToDicomQueryRetrieveLevel(ResourceType_Patient));  // TODO-GET
         break;
       case ResourceType_Study:
         sopClass = UID_GETStudyRootQueryRetrieveInformationModel;
-        // DU_putStringDOElement(queryDataset, DCM_QueryRetrieveLevel, ResourceTypeToDicomQueryRetrieveLevel(ResourceType_Study));  // TODO-GET
         break;
       default:
         throw OrthancException(ErrorCode_InternalError); // TODO-GET: implement series + instances
@@ -659,7 +657,7 @@
                                                   parameters_.GetTimeout(),
                                                   &cmdPresId,
                                                   &dataObject,
-                                                  NULL /*callback*/, NULL /*callbackData*/);  // TODO-GET
+                                                  NULL, NULL);
 
           if (result.bad())
           {
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp	Fri Dec 06 12:06:05 2024 +0100
+++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp	Fri Dec 06 12:17:47 2024 +0100
@@ -1712,7 +1712,7 @@
                              std::string(KEY_QUERY));
     }
 
-    std::string localAet = Toolbox::GetJsonStringField  // TODO-GET: keep this ?
+    std::string localAet = Toolbox::GetJsonStringField
       (request, KEY_LOCAL_AET, context.GetDefaultLocalApplicationEntityTitle());
 
     const RemoteModalityParameters source =
@@ -1720,14 +1720,10 @@
 
     std::unique_ptr<DicomGetScuJob> job(new DicomGetScuJob(context));
 
-    job->SetQueryFormat(DicomToJsonFormat_Short);  // TODO-GET: keep this ?
+    job->SetQueryFormat(DicomToJsonFormat_Short);
     job->SetLocalAet(localAet);
     job->SetRemoteModality(source);
 
-        // TODO-GET: asynchronous
-        // TODO-GET: permissive
-
-
     if (request[KEY_QUERY].isMember("PatientID"))  // TODO-GET: handle get of multiple resources + series + instances 
     {
       job->AddResourceToRetrieve(ResourceType_Patient, request[KEY_QUERY]["PatientID"].asString());