--- a/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp	Fri May 03 17:20:27 2024 +0200
+++ b/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp	Fri May 03 17:26:06 2024 +0200
@@ -1173,7 +1173,7 @@
 
           while (statement.Step())
           {
-            response.Add(new FindResponse::Item(request.GetLevel(), statement.ColumnString(0)));
+            response.Add(new FindResponse::Resource(request.GetLevel(), statement.ColumnString(0)));
           }
         }
         else
@@ -1195,7 +1195,7 @@
             while (statement.Step())
             {
               const std::string resourceId = statement.ColumnString(0);
-              response.Add(new FindResponse::Item(request.GetLevel(), resourceId));
+              response.Add(new FindResponse::Resource(request.GetLevel(), resourceId));
             }
           }
 
@@ -1211,86 +1211,86 @@
             while (statement.Step())
             {
               const std::string& resourceId = statement.ColumnString(0);
-              assert(response.HasItem(resourceId));
-              response.GetItem(resourceId).AddStringDicomTag(request.GetLevel(),
-                                                             statement.ColumnInt(1),
-                                                             statement.ColumnInt(2),
-                                                             statement.ColumnString(3));
+              assert(response.HasResource(resourceId));
+              response.GetResource(resourceId).AddStringDicomTag(request.GetLevel(),
+                                                                 statement.ColumnInt(1),
+                                                                 statement.ColumnInt(2),
+                                                                 statement.ColumnString(3));
             }
           }
 
           if (request.HasResponseContent(FindRequest::ResponseContent_Children))
           {
             SQLite::Statement statement(db_, SQLITE_FROM_HERE, 
-                "SELECT filtered.publicId, childLevel.publicId AS childPublicId "
-                "FROM Resources as currentLevel "
-                "    INNER JOIN FilteredResourcesIds filtered ON filtered.internalId = currentLevel.internalId "
-                "    INNER JOIN Resources childLevel ON childLevel.parentId = currentLevel.internalId");
+                                        "SELECT filtered.publicId, childLevel.publicId AS childPublicId "
+                                        "FROM Resources as currentLevel "
+                                        "    INNER JOIN FilteredResourcesIds filtered ON filtered.internalId = currentLevel.internalId "
+                                        "    INNER JOIN Resources childLevel ON childLevel.parentId = currentLevel.internalId");
             formatter.Bind(statement);
 
             while (statement.Step())
             {
               const std::string& resourceId = statement.ColumnString(0);
-              assert(response.HasItem(resourceId));
-              response.GetItem(resourceId).AddChildIdentifier(GetChildResourceType(request.GetLevel()), statement.ColumnString(1));
+              assert(response.HasResource(resourceId));
+              response.GetResource(resourceId).AddChildIdentifier(GetChildResourceType(request.GetLevel()), statement.ColumnString(1));
             }
           }
 
           if (request.HasResponseContent(FindRequest::ResponseContent_Parent))
           {
             SQLite::Statement statement(db_, SQLITE_FROM_HERE, 
-                "SELECT filtered.publicId, parentLevel.publicId AS parentPublicId "
-                "FROM Resources as currentLevel "
-                "    INNER JOIN FilteredResourcesIds filtered ON filtered.internalId = currentLevel.internalId "
-                "    INNER JOIN Resources parentLevel ON currentLevel.parentId = parentLevel.internalId");
+                                        "SELECT filtered.publicId, parentLevel.publicId AS parentPublicId "
+                                        "FROM Resources as currentLevel "
+                                        "    INNER JOIN FilteredResourcesIds filtered ON filtered.internalId = currentLevel.internalId "
+                                        "    INNER JOIN Resources parentLevel ON currentLevel.parentId = parentLevel.internalId");
 
             while (statement.Step())
             {
               const std::string& resourceId = statement.ColumnString(0);
               const std::string& parentId = statement.ColumnString(1);
-              assert(response.HasItem(resourceId));
-              response.GetItem(resourceId).SetParentIdentifier(parentId);
+              assert(response.HasResource(resourceId));
+              response.GetResource(resourceId).SetParentIdentifier(parentId);
             }
           }
 
           if (request.HasResponseContent(FindRequest::ResponseContent_Metadata))
           {
             SQLite::Statement statement(db_, SQLITE_FROM_HERE, 
-                "SELECT filtered.publicId, metadata.type, metadata.value "
-                "FROM Metadata "
-                "  INNER JOIN FilteredResourcesIds filtered ON filtered.internalId = Metadata.id");
+                                        "SELECT filtered.publicId, metadata.type, metadata.value "
+                                        "FROM Metadata "
+                                        "  INNER JOIN FilteredResourcesIds filtered ON filtered.internalId = Metadata.id");
 
             while (statement.Step())
             {
               const std::string& resourceId = statement.ColumnString(0);
-              assert(response.HasItem(resourceId));
-              response.GetItem(resourceId).AddMetadata(static_cast<MetadataType>(statement.ColumnInt(1)),
-                                                       statement.ColumnString(2));
+              assert(response.HasResource(resourceId));
+              response.GetResource(resourceId).AddMetadata(static_cast<MetadataType>(statement.ColumnInt(1)),
+                                                           statement.ColumnString(2));
             }
           }
 
           if (request.HasResponseContent(FindRequest::ResponseContent_Labels))
           {
             SQLite::Statement statement(db_, SQLITE_FROM_HERE, 
-                "SELECT filtered.publicId, label "
-                "FROM Labels "
-                "  INNER JOIN FilteredResourcesIds filtered ON filtered.internalId = Labels.id");
+                                        "SELECT filtered.publicId, label "
+                                        "FROM Labels "
+                                        "  INNER JOIN FilteredResourcesIds filtered ON filtered.internalId = Labels.id");
 
             while (statement.Step())
             {
               const std::string& resourceId = statement.ColumnString(0);
-              assert(response.HasItem(resourceId));
-              response.GetItem(resourceId).AddLabel(statement.ColumnString(1));
+              assert(response.HasResource(resourceId));
+              response.GetResource(resourceId).AddLabel(statement.ColumnString(1));
             }
           }
 
           if (request.HasResponseContent(FindRequest::ResponseContent_Attachments))
           {
             SQLite::Statement statement(db_, SQLITE_FROM_HERE, 
-                "SELECT filtered.publicId, uuid, fileType, uncompressedSize, compressionType, compressedSize, "
-                "       uncompressedMD5, compressedMD5 "
-                "FROM AttachedFiles "
-                "  INNER JOIN FilteredResourcesIds filtered ON filtered.internalId = AttachedFiles.id");
+                                        "SELECT filtered.publicId, uuid, fileType, uncompressedSize, compressionType, compressedSize, "
+                                        "       uncompressedMD5, compressedMD5 "
+                                        "FROM AttachedFiles "
+                                        "  INNER JOIN FilteredResourcesIds filtered ON filtered.internalId = AttachedFiles.id");
 
             while (statement.Step())
             {
@@ -1303,8 +1303,8 @@
                                              statement.ColumnInt64(5),
                                              statement.ColumnString(7));
 
-              assert(response.HasItem(resourceId));
-              response.GetItem(resourceId).AddAttachment(attachment);
+              assert(response.HasResource(resourceId));
+              response.GetResource(resourceId).AddAttachment(attachment);
             };
           }