Mercurial > hg > orthanc

diff OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 4939:e8a2e145c80e more-tags

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup
author Alain Mazy <am@osimis.io>
date Tue, 15 Mar 2022 09:09:52 +0100
parents f630796a59b1
children 304514ce84ee
line wrap: on
line diff
--- a/OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp	Mon Mar 14 16:44:00 2022 +0100
+++ b/OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp	Tue Mar 15 09:09:52 2022 +0100
@@ -713,11 +713,10 @@
   bool StatelessDatabaseOperations::ExpandResource(ExpandedResource& target,
                                                    const std::string& publicId,
                                                    ResourceType level,
-                                                   DicomToJsonFormat format,
                                                    const std::set<DicomTag>& requestedTags)
   {    
-    class Operations : public ReadOnlyOperationsT6<
-      bool&, ExpandedResource&, const std::string&, ResourceType, DicomToJsonFormat, const std::set<DicomTag>&>
+    class Operations : public ReadOnlyOperationsT5<
+      bool&, ExpandedResource&, const std::string&, ResourceType, const std::set<DicomTag>&>
     {
     private:
   
@@ -1025,7 +1024,7 @@
           transaction.GetMainDicomTags(target.tags_, internalId);
 
           // check if we have access to all requestedTags or if we must get tags from parents
-          const std::set<DicomTag>& requestedTags = tuple.get<5>();
+          const std::set<DicomTag>& requestedTags = tuple.get<4>();
 
           if (requestedTags.size() > 0)
           {
@@ -1140,7 +1139,7 @@
 
     bool found;
     Operations operations;
-    operations.Apply(*this, found, target, publicId, level, format, requestedTags);
+    operations.Apply(*this, found, target, publicId, level, requestedTags);
     return found;
   }