Mercurial > hg > orthanc

changeset 1224:29cf3dd2cea4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removal of Plustache experiments
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 12 Nov 2014 14:05:02 +0100
parents 5bd4c9f85b4c
children 4c649dbeb61a
files CMakeLists.txt Resources/CMake/PlustacheConfiguration.cmake Resources/CMake/PlustacheConfiguration.patch UnitTestsSources/PlustacheTests.cpp
diffstat 4 files changed, 0 insertions(+), 200 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Nov 12 11:52:40 2014 +0100
+++ b/CMakeLists.txt	Wed Nov 12 14:05:02 2014 +0100
@@ -37,9 +37,7 @@
 SET(USE_SYSTEM_PUGIXML ON CACHE BOOL "Use the system version of Pugixml)")
 
 # Experimental options
-SET(USE_PLUSTACHE OFF CACHE BOOL "Use the Plustache templating engine (experimental)")
 SET(USE_PUGIXML ON CACHE BOOL "Use the Pugixml parser (turn off only for debug)")
-SET(USE_SYSTEM_PLUSTACHE OFF CACHE BOOL "Use the system version of Plustache (experimental)")
 
 # Distribution-specific settings
 SET(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)")
@@ -198,7 +196,6 @@
   UnitTestsSources/ImageProcessingTests.cpp
   UnitTestsSources/JpegLosslessTests.cpp
   UnitTestsSources/PluginsTests.cpp
-  UnitTestsSources/PlustacheTests.cpp
   )
 
 
@@ -229,7 +226,6 @@
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibPngConfiguration.cmake)
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LuaConfiguration.cmake)
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibCurlConfiguration.cmake)
-include(${CMAKE_SOURCE_DIR}/Resources/CMake/PlustacheConfiguration.cmake)
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/PugixmlConfiguration.cmake)
 
 
--- a/Resources/CMake/PlustacheConfiguration.cmake	Wed Nov 12 11:52:40 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-if (USE_PLUSTACHE)
-  add_definitions(-DORTHANC_PLUSTACHE_ENABLED=1)
-
-  if (STATIC_BUILD OR NOT USE_SYSTEM_PLUSTACHE)
-    set(PLUSTACHE_SOURCES_DIR ${CMAKE_BINARY_DIR}/plustache-0.3.0)
-    DownloadPackage(
-      "6162946bdb3dccf3b2185fcf149671ee"
-      "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/plustache-0.3.0.tar.gz"
-      "${PLUSTACHE_SOURCES_DIR}")
-
-    list(APPEND THIRD_PARTY_SOURCES
-      ${PLUSTACHE_SOURCES_DIR}/src/context.cpp
-      ${PLUSTACHE_SOURCES_DIR}/src/template.cpp
-      )
-
-    include_directories(
-      ${PLUSTACHE_SOURCES_DIR}
-      )
-
-    execute_process(
-      COMMAND patch -p0 -i ${ORTHANC_ROOT}/Resources/CMake/PlustacheConfiguration.patch
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      )
-
-    source_group(ThirdParty\\Plustache REGULAR_EXPRESSION ${PLUSTACHE_SOURCES_DIR}/.*)
-
-  else()
-    message(FATAL_ERROR "Dynamic linking against plustache not implemented (a patch is required)")
-  endif()
-
-else()
-  add_definitions(-DORTHANC_PLUSTACHE_ENABLED=0)
-
-endif()
--- a/Resources/CMake/PlustacheConfiguration.patch	Wed Nov 12 11:52:40 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-diff -r -u plustache-0.3.0.orig/include/template.hpp plustache-0.3.0/include/template.hpp
---- plustache-0.3.0.orig/include/template.hpp	2014-01-29 13:26:52.000000000 +0100
-+++ plustache-0.3.0/include/template.hpp	2014-05-28 17:51:51.623305914 +0200
-@@ -21,7 +21,7 @@
-     public:
-         template_t ();
-         template_t (std::string& tmpl_path);
--        ~template_t ();
-+        virtual ~template_t ();
-         std::string render(const std::string& tmplate, const Context& ctx);
-         std::string render(const std::string& tmplate, const ObjectType& ctx);
- 
-@@ -42,11 +42,13 @@
-         std::string render_sections(const std::string& tmplate,
-                                     const Context& ctx);
-         std::string html_escape(const std::string& s);
--        std::string get_partial(const std::string& partial) const;
-         void change_delimiter(const std::string& opentag,
-                               const std::string& closetag);
-         void compile_data();
--        std::string get_template(const std::string& tmpl);
-+
-+    protected:
-+        virtual std::string get_partial(const std::string& partial) const;
-+        virtual std::string get_template(const std::string& tmpl);
-     };
- } // namespace Plustache
- #endif
-Only in plustache-0.3.0/include: template.hpp~
-diff -r -u plustache-0.3.0.orig/src/template.cpp plustache-0.3.0/src/template.cpp
---- plustache-0.3.0.orig/src/template.cpp	2014-01-29 13:26:52.000000000 +0100
-+++ plustache-0.3.0/src/template.cpp	2014-05-28 17:51:32.599306393 +0200
-@@ -126,7 +126,7 @@
-         // found a partial
-         else if (modifier == ">")
-         {
--            std::string partial = template_t::get_partial(key);
-+            std::string partial = get_partial(key);
-             repl.assign(template_t::render(partial, ctx));
-         }
-         // normal tag
-Only in plustache-0.3.0/src: template.cpp~
--- a/UnitTestsSources/PlustacheTests.cpp	Wed Nov 12 11:52:40 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/**
- * Orthanc - A Lightweight, RESTful DICOM Store
- * Copyright (C) 2012-2014 Medical Physics Department, CHU 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 "PrecompiledHeadersUnitTests.h"
-#include "gtest/gtest.h"
-
-#if ORTHANC_PLUSTACHE_ENABLED == 1
-
-#include <include/template.hpp>
-
-class OrthancPlustache : public Plustache::template_t
-{
-public:
-protected:
-  virtual std::string get_template(const std::string& tmpl)
-  {
-    //printf("OK [%s]\n", tmpl.c_str());
-    return Plustache::template_t::get_template(tmpl);
-  }
-
-  virtual std::string get_partial(const std::string& partial) const
-  {
-    //printf("OK2 [%s]\n", partial.c_str());
-    //return Plustache::template_t::get_partial(partial);
-    return "<li>{{name}}</li>";
-  }
-};
-
-
-TEST(Plustache, Basic1)
-{
-  PlustacheTypes::ObjectType ctx;
-  ctx["title"] = "About";
-
-  OrthancPlustache t;
-  ASSERT_EQ("<h1>About</h1>", t.render("<h1>{{title}}</h1>", ctx));
-}
-
-
-TEST(Plustache, Basic2)
-{
-  Plustache::Context ctx;
-  ctx.add("title", "About");
-
-  OrthancPlustache t;
-  ASSERT_EQ("<h1>About</h1>", t.render("<h1>{{title}}</h1>", ctx));
-}
-
-
-TEST(Plustache, Context)
-{
-  PlustacheTypes::ObjectType a;
-  a["name"] = "Orthanc";
-
-  PlustacheTypes::ObjectType b;
-  b["name"] = "Jodogne";
-
-  PlustacheTypes::CollectionType c;
-  c.push_back(a);
-  c.push_back(b);
-
-  Plustache::Context ctx;
-  ctx.add("items", c);
-
-  OrthancPlustache t;
-  ASSERT_EQ("<ul><li>Orthanc</li><li>Jodogne</li></ul>",
-            t.render("<ul>{{#items}}<li>{{name}}</li>{{/items}}</ul>", ctx));
-}
-
-
-TEST(Plustache, Partials)
-{
-  PlustacheTypes::ObjectType a;
-  a["name"] = "Orthanc";
-
-  PlustacheTypes::ObjectType b;
-  b["name"] = "Jodogne";
-
-  PlustacheTypes::CollectionType c;
-  c.push_back(a);
-  c.push_back(b);
-
-  Plustache::Context ctx;
-  ctx.add("items", c);
-
-  OrthancPlustache t;
-  ASSERT_EQ("<ul><li>Orthanc</li><li>Jodogne</li></ul>",
-            t.render("<ul>{{#items}}{{>partial}}{{/items}}</ul>", ctx));
-}
-
-#endif