diff Plugins/Samples/WebSkeleton/Framework/Plugin.cpp @ 1628:77c4cc4def0f

OrthancPluginErrorCode in REST callbacks
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 18 Sep 2015 16:46:35 +0200
parents 97268448bdfc
children b1291df2f780
line wrap: on
line diff
--- a/Plugins/Samples/WebSkeleton/Framework/Plugin.cpp	Fri Sep 18 16:32:29 2015 +0200
+++ b/Plugins/Samples/WebSkeleton/Framework/Plugin.cpp	Fri Sep 18 16:46:35 2015 +0200
@@ -131,14 +131,14 @@
 
 
 #if ORTHANC_PLUGIN_STANDALONE == 1
-static int32_t ServeStaticResource(OrthancPluginRestOutput* output,
-                                   const char* url,
-                                   const OrthancPluginHttpRequest* request)
+static OrthancPluginErrorCode ServeStaticResource(OrthancPluginRestOutput* output,
+                                                  const char* url,
+                                                  const OrthancPluginHttpRequest* request)
 {
   if (request->method != OrthancPluginHttpMethod_Get)
   {
     OrthancPluginSendMethodNotAllowed(context, output, "GET");
-    return 0;
+    return OrthancPluginErrorCode_Success;
   }
 
   std::string path = "/" + std::string(request->groups[0]);
@@ -152,29 +152,28 @@
 
     const char* resource = s.size() ? s.c_str() : NULL;
     OrthancPluginAnswerBuffer(context, output, resource, s.size(), mime);
-
-    return 0;
   }
   catch (std::runtime_error&)
   {
     std::string s = "Unknown static resource in plugin: " + std::string(request->groups[0]);
     OrthancPluginLogError(context, s.c_str());
     OrthancPluginSendHttpStatusCode(context, output, 404);
-    return 0;
   }
+
+  return OrthancPluginErrorCode_Success;
 }
 #endif
 
 
 #if ORTHANC_PLUGIN_STANDALONE == 0
-static int32_t ServeFolder(OrthancPluginRestOutput* output,
-                           const char* url,
-                           const OrthancPluginHttpRequest* request)
+static OrthancPluginErrorCode ServeFolder(OrthancPluginRestOutput* output,
+                                          const char* url,
+                                          const OrthancPluginHttpRequest* request)
 {
   if (request->method != OrthancPluginHttpMethod_Get)
   {
     OrthancPluginSendMethodNotAllowed(context, output, "GET");
-    return 0;
+    return OrthancPluginErrorCode_Success;
   }
 
   std::string path = ORTHANC_PLUGIN_RESOURCES_ROOT "/" + std::string(request->groups[0]);
@@ -185,23 +184,22 @@
   {
     const char* resource = s.size() ? s.c_str() : NULL;
     OrthancPluginAnswerBuffer(context, output, resource, s.size(), mime);
-
-    return 0;
   }
   else
   {
     std::string s = "Unknown static resource in plugin: " + std::string(request->groups[0]);
     OrthancPluginLogError(context, s.c_str());
     OrthancPluginSendHttpStatusCode(context, output, 404);
-    return 0;
   }
+
+  return OrthancPluginErrorCode_Success;
 }
 #endif
 
 
-static int32_t RedirectRoot(OrthancPluginRestOutput* output,
-                            const char* url,
-                            const OrthancPluginHttpRequest* request)
+static OrthancPluginErrorCode RedirectRoot(OrthancPluginRestOutput* output,
+                                           const char* url,
+                                           const OrthancPluginHttpRequest* request)
 {
   if (request->method != OrthancPluginHttpMethod_Get)
   {
@@ -212,7 +210,7 @@
     OrthancPluginRedirect(context, output, ORTHANC_PLUGIN_WEB_ROOT "index.html");
   }
 
-  return 0;
+  return OrthancPluginErrorCode_Success;
 }