Mercurial > hg > orthanc

changeset 4578:710748828b6a db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplification
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Mar 2021 11:55:08 +0100
parents a114a5db2afe
children 5ee9a4f8a0f0
files OrthancServer/Sources/ServerIndex.cpp OrthancServer/Sources/ServerIndex.h
diffstat 2 files changed, 5 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerIndex.cpp	Tue Mar 09 11:52:07 2021 +0100
+++ b/OrthancServer/Sources/ServerIndex.cpp	Tue Mar 09 11:55:08 2021 +0100
@@ -735,13 +735,12 @@
   }
 
 
-  void ServerIndex::MainDicomTagsToJson(Json::Value& target,
-                                        IDatabaseWrapper& db,
-                                        int64_t resourceId,
-                                        ResourceType resourceType)
+  void ServerIndex::ReadOnlyTransaction::MainDicomTagsToJson(Json::Value& target,
+                                                             int64_t resourceId,
+                                                             ResourceType resourceType)
   {
     DicomMap tags;
-    db.GetMainDicomTags(tags, resourceId);
+    db_.GetMainDicomTags(tags, resourceId);
 
     if (resourceType == ResourceType_Study)
     {
--- a/OrthancServer/Sources/ServerIndex.h	Tue Mar 09 11:52:07 2021 +0100
+++ b/OrthancServer/Sources/ServerIndex.h	Tue Mar 09 11:55:08 2021 +0100
@@ -79,12 +79,6 @@
     static void UnstableResourcesMonitorThread(ServerIndex* that,
                                                unsigned int threadSleep);
 
-    // A transaction must be running
-    static void MainDicomTagsToJson(Json::Value& result,
-                                    IDatabaseWrapper& db,
-                                    int64_t resourceId,
-                                    ResourceType resourceType);
-
     void StandaloneRecycling(uint64_t maximumStorageSize,
                              unsigned int maximumPatientCount);
 
@@ -145,10 +139,7 @@
 
       void MainDicomTagsToJson(Json::Value& result,
                                int64_t resourceId,
-                               ResourceType resourceType)
-      {
-        ServerIndex::MainDicomTagsToJson(result, db_, resourceId, resourceType);
-      }
+                               ResourceType resourceType);
 
       /**
        * Read-only methods from "IDatabaseWrapper"