Mercurial > hg > orthanc-dicomweb

changeset 636:c1e941efd4f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
migration to UCLouvain servers
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 21 Nov 2023 20:19:09 +0100
parents b892d390e6b4
children d1f61cb1abf9
files Plugin/DicomWebClient.cpp Plugin/StowRs.cpp README Resources/CMake/JavaScriptLibraries.cmake Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Resources/Orthanc/CMake/GoogleTestConfiguration.cmake WebApplication/index.html
diffstat 7 files changed, 18 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Plugin/DicomWebClient.cpp	Thu Nov 16 16:11:58 2023 +0100
+++ b/Plugin/DicomWebClient.cpp	Tue Nov 21 20:19:09 2023 +0100
@@ -776,7 +776,7 @@
            * chunked transfers, or a version of Orthanc <= 1.7.2 that
            * supports chunk transfers, but cannot receive multipart
            * messages larger than 2GB. The latter problem is fixed by:
-           * https://hg.orthanc-server.com/orthanc/rev/36257d6f348f
+           * https://orthanc.uclouvain.be/hg/orthanc/rev/36257d6f348f
            **/
           if (client->IsChunkedTransfersAllowed())
           {
--- a/Plugin/StowRs.cpp	Thu Nov 16 16:11:58 2023 +0100
+++ b/Plugin/StowRs.cpp	Tue Nov 21 20:19:09 2023 +0100
@@ -64,7 +64,7 @@
     }
 
     // Hotfix for bug #190, until the Orthanc Framework is fixed
-    // https://bugs.orthanc-server.com/show_bug.cgi?id=190
+    // https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=190
     if (!boundary.empty() &&
         boundary.size() >= 2 &&
         boundary[0] == '"' &&
--- a/README	Thu Nov 16 16:11:58 2023 +0100
+++ b/README	Tue Nov 21 20:19:09 2023 +0100
@@ -36,7 +36,7 @@
 ----------------------
 
 Build and usage instructions are available in the Orthanc Book:
-http://book.orthanc-server.com/plugins/dicomweb.html
+https://orthanc.uclouvain.be/book/plugins/dicomweb.html
 
 
 Contributing
@@ -44,7 +44,7 @@
 
 Instructions for contributing to the Orthanc project are included in
 the Orthanc Book:
-https://book.orthanc-server.com/developers/repositories.html
+https://orthanc.uclouvain.be/book/developers/repositories.html
 
 
 Licensing: AGPL
--- a/Resources/CMake/JavaScriptLibraries.cmake	Thu Nov 16 16:11:58 2023 +0100
+++ b/Resources/CMake/JavaScriptLibraries.cmake	Tue Nov 21 20:19:09 2023 +0100
@@ -18,7 +18,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
-set(BASE_URL "https://orthanc.uclouvain.be/third-party-downloads/dicom-web")
+set(BASE_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web")
 
 DownloadPackage(
   "da0189f7c33bf9f652ea65401e0a3dc9"
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Thu Nov 16 16:11:58 2023 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Nov 21 20:19:09 2023 +0100
@@ -168,21 +168,27 @@
       #
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
         # DICOMweb 1.1 (framework pre-1.6.0)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f")
         # Stone Web viewer 1.0 (framework pre-1.8.1)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7")
         # PostgreSQL 3.3 (framework pre-1.8.2)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "2d82bddf06f9cfe82095495cb3b8abde")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "23ad1b9c7800")
         # For "Toolbox::ReadJson()" and "Toolbox::Write{...}Json()" (pre-1.9.0)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "9af92080e57c60dd288eba46ce606c00")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "b2e08d83e21d")
         # WSI 1.1 (framework pre-1.10.0), to remove "-std=c++11"
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "2eaa073cbb4b44ffba199ad93393b2b1")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "daf4807631c5")
         # DICOMweb 1.15 (framework pre-1.12.2)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "c644aff2817306b3207c98c92e43f35f")
       endif()
     endif()
@@ -320,7 +326,11 @@
   else()
     # Default case: Download from the official Web site
     set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz)
-    set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
+    if (ORTHANC_FRAMEWORK_PRE_RELEASE)
+      set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
+    else()
+      set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/downloads/sources/orthanc/${ORTHANC_FRAMEMORK_FILENAME}")
+    endif()
   endif()
 
   set(ORTHANC_FRAMEWORK_ARCHIVE "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}")
--- a/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake	Thu Nov 16 16:11:58 2023 +0100
+++ b/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake	Tue Nov 21 20:19:09 2023 +0100
@@ -50,7 +50,7 @@
 
 elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST)
   set(GOOGLE_TEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/googletest-release-1.8.1)
-  set(GOOGLE_TEST_URL "https://orthanc.uclouvain.be/third-party-downloads/gtest-1.8.1.tar.gz")
+  set(GOOGLE_TEST_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/gtest-1.8.1.tar.gz")
   set(GOOGLE_TEST_MD5 "2e6fbeb6a91310a16efe181886c59596")
 
   DownloadPackage(${GOOGLE_TEST_MD5} ${GOOGLE_TEST_URL} "${GOOGLE_TEST_SOURCES_DIR}")
--- a/WebApplication/index.html	Thu Nov 16 16:11:58 2023 +0100
+++ b/WebApplication/index.html	Tue Nov 21 20:19:09 2023 +0100
@@ -44,7 +44,7 @@
             </p>
             <p>
               <a class="btn btn-primary btn-lg"
-                 href="https://book.orthanc-server.com/plugins/dicomweb.html"
+                 href="https://orthanc.uclouvain.be/book/plugins/dicomweb.html"
                  target="_blank" role="button">Open documentation</a>
               <a class="btn btn-primary btn-lg"
                  :href="orthancApiRoot"