wzp

WZP 万忠平
src/server/dmpservercontext.cpp
src/server/dmpservercontext.h
src/server/dmpserverproject.h
src/server/dmpserverrequest.h
src/server/dmpservice.h
src/server/python/dmpserverwrapper.cpp
src/server/services/mapserver/dmpmapserver.cpp
src/server/services/mapserver/wms/dmpwms.cpp
src/server/services/tileserver/dmptileserver.cpp
src/server/services/tileserver/tms/dmptms.cpp
src/server/services/tileserver/wmts/dmpwmts.cpp
--- a/src/server/dmpservercontext.cpp
查看文件 @5495723
+++ b/src/server/dmpservercontext.cpp
查看文件 @5495723
@@ -8,10 +8,10 @@
 ***************************************************************************/
 #include "dmpservercontext.h"
-DmpServerContext::DmpServerContext(const DmpServerRequest *request, DmpServerResponse *response, const DmpProject *project):
+DmpServerContext::DmpServerContext(const DmpServerRequest *request, DmpServerResponse *response, const DmpServerProject *serverProject):
   request_(request),
   response_(response),
-  project_(project)
+  serverProject_(serverProject)
 {
 }
--- a/src/server/dmpservercontext.h
查看文件 @5495723
+++ b/src/server/dmpservercontext.h
查看文件 @5495723
@@ -15,18 +15,18 @@
 class DmpServerResponse;
 class DmpServerRequest;
-class DmpProject;
+class DmpServerProject;
 class SERVER_EXPORT DmpServerContext
 {
   public:
-    DmpServerContext(const DmpServerRequest *request, DmpServerResponse *response, const DmpProject *project);
+    DmpServerContext(const DmpServerRequest *request, DmpServerResponse *response, const DmpServerProject *serverProject);
     const DmpServerRequest *request() const { return request_;}
     DmpServerResponse *response() const { return response_;}
-    const DmpProject *project() const { return project_;}
+    const DmpServerProject *serverProject() const { return serverProject_;}
   private:
     const DmpServerRequest *request_ = nullptr;
     DmpServerResponse *response_ = nullptr;
-    const DmpProject *project_ = nullptr;
+    const DmpServerProject *serverProject_ = nullptr;
 };
 #endif // __dmpservercontext_h__
--- a/src/server/dmpserverproject.h
查看文件 @5495723
+++ b/src/server/dmpserverproject.h
查看文件 @5495723
@@ -23,7 +23,10 @@ public:
                      const std::string &description,
                      const DmpProject *project);
     std::string createTime() { return time_;}
-    const DmpProject* project()  { return project_;}
+    const DmpProject* project() const { return project_;}
+    std::string name() const { return name_;}
+    std::string title() const { return title_;}
+    std::string description() const { return description_;}
     int status() { return status_;}
     void setStatus(int status) { status_ = status;}
 private:    
--- a/src/server/dmpserverrequest.h
查看文件 @5495723
+++ b/src/server/dmpserverrequest.h
查看文件 @5495723
@@ -50,8 +50,6 @@ public:
     void setHeader(const std::string &name, const std::string &value);
     Headers headers() const { return headers_; }
     bool isRestful() const { return isRestful_; }
-    std::string serviceName() const { return serviceName_;}
-    void setServiceName(const std::string &serviceName) { serviceName_ = serviceName;}
     DmpServerParameters serverParameters() const { return params_; }
     void setParameter(const std::string &name, const std::string &value);
@@ -70,7 +68,6 @@ protected:
     std::string port_;
     std::string path_;
     std::string query_;
-    std::string serviceName_;
     bool isRestful_;
 private:   
--- a/src/server/dmpservice.h
查看文件 @5495723
+++ b/src/server/dmpservice.h
查看文件 @5495723
@@ -15,6 +15,7 @@
 #include <map>
 #include "dmpservercontext.h"
 #include "dmpserverrequest.h"
+#include "dmpserverproject.h"
 typedef enum
 {
--- a/src/server/python/dmpserverwrapper.cpp
查看文件 @5495723
+++ b/src/server/python/dmpserverwrapper.cpp
查看文件 @5495723
@@ -198,7 +198,7 @@ BOOST_PYTHON_MODULE(dmap_server)
       .def("allow_method", pure_virtual(&DmpService::allowMethod))
       .def("execute_request", pure_virtual(&DmpService::executeRequest));
-  class_<DmpServerContext>("DmpServerContext",init<DmpServerRequest*, DmpServerResponse*, DmpProject*>());
+  // class_<DmpServerContext>("DmpServerContext",init<DmpServerRequest*, DmpServerResponse*, DmpProject*>());
   class_<DmpServerRequest>("DmpServerRequest",init<std::string&>()); 
--- a/src/server/services/mapserver/dmpmapserver.cpp
查看文件 @5495723
+++ b/src/server/services/mapserver/dmpmapserver.cpp
查看文件 @5495723
@@ -70,7 +70,7 @@ void DmpMapServer::executeRequest(DmpServerRequest &request, DmpServerResponse &
                         response.writeHtml(htmlstr + "服务\"" + serviceName + "\"已经停止。</p></body></html>\n");
                         return;
                     }
-                    DmpServerContext context {&request, &response, serverProj->project()};
+                    DmpServerContext context {&request, &response, serverProj};
                     service->executeRequest(context);
                 }
                 else {
--- a/src/server/services/mapserver/wms/dmpwms.cpp
查看文件 @5495723
+++ b/src/server/services/mapserver/wms/dmpwms.cpp
查看文件 @5495723
@@ -36,7 +36,7 @@ namespace DmpWms
   void DmpWMSService::executeRequest(const DmpServerContext &context) 
   {
       const DmpWmsParameters params(context.request()->serverParameters());
-      const DmpProject* project = context.project();
+      const DmpProject* project = context.serverProject()->project();
       const std::string request = params.Request();
       if (request.empty())
       {
--- a/src/server/services/tileserver/dmptileserver.cpp
查看文件 @5495723
+++ b/src/server/services/tileserver/dmptileserver.cpp
查看文件 @5495723
@@ -65,7 +65,6 @@ void DmpTileServer::executeRequest(DmpServerRequest &request, DmpServerResponse 
         if(what.size() == 4) {
             std::string serviceName = what[1].str();
             std::string serverType = what[2].str();
-            request.setServiceName(serviceName);
             if(request.isRestful()) {
                 std::string queryString = what[3].str();
                 request.setQuery(queryString);
@@ -79,7 +78,7 @@ void DmpTileServer::executeRequest(DmpServerRequest &request, DmpServerResponse 
                         response.writeHtml(htmlstr + "服务\"" + serviceName + "\"已经停止。</p></body></html>\n");
                         return;
                     }
-                    DmpServerContext context {&request, &response, serverProj->project()};
+                    DmpServerContext context {&request, &response, serverProj};
                     service->executeRequest(context);
                 }
                 else {
--- a/src/server/services/tileserver/tms/dmptms.cpp
查看文件 @5495723
+++ b/src/server/services/tileserver/tms/dmptms.cpp
查看文件 @5495723
@@ -55,7 +55,7 @@ namespace DmpTms
         int tileCol=atoi(vec0[0].c_str());
         int tileRow=atoi(vec[isize-2].c_str());
         int tileMatrix=atoi(vec[isize-3].c_str());
-        const DmpProject *project = context.project();
+        const DmpProject *project = context.serverProject()->project();
         DmpTileLayer *tileLayer = static_cast<DmpTileLayer *>(project->getLayer());
         std::string format=vec0[1].c_str();
         std::string filePath=tileLayer->getDataSource();
--- a/src/server/services/tileserver/wmts/dmpwmts.cpp
查看文件 @5495723
+++ b/src/server/services/tileserver/wmts/dmpwmts.cpp
查看文件 @5495723
@@ -65,10 +65,9 @@ namespace DmpWmts
       params = nullptr;
     }
-    const DmpProject *project = context.project();
+    const DmpServerProject *serverProject = context.serverProject();
+    const DmpProject *project = serverProject->project();
     DmpTileLayer *tileLayer = static_cast<DmpTileLayer *>(project->getLayer(layerName));
-    //context.response()->writeHtml("hello,wmts");
-    //const DmpWmtsParameters params(context.request()->serverParameters());
     if (req.empty())
     {
@@ -83,7 +82,7 @@ namespace DmpWmts
     else if (boost::iequals(req, "GetCapabilities"))
     {
       const std::string host=context.request()->domain()+":"+context.request()->port();;
-      const std::string servicename=context.request()->serviceName();
+      const std::string servicename=serverProject->name();
       boost::property_tree::ptree pt;
       pt.add("Layer.ows:Title",tileLayer->title());