print

@@ -43,7 +43,9 @@ public:
     std::string domain() const { return domain_; }
     std::string port() const { return port_; }
     std::string path() const { return path_; }
+    std::string enpath() const { return enpath_; }
     void setPath(const std::string &path) { path_ = path;}
+    void setEnPath(const std::string &enPath) { enpath_ = enPath;}
     std::string query() const { return query_; }
     void setQuery(const std::string &queryString);
     std::string header( const std::string &name ) const;
@@ -67,6 +69,7 @@ protected:
     std::string domain_;
     std::string port_;
     std::string path_;
+    std::string enpath_;
     std::string query_;
     bool isRestful_;
 

@@ -47,6 +47,7 @@ DmpSpServerRequest::DmpSpServerRequest(SP_HttpRequest* request)
     if (pos != std::string::npos) {
         std::string path = deurl.substr(0, pos);
         setPath(path);
+        setEnPath(url.substr(0, url.find("?")));
         std::string queryString;
         queryString = deurl.substr(pos+1,deurl.length());
         setQuery(queryString);
@@ -54,6 +55,7 @@ DmpSpServerRequest::DmpSpServerRequest(SP_HttpRequest* request)
     else {
         isRestful_ = true;
         setPath(deurl);
+        setEnPath(url);
     }
     
     // for(int i=0; i< request->getParamCount(); i++) {

@@ -22,6 +22,7 @@ SET (MAPSERVER_SRCS
   wms/dmpwmsgetmap.cpp
   wms/dmpwmsserviceinfo.cpp
   wms/dmpwmsgetfeatureinfo.cpp
+  wms/dmpprint.cpp
   mapping/dmpmapping.cpp
   mapping/dmpeditservice.cpp
   mapping/dmpmappingparameters.cpp
@@ -48,6 +49,7 @@ SET (MAPSERVER_HDRS
   wms/dmpwmsgetmap.h
   wms/dmpwmsserviceinfo.h
   wms/dmpwmsgetfeatureinfo.h
+  wms/dmpprint.h
   mapping/dmpmapping.h
   mapping/dmpeditservice.h
   mapping/dmpmappingparameters.h

@@ -30,11 +30,11 @@ namespace DmpWfs
     std::string port = context.request()->port();
     if(port == "80" || port =="")
     {
-      sprintf(char_hrefUrl, "http://%s%s", domain.c_str(), context.request()->path().c_str());
+      sprintf(char_hrefUrl, "http://%s%s", domain.c_str(), context.request()->enpath().c_str());
     }
     else
     {
-      sprintf(char_hrefUrl, "http://%s:%s%s", domain.c_str(),port.c_str(), context.request()->path().c_str());
+      sprintf(char_hrefUrl, "http://%s:%s%s", domain.c_str(),port.c_str(), context.request()->enpath().c_str());
     }
     hrefUrl = char_hrefUrl;
    // hrefUrl = "http://172.26.40.51:8821/?mapService=test";

@@ -7,3 +7,4 @@
 * copyright:         广州城市信息研究所有限公司
 ***************************************************************************/
 #include "dmpprint.h"
+

@@ -10,7 +10,66 @@
 #ifndef __dmpprint_h__
 #define __dmpprint_h__
 
+#include <string>
+#include <string.h>
+#include <vector>
+#include <map>
 
+#include "clsCrSurf.h"
+#include "clsRect.h"
+#include "clsUtil.h"
+using namespace std;
+using namespace DmapCore_30;
+namespace DmpWms
+{
+    class DmpPrint
+    {
+    private:
+        std::string m_name;
+        std::string m_spatialReference;
+        double xmin;
+        double ymin;
+        double xmax;
+        double ymax;
+        int m_width;
+        int m_height;
+        int spatialReference_node;
+        int m_wkid;
+        int m_dpi;
+        double m_scale;
+        int isPicture;
 
+    private:
+        bool DoSetBackGround(clsCrSurf *pClsCS, int iColor);
+        double RecalculateScale(double right, double left, double top, double bottom, double width, double height);
+        string GetFilePath(string path);
+        int GetCurrentFolderPath(char *processdir, size_t len);
+        bool InitTemplateValue(string templateValue);
+        bool ToPrint(std::string &responseData);
+
+    public:
+        DmpPrint(int isPicture);
+/*
+        bool getPrint(AppendBuffer *ab, map<string, shared_ptr<WMSServer>> &mapWmsServer, const char *xml, string servername);
+        bool getPrint(AppendBuffer *ab, map<string, shared_ptr<WMSServer>> &mapWmsServer, string servername, const char *printTemp, const char *bbox);
+
+        bool getPrintLayout(AppendBuffer *ab,
+                            shared_ptr<WMSServer> pWmsServer,
+                            const char *xml,
+                            const char *bbox);
+
+        bool getPrintTempFile(AppendBuffer *ab,
+                              shared_ptr<WMSServer> pWmsServer,
+                              const char *tempName,
+                              const char *bbox);
+
+        bool Test(AppendBuffer *ab, map<string, shared_ptr<WMSServer>> &mapWmsServer, string servername);
+
+        vector<shared_ptr<DmapPrintLayout>> vector_dmapPrintLayout;
+
+        vector<shared_ptr<OperationalLayer>> vector_operationalLayer;
+        */
+    };
+}
 
 #endif // __dmpprint_h__

@@ -25,11 +25,11 @@ namespace DmpWms
     std::string title = context.serverProject()->title();
     if(port == "80" || port =="")
     {
-      sprintf(char_hrefUrl, "http://%s%s", domain.c_str(), context.request()->path().c_str());
+      sprintf(char_hrefUrl, "http://%s%s", domain.c_str(), context.request()->enpath().c_str());
     }
     else
     {
-      sprintf(char_hrefUrl, "http://%s:%s%s", domain.c_str(),port.c_str(), context.request()->path().c_str());
+      sprintf(char_hrefUrl, "http://%s:%s%s", domain.c_str(),port.c_str(), context.request()->enpath().c_str());
     }
     hrefUrl = char_hrefUrl;
    // hrefUrl = "http://172.26.40.51:8821/?mapService=test";