Mercurial > hg > orthanc

changeset 1442:4ff8dd753d79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OrthancHttpHandler
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 01 Jul 2015 11:08:23 +0200
parents f3672356c121
children 895ab369d63c
files CMakeLists.txt Core/HttpServer/IHttpHandler.h OrthancServer/OrthancHttpHandler.cpp OrthancServer/OrthancHttpHandler.h
diffstat 4 files changed, 152 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Jul 01 10:38:39 2015 +0200
+++ b/CMakeLists.txt	Wed Jul 01 11:08:23 2015 +0200
@@ -175,6 +175,7 @@
   OrthancServer/DicomFindQuery.cpp
   OrthancServer/QueryRetrieveHandler.cpp
   OrthancServer/LuaScripting.cpp
+  OrthancServer/OrthancHttpHandler.cpp
 
   # From "lua-scripting" branch
   OrthancServer/DicomInstanceToStore.cpp
--- a/Core/HttpServer/IHttpHandler.h	Wed Jul 01 10:38:39 2015 +0200
+++ b/Core/HttpServer/IHttpHandler.h	Wed Jul 01 11:08:23 2015 +0200
@@ -56,6 +56,6 @@
                         const UriComponents& uri,
                         const Arguments& headers,
                         const GetArguments& getArguments,
-                        const std::string& postData) = 0;
+                        const std::string& body) = 0;
   };
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancServer/OrthancHttpHandler.cpp	Wed Jul 01 11:08:23 2015 +0200
@@ -0,0 +1,81 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * In addition, as a special exception, the copyright holders of this
+ * program give permission to link the code of its release with the
+ * OpenSSL project's "OpenSSL" library (or with modified versions of it
+ * that use the same license as the "OpenSSL" library), and distribute
+ * the linked executables. You must obey the GNU General Public License
+ * in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s) with this exception, you may extend this exception to
+ * your version of the file(s), but you are not obligated to do so. If
+ * you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files
+ * in the program, then also delete it here.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#include "PrecompiledHeadersServer.h"
+#include "OrthancHttpHandler.h"
+
+#include "../Core/OrthancException.h"
+
+
+namespace Orthanc
+{
+  bool OrthancHttpHandler::Handle(HttpOutput& output,
+                                  HttpMethod method,
+                                  const UriComponents& uri,
+                                  const Arguments& headers,
+                                  const GetArguments& getArguments,
+                                  const std::string& body)
+  {
+    bool found = false;
+
+    for (Handlers::const_iterator it = handlers_.begin(); 
+         it != handlers_.end() && !found; ++it) 
+    {
+      found = (*it)->Handle(output, method, uri, headers, getArguments, body);
+    }
+
+    return found;
+  }
+
+
+  void OrthancHttpHandler::RegisterHandler(IHttpHandler& handler,
+                                           bool isOrthancRestApi)
+  {
+    handlers_.push_back(&handler);
+
+    if (isOrthancRestApi)
+    {
+      orthancRestApi_ = &handler;
+    }
+  }
+
+
+  IHttpHandler& OrthancHttpHandler::GetOrthancRestApi() const
+  {
+    if (orthancRestApi_ == NULL)
+    {
+      throw OrthancException(ErrorCode_InternalError);
+    }
+
+    return *orthancRestApi_;
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancServer/OrthancHttpHandler.h	Wed Jul 01 11:08:23 2015 +0200
@@ -0,0 +1,69 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * In addition, as a special exception, the copyright holders of this
+ * program give permission to link the code of its release with the
+ * OpenSSL project's "OpenSSL" library (or with modified versions of it
+ * that use the same license as the "OpenSSL" library), and distribute
+ * the linked executables. You must obey the GNU General Public License
+ * in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s) with this exception, you may extend this exception to
+ * your version of the file(s), but you are not obligated to do so. If
+ * you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files
+ * in the program, then also delete it here.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#pragma once
+
+#include "../Core/HttpServer/IHttpHandler.h"
+
+namespace Orthanc
+{
+  class OrthancHttpHandler : public IHttpHandler
+  {
+  private:
+    typedef std::list<IHttpHandler*> Handlers;
+
+    Handlers      handlers_;
+    IHttpHandler *orthancRestApi_;
+
+  public:
+    OrthancHttpHandler() : orthancRestApi_(NULL)
+    {
+    }
+
+    virtual bool Handle(HttpOutput& output,
+                        HttpMethod method,
+                        const UriComponents& uri,
+                        const Arguments& headers,
+                        const GetArguments& getArguments,
+                        const std::string& body);
+
+    void RegisterHandler(IHttpHandler& handler,
+                         bool isOrthancRestApi);
+
+    bool HasOrthancRestApi() const
+    {
+      return orthancRestApi_ != NULL;
+    }
+
+    IHttpHandler& GetOrthancRestApi() const;
+  };
+}