# HG changeset patch # User Sebastien Jodogne # Date 1700595091 -3600 # Node ID d700c8f9fc24f0f0306e484cce8de0fb9d71effa # Parent c1b0f3c4e1f5cb02fe0fbb1e51c5c1421e8ac015 migration to UCLouvain servers diff -r c1b0f3c4e1f5 -r d700c8f9fc24 Framework/Plugins/GlobalProperties.h --- a/Framework/Plugins/GlobalProperties.h Mon Nov 13 20:37:04 2023 +0100 +++ b/Framework/Plugins/GlobalProperties.h Tue Nov 21 20:31:31 2023 +0100 @@ -31,7 +31,7 @@ * The enum "GlobalProperty" is a subset of the "GlobalProperty_XXX" * values from the Orthanc server that have a special meaning to the * database plugins: - * https://hg.orthanc-server.com/orthanc/file/default/OrthancServer/Sources/ServerEnumerations.h + * https://orthanc.uclouvain.be/hg/orthanc/file/default/OrthancServer/Sources/ServerEnumerations.h * * WARNING: The values must be the same between the Orthanc core and * this enum! diff -r c1b0f3c4e1f5 -r d700c8f9fc24 Framework/Plugins/IndexBackend.cpp --- a/Framework/Plugins/IndexBackend.cpp Mon Nov 13 20:37:04 2023 +0100 +++ b/Framework/Plugins/IndexBackend.cpp Tue Nov 21 20:31:31 2023 +0100 @@ -2036,7 +2036,7 @@ virtual bool IsEscapeBrackets() const { // This was initially done at a bad location by the following changeset: - // https://hg.orthanc-server.com/orthanc-databases/rev/389c037387ea + // https://orthanc.uclouvain.be/hg/orthanc-databases/rev/389c037387ea return (dialect_ == Dialect_MSSQL); } diff -r c1b0f3c4e1f5 -r d700c8f9fc24 Framework/Plugins/IndexUnitTests.h --- a/Framework/Plugins/IndexUnitTests.h Mon Nov 13 20:37:04 2023 +0100 +++ b/Framework/Plugins/IndexUnitTests.h Tue Nov 21 20:31:31 2023 +0100 @@ -57,7 +57,7 @@ /** * Mock enumeration inspired from the source code of Orthanc... only * for use in the unit tests! - * https://hg.orthanc-server.com/orthanc/file/default/OrthancServer/Sources/ServerEnumerations.h + * https://orthanc.uclouvain.be/hg/orthanc/file/default/OrthancServer/Sources/ServerEnumerations.h **/ enum MetadataType { diff -r c1b0f3c4e1f5 -r d700c8f9fc24 MySQL/Plugins/MySQLIndex.cpp --- a/MySQL/Plugins/MySQLIndex.cpp Mon Nov 13 20:37:04 2023 +0100 +++ b/MySQL/Plugins/MySQLIndex.cpp Tue Nov 21 20:31:31 2023 +0100 @@ -237,7 +237,7 @@ // to the LONGTEXT type (up to 4GB). This might be important // for applications such as the Osimis Web viewer that stores // large amount of metadata. - // http://book.orthanc-server.com/faq/features.html#central-registry-of-metadata-and-attachments + // https://orthanc.uclouvain.be/book/faq/features.html#central-registry-of-metadata-and-attachments t.GetDatabaseTransaction().ExecuteMultiLines("ALTER TABLE Metadata MODIFY value LONGTEXT"); revision = 4; diff -r c1b0f3c4e1f5 -r d700c8f9fc24 PostgreSQL/NEWS --- a/PostgreSQL/NEWS Mon Nov 13 20:37:04 2023 +0100 +++ b/PostgreSQL/NEWS Tue Nov 21 20:31:31 2023 +0100 @@ -22,7 +22,7 @@ * Support of multiple readers/writers, by handling retries from Orthanc SDK 1.9.2 * Support of range reads for the storage area, from Orthanc SDK 1.9.0 * Fix issue #193 (LSB binaries crash with PostgreSQL + SSL) by changeset - in OrthancFramework: https://hg.orthanc-server.com/orthanc/rev/9a9118406484 + in OrthancFramework: https://orthanc.uclouvain.be/hg/orthanc/rev/9a9118406484 * Fix issue #151 (Storage failures when running with two instances and PG_LOCK=false) diff -r c1b0f3c4e1f5 -r d700c8f9fc24 PostgreSQL/Plugins/PostgreSQLIndex.cpp --- a/PostgreSQL/Plugins/PostgreSQLIndex.cpp Mon Nov 13 20:37:04 2023 +0100 +++ b/PostgreSQL/Plugins/PostgreSQLIndex.cpp Tue Nov 21 20:31:31 2023 +0100 @@ -158,7 +158,7 @@ * performance for "strict" searches (i.e. searches involving * no wildcard). * https://www.postgresql.org/docs/current/static/pgtrgm.html - * https://bugs.orthanc-server.com/show_bug.cgi?id=47 + * https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=47 **/ try { diff -r c1b0f3c4e1f5 -r d700c8f9fc24 README --- a/README Mon Nov 13 20:37:04 2023 +0100 +++ b/README Tue Nov 21 20:31:31 2023 +0100 @@ -24,7 +24,7 @@ (.tar.gz) focused on one given RDBMS, you will only find the folders that are related to this specific RDBMS. The full source code is available at: -https://hg.orthanc-server.com/orthanc-databases/ +https://orthanc.uclouvain.be/hg/orthanc-databases/ Compilation and usage @@ -33,9 +33,9 @@ The compilation and usage of the plugins is available in the Orthanc Book: -* MySQL/MariaDB : http://book.orthanc-server.com/plugins/mysql.html -* PostgreSQL : http://book.orthanc-server.com/plugins/postgresql.html -* ODBC : http://book.orthanc-server.com/plugins/odbc.html +* MySQL/MariaDB : https://orthanc.uclouvain.be/book/plugins/mysql.html +* PostgreSQL : https://orthanc.uclouvain.be/book/plugins/postgresql.html +* ODBC : https://orthanc.uclouvain.be/book/plugins/odbc.html Older releases of PostgreSQL @@ -46,7 +46,7 @@ Releases <= 2.1 of the PostgreSQL plugins can still be found in the following legacy repository: -https://hg.orthanc-server.com/orthanc-postgresql/ +https://orthanc.uclouvain.be/hg/orthanc-postgresql/ Contributing @@ -54,7 +54,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 diff -r c1b0f3c4e1f5 -r d700c8f9fc24 Resources/CMake/MariaDBConfiguration.cmake --- a/Resources/CMake/MariaDBConfiguration.cmake Mon Nov 13 20:37:04 2023 +0100 +++ b/Resources/CMake/MariaDBConfiguration.cmake Tue Nov 21 20:31:31 2023 +0100 @@ -25,7 +25,7 @@ set(MARIADB_PACKAGE_VERSION "3.1.11") set(MARIADB_CLIENT_SOURCES_DIR ${CMAKE_BINARY_DIR}/mariadb-connector-c-${MARIADB_PACKAGE_VERSION}-src) set(MARIADB_CLIENT_MD5 "cf9da5f0ac9ec72dd8309bdc1d1c6c2f") - set(MARIADB_CLIENT_URL "https://orthanc.uclouvain.be/third-party-downloads/mariadb-connector-c-${MARIADB_PACKAGE_VERSION}-src.tar.gz") + set(MARIADB_CLIENT_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/mariadb-connector-c-${MARIADB_PACKAGE_VERSION}-src.tar.gz") if (IS_DIRECTORY "${MARIADB_CLIENT_SOURCES_DIR}") set(FirstRun OFF) diff -r c1b0f3c4e1f5 -r d700c8f9fc24 Resources/CMake/PostgreSQLConfiguration.cmake --- a/Resources/CMake/PostgreSQLConfiguration.cmake Mon Nov 13 20:37:04 2023 +0100 +++ b/Resources/CMake/PostgreSQLConfiguration.cmake Tue Nov 21 20:31:31 2023 +0100 @@ -54,7 +54,7 @@ SET(LIBPQ_SOURCES_DIR ${CMAKE_BINARY_DIR}/postgresql-${LIBPQ_VERSION}) DownloadPackage( "551302a823a1ab48b4ed14166beebba9" - "https://orthanc.uclouvain.be/third-party-downloads/postgresql-${LIBPQ_VERSION}.tar.gz" + "https://orthanc.uclouvain.be/downloads/third-party-downloads/postgresql-${LIBPQ_VERSION}.tar.gz" "${LIBPQ_SOURCES_DIR}") diff -r c1b0f3c4e1f5 -r d700c8f9fc24 Resources/CMake/UnixOdbcConfiguration.cmake --- a/Resources/CMake/UnixOdbcConfiguration.cmake Mon Nov 13 20:37:04 2023 +0100 +++ b/Resources/CMake/UnixOdbcConfiguration.cmake Tue Nov 21 20:31:31 2023 +0100 @@ -25,7 +25,7 @@ set(VERSION "2.3.9") # Used in "config.h.in" set(UNIX_ODBC_SOURCES_DIR ${CMAKE_BINARY_DIR}/unixODBC-${VERSION}) set(UNIX_ODBC_MD5 "06f76e034bb41df5233554abe961a16f") - set(UNIX_ODBC_URL "https://orthanc.uclouvain.be/third-party-downloads/unixODBC-${VERSION}.tar.gz") + set(UNIX_ODBC_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/unixODBC-${VERSION}.tar.gz") DownloadPackage(${UNIX_ODBC_MD5} ${UNIX_ODBC_URL} "${UNIX_ODBC_SOURCES_DIR}") diff -r c1b0f3c4e1f5 -r d700c8f9fc24 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Mon Nov 13 20:37:04 2023 +0100 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Nov 21 20:31:31 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}") diff -r c1b0f3c4e1f5 -r d700c8f9fc24 Resources/Orthanc/CMake/GoogleTestConfiguration.cmake --- a/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake Mon Nov 13 20:37:04 2023 +0100 +++ b/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake Tue Nov 21 20:31:31 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}") diff -r c1b0f3c4e1f5 -r d700c8f9fc24 Resources/Orthanc/Databases/ISqlLookupFormatter.h --- a/Resources/Orthanc/Databases/ISqlLookupFormatter.h Mon Nov 13 20:37:04 2023 +0100 +++ b/Resources/Orthanc/Databases/ISqlLookupFormatter.h Tue Nov 21 20:31:31 2023 +0100 @@ -59,7 +59,7 @@ /** * Whether to escape '[' and ']', which is only needed for * MSSQL. New in Orthanc 1.10.0, from the following changeset: - * https://hg.orthanc-server.com/orthanc-databases/rev/389c037387ea + * https://orthanc.uclouvain.be/hg/orthanc-databases/rev/389c037387ea **/ virtual bool IsEscapeBrackets() const = 0; diff -r c1b0f3c4e1f5 -r d700c8f9fc24 Resources/SyncOrthancFolder.py --- a/Resources/SyncOrthancFolder.py Mon Nov 13 20:37:04 2023 +0100 +++ b/Resources/SyncOrthancFolder.py Tue Nov 21 20:31:31 2023 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # This maintenance script updates the content of the "Orthanc" folder diff -r c1b0f3c4e1f5 -r d700c8f9fc24 TODO --- a/TODO Mon Nov 13 20:37:04 2023 +0100 +++ b/TODO Tue Nov 21 20:31:31 2023 +0100 @@ -19,7 +19,7 @@ * Implement the "StoreDicom" option from the default filesystem storage area to run MySQL/PostgreSQL storage in index-only mode: - https://book.orthanc-server.com/contributing.html + https://orthanc.uclouvain.be/book/contributing.html * Performance: Add a pool of connections to PostgreSQL/MySQL, as already done in the database index plugins