# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1649427242 -7200
# Node ID 9ed19ec11f487e197f933cd938db2de9cfddff12
# Parent  a749092170ef67fbe377bb1868151016fa7145af
fix osimis-viewer route

diff -r a749092170ef -r 9ed19ec11f48 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Fri Apr 08 16:14:02 2022 +0200
@@ -0,0 +1,2 @@
+.vscode/
+ThirdPartyDownloads/
\ No newline at end of file
diff -r a749092170ef -r 9ed19ec11f48 AUTHORS
--- a/AUTHORS	Wed Jun 23 09:07:18 2021 +0200
+++ b/AUTHORS	Fri Apr 08 16:14:02 2022 +0200
@@ -6,6 +6,6 @@
 -------
 
 * Osimis <info@osimis.io>
-  Rue des Chasseurs Ardennais 3
-  4031 Liege 
+  Quai Banning 6
+  4000 Liège
   Belgium
diff -r a749092170ef -r 9ed19ec11f48 Dockerfile
--- a/Dockerfile	Wed Jun 23 09:07:18 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-
-FROM jodogne/orthanc:1.2.0
-
-WORKDIR /root/source
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y install \
-      libxml++2.6-dev libxml++2.6-doc uuid-dev \
-      git \
-      python3-dev \
-      python3.4-venv \
-      python3-pip && \
-    rm -rf /var/lib/apt/lists/*
-
-# Used to copy the plugin to AWS after successful integration tests
-RUN pip3 install awscli
-
-COPY . /root/source/
-
-# Build the plugin
-RUN mkdir /root/build/
-WORKDIR /root/build
-RUN cmake -DALLOW_DOWNLOADS=ON \
-    -DSTATIC_BUILD=ON \
-    -DCMAKE_BUILD_TYPE=Release \
-    /root/source
-RUN make "--jobs=$(grep --count ^processor /proc/cpuinfo)"
-RUN make install
-
-ENTRYPOINT [ "Orthanc" ]
-CMD [ "/etc/orthanc/" ]
diff -r a749092170ef -r 9ed19ec11f48 Jenkinsfile
--- a/Jenkinsfile	Wed Jun 23 09:07:18 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-try {
-  node('docker') {
-    stage 'Retrieve sources'
-    deleteDir()
-    checkout scm
-
-    lock(resource: 'orthanc-authorization-plugin', inversePrecedence: false) {
-      stage 'Build Docker image & run unit tests'
-      sh 'scripts/ciBuildDockerImage.sh'
-    }
-    
-    withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', credentialsId: 'aws-orthanc.osimis.io']]) {
-      stage 'Push Docker plugin to AWS'
-      sh 'scripts/ciPushToAws.sh ${BRANCH_NAME}'
-    }
-  }
-} 
-catch (e) {
-    slackSend color: '#FF0000', message: "${env.JOB_NAME} has failed ${env.JOB_URL}"
-    throw e
-} 
\ No newline at end of file
diff -r a749092170ef -r 9ed19ec11f48 NEWS
--- a/NEWS	Wed Jun 23 09:07:18 2021 +0200
+++ b/NEWS	Fri Apr 08 16:14:02 2022 +0200
@@ -1,12 +1,11 @@
 Pending changes in the mainline
 ===============================
 
+* Fix osimis-viewer route
 
 2020-12-10 - v 0.2.4
 ====================
 
-NB: This plugin is now deprecated.
-
 * Added support for Osimis Web Viewer new route (osimis-viewer/custom-command/)
 * Support of dynamic linking against the system-wide Orthanc framework library
 
diff -r a749092170ef -r 9ed19ec11f48 Plugin/DefaultAuthorizationParser.cpp
--- a/Plugin/DefaultAuthorizationParser.cpp	Wed Jun 23 09:07:18 2021 +0200
+++ b/Plugin/DefaultAuthorizationParser.cpp	Fri Apr 08 16:14:02 2022 +0200
@@ -124,7 +124,7 @@
     }
     else if (boost::regex_match(uri, what, osimisViewerImages_))
     {
-      AddOrthancInstance(target, what[1]);
+      AddOrthancInstance(target, what[2]);
       return true;
     }
     else