# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1734368951 -3600
# Node ID 892ee42584bb4f588f00d831c177dbe9898b8e39
# Parent  25d265a1a029149e321910d8bfa28fa8129f3194# Parent  8a500c0defbfce190fe55e388ae67cbd8b554026
merge

diff -r 25d265a1a029 -r 892ee42584bb OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp	Mon Dec 16 18:08:54 2024 +0100
+++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp	Mon Dec 16 18:09:11 2024 +0100
@@ -711,7 +711,7 @@
                             "(new in Orthanc 1.12.5 - overrides `expand`)", false);
 
       call.GetDocumentation().SetHttpGetArgument(GET_EXPAND, RestApiCallDocumentation::Type_String,
-                            "If present, retrieve detailed information about the individual resources", false);
+                            "If present, retrieve detailed information about the individual resources, not only their Orthanc identifiers", false);
 
     }
     else if (call.GetMethod() == HttpMethod_Post)
@@ -724,7 +724,7 @@
                             "(new in Orthanc 1.12.5)", false);
 
       call.GetDocumentation().SetRequestField(POST_EXPAND, RestApiCallDocumentation::Type_Boolean,
-                            "If present, retrieve detailed information about the individual resources", false);
+                            "If set to \"true\", retrieve detailed information about the individual resources, not only their Orthanc identifiers", false);
     }
     else
     {
diff -r 25d265a1a029 -r 892ee42584bb OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp	Mon Dec 16 18:08:54 2024 +0100
+++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp	Mon Dec 16 18:09:11 2024 +0100
@@ -2310,8 +2310,6 @@
 
     ServerContext& context = OrthancRestApi::GetContext(call);
 
-    std::string publicId = call.GetUriComponent("id", "");
-
     bool hasRangeHeader = false;
     StorageAccessor::Range range;
 
@@ -3129,8 +3127,6 @@
           .SetDescription("This URI can be used to perform a search on the content of the local Orthanc server, "
                           "in a way that is similar to querying remote DICOM modalities using C-FIND SCU: "
                           "https://orthanc.uclouvain.be/book/users/rest.html#performing-finds-within-orthanc")
-          .SetRequestField(KEY_EXPAND, RestApiCallDocumentation::Type_Boolean,
-                          "Also retrieve the content of the matching resources, not only their Orthanc identifiers", false)
           .SetRequestField(KEY_LIMIT, RestApiCallDocumentation::Type_Number,
                           "Limit the number of reported resources", false)
           .SetRequestField(KEY_SINCE, RestApiCallDocumentation::Type_Number,
diff -r 25d265a1a029 -r 892ee42584bb OrthancServer/Sources/Search/ISqlLookupFormatter.h
--- a/OrthancServer/Sources/Search/ISqlLookupFormatter.h	Mon Dec 16 18:08:54 2024 +0100
+++ b/OrthancServer/Sources/Search/ISqlLookupFormatter.h	Mon Dec 16 18:09:11 2024 +0100
@@ -26,6 +26,7 @@
 #include "../../../OrthancFramework/Sources/Enumerations.h"
 
 #include <boost/noncopyable.hpp>
+#include <stdint.h>
 #include <vector>
 
 namespace Orthanc