Mercurial > hg > orthanc

changeset 7070:c5e5774720fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <am@orthanc.team>
date Wed, 12 Aug 2026 11:02:10 +0200
parents ce8dfabee759 (current diff) 70385d63b1d7 (diff)
children 6c78bd3fcded
files
diffstat 4 files changed, 16 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp	Wed Aug 12 11:01:49 2026 +0200
+++ b/OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp	Wed Aug 12 11:02:10 2026 +0200
@@ -1666,7 +1666,7 @@
 
         case JobState_Success:
         case JobState_Failure:
-          // not counted since 1.12.11+
+          // not counted since 1.13.0
           break;
 
         default:
--- a/OrthancServer/Resources/AdvancedConfiguration.json	Wed Aug 12 11:01:49 2026 +0200
+++ b/OrthancServer/Resources/AdvancedConfiguration.json	Wed Aug 12 11:02:10 2026 +0200
@@ -20,18 +20,18 @@
     // reading it from DB.
     // You might want to store this tag in ExtraMainDicomTags to build
     // the response faster.
-    "W001_TagsBeingReadFromStorage": true,
+    "W001_TagsBeingReadFromStorage" : true,
 
     // Retrieving a list of Main dicom tags from a resource that has been
     // saved with another "ExtraMainDicomTags" configuration which means that
     // your response might be incomplete/inconsistent.
     // You should call patients|studies|series|instances/../reconstruct to rebuild
     // the DB.  You may also check for the "Housekeeper" plugin.
-    "W002_InconsistentDicomTagsInDb": true,
+    "W002_InconsistentDicomTagsInDb" : true,
 
     // Display a warning message when Orthanc and its plugins are unable
     // to decode a frame (new in Orthanc 1.12.5).
-    "W003_DecoderFailure": true,
+    "W003_DecoderFailure" : true,
 
     // Display a warning when the MainDicomTagsSignature metadata has not been
     // found which means that the resource has been saved with a version prior
@@ -39,23 +39,23 @@
     // You should call patients|studies|series|instances/../reconstruct to rebuild
     // the DB.  You may also check for the "Housekeeper" plugin.
     // (new in Orthanc 1.12.5)
-    "W004_NoMainDicomTagsSignature": true,
+    "W004_NoMainDicomTagsSignature" : true,
 
     // Display a warning when a user performs a find request and requests a tag
     // from a lower resource level; e.g. when requesting "StudyDescription" at
     // Patient level.
     // (new in Orthanc 1.12.5)
-    "W005_RequestingTagFromLowerResourceLevel": true,
+    "W005_RequestingTagFromLowerResourceLevel" : true,
 
     // Display a warning when a user performs a find request and requests a tag
     // from the DICOM Meta Header.
     // (new in Orthanc 1.12.5)
-    "W006_RequestingTagFromMetaHeader": true,
+    "W006_RequestingTagFromMetaHeader" : true,
 
     // Display a warning when a user requests a tag that can not be read from disk
     // because "StorageAccessOnFind" is set to "Never".
     // (new in Orthanc 1.12.5)
-    "W007_MissingRequestedTagsNotReadFromDisk": true
+    "W007_MissingRequestedTagsNotReadFromDisk" : true
   },
 
   // Path to the directory where Orthanc stores its large temporary
@@ -127,7 +127,7 @@
   // Whether the REST API can write to the filesystem (e.g. in
   // /instances/../export route). Starting with Orthanc 1.12.0,
   // this URI is disabled by default for security.
-  "RestApiWriteToFileSystemEnabled": false,
+  "RestApiWriteToFileSystemEnabled" : false,
 
   // When set to "false", this option disables all "/patients" routes
   // and disables patient-level sanity checks when performing resource
@@ -136,7 +136,7 @@
   // might be assigned to different patients because there is no
   // centralized patient ID management. (new in Orthanc 1.12.11)
   // Warning: As of 1.12.11, this is an experimental configuration.
-  "PatientLevelEnabled": true,
+  "PatientLevelEnabled" : true,
 
 
   /**
--- a/OrthancServer/Resources/Configuration.json	Wed Aug 12 11:01:49 2026 +0200
+++ b/OrthancServer/Resources/Configuration.json	Wed Aug 12 11:02:10 2026 +0200
@@ -101,7 +101,7 @@
   // all to Orthanc while, in the second case, external HTTP clients
   // will be able to connect but will receive a 401 Unauthorized
   // HTTP status code.
-  //"HttpBindAddresses": ["1.2.3.4", "127.0.0.1"]
+  //"HttpBindAddresses" : ["1.2.3.4", "127.0.0.1"]
 
   // Number of threads that are used by the embedded HTTP server.
   "HttpThreadsCount" : 50,
@@ -427,7 +427,7 @@
     //  "UseDicomTls" : false,             // new in 1.9.0
     //  "LocalAet" : "HELLO",              // new in 1.9.0
     //  "Timeout" : 60,                    // new in 1.9.1
-    //  "RetrieveMethod": "C-MOVE"         // new in 1.12.6
+    //  "RetrieveMethod" : "C-MOVE"        // new in 1.12.6
     //}
   },
 
@@ -814,8 +814,8 @@
       "BitsAllocated"
     ],
     "Series" : [],
-    "Study": [],
-    "Patient": []
+    "Study" : [],
+    "Patient" : []
   },
   */
 
--- a/OrthancServer/Sources/OrthancFindRequestHandler.cpp	Wed Aug 12 11:01:49 2026 +0200
+++ b/OrthancServer/Sources/OrthancFindRequestHandler.cpp	Wed Aug 12 11:02:10 2026 +0200
@@ -408,8 +408,9 @@
         continue;
       }
 
-      if (tag.IsPrivateCreator())  // new in 1.12.11+: don't try to match PrivateCreators themselves (they are not mandatory); match only the private tags
+      if (tag.IsPrivateCreator())
       {
+        // New in 1.13.0: Don't try to match PrivateCreators themselves (they are not mandatory); match only the private tags
         continue;
       }