Mercurial > hg > orthanc

diff OrthancServer/Sources/ServerIndex.cpp @ 4582:fb0379abb4a7 db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
assume that "GetDatabaseVersion()" can run out of a database transaction
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Mar 2021 15:25:17 +0100
parents bb3c82b8f373
children 42a846166fa3
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerIndex.cpp	Tue Mar 09 15:22:03 2021 +0100
+++ b/OrthancServer/Sources/ServerIndex.cpp	Tue Mar 09 15:25:17 2021 +0100
@@ -1879,7 +1879,7 @@
                                           /* out */ uint64_t& dicomUncompressedSize, 
                                           const std::string& publicId)
   {
-    class Operations : public ServerIndex::IReadOnlyOperations
+    class Operations : public IReadOnlyOperations
     {
     private:
       ResourceType&      type_;
@@ -1914,7 +1914,7 @@
       {
       }
       
-      virtual void Apply(ServerIndex::ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
+      virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
       {
         int64_t top;
         if (!transaction.LookupResource(top, type_, publicId_))
@@ -2031,7 +2031,7 @@
     query.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
 
 
-    class Operations : public ServerIndex::IReadOnlyOperations
+    class Operations : public IReadOnlyOperations
     {
     private:
       std::vector<std::string>&               result_;
@@ -2271,26 +2271,6 @@
   }
 
 
-  unsigned int ServerIndex::GetDatabaseVersion()
-  {
-    class Operations : public ReadOnlyOperationsT1<unsigned int&>
-    {
-    public:
-      virtual void ApplyTuple(ReadOnlyTransaction& transaction,
-                              const Tuple& tuple) ORTHANC_OVERRIDE
-      {
-        // TODO - CANDIDATE FOR "TransactionType_Implicit"
-        tuple.get<0>() = transaction.GetDatabaseVersion();
-      }
-    };
-
-    unsigned int version;
-    Operations operations;
-    operations.Apply(*this, version);
-    return version;
-  }
-
-
   bool ServerIndex::LookupParent(std::string& target,
                                  const std::string& publicId,
                                  ResourceType parentType)