wfs

qingxiongf
src/core/dmpvectorlayer.cpp
src/core/renderer/clsUtil.cpp
src/core/renderer/clsUtil.h
src/server/services/mapserver/mapping/dmpeditservice.cpp
--- a/src/core/dmpvectorlayer.cpp
查看文件 @a073644
+++ b/src/core/dmpvectorlayer.cpp
查看文件 @a073644
@@ -11,6 +11,7 @@
 #include "dmpvectorlayerrenderer.h"
 #include "dmpproviderregistry.h"
 #include "libpq-fe.h"
+#include "clsUtil.h"
 DmpVectorLayer::DmpVectorLayer(const std::string &path,
                                const std::string &baseName,
@@ -139,9 +140,11 @@ bool DmpVectorLayer::writejson(std::string& json)
 	   }
    //Display scale setting  type="1" geometry="Point" alwaysShow="true" maxScale="0" maxScale="50000">
        char resultbuff[1000];
+       string json_source = this->source();
+       DmapCore_30::clsUtil::ToJSONString(json_source);
 	   sprintf(resultbuff,
-	      R"({"workspace":"","type":"1","dbsourceid":"%s","data":"","schema":"%s","alias":"%s","name":"%s","id":"%s","filter":"%s","visible":"%s","tag":"","minScale":"%s","maxScale":"%s","geometry":"%s","alwaysShow":"%s")",
-	      this->source().c_str(),
+	      R"({"workspace":"","type":"1","dbsource":"%s","data":"","schema":"%s","alias":"%s","name":"%s","id":"%s","filter":"%s","visible":"%s","tag":"","minScale":"%s","maxScale":"%s","geometry":"%s","alwaysShow":"%s")",
+        json_source.c_str(),
 		    this->schema().c_str(),
 		    this->title().c_str(),
 		    this->name().c_str(), 
--- a/src/core/renderer/clsUtil.cpp
查看文件 @a073644
+++ b/src/core/renderer/clsUtil.cpp
查看文件 @a073644
@@ -587,6 +587,104 @@ namespace DmapCore_30
 			*bValue = false;
 	}
+	
+	void clsUtil::ToXMLString(std::string &s)
+	{
+		const char *str1 = s.c_str();
+		if (strstr(str1, "&"))
+		{
+			s = clsUtil::CharReplace(s, "&", "&amp;");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "<"))
+		{
+			s = clsUtil::CharReplace(s, "<", "&lt;");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, ">"))
+		{
+			s = clsUtil::CharReplace(s, ">", "&gt;");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\""))
+		{
+			s = clsUtil::CharReplace(s, "\"", "&quot;");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\r"))
+		{
+			s = clsUtil::CharReplace(s, "\r", "");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\n"))
+		{
+			s = clsUtil::CharReplace(s, "\n", "");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "'"))
+		{
+			s = clsUtil::CharReplace(s, "'", "&apos;");
+			//str1=s.c_str();
+		}
+		return;
+	}
+
+	void clsUtil::ToJSONString(std::string &s)
+	{
+		const char *str1 = s.c_str();
+		if (strstr(str1, "\\"))
+		{
+			s = clsUtil::CharReplace(s, "\\", "\\\\");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "/"))
+		{
+			s = clsUtil::CharReplace(s, "/", "\\/");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\""))
+		{
+			s = clsUtil::CharReplace(s, "\"", "\\\"");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\\r"))
+		{
+			s = clsUtil::CharReplace(s, "\\r", "");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\\n"))
+		{
+			s = clsUtil::CharReplace(s, "\\n", "");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\r"))
+		{
+			s = clsUtil::CharReplace(s, "\r", "");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\n"))
+		{
+			s = clsUtil::CharReplace(s, "\n", "");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\t"))
+		{
+			s = clsUtil::CharReplace(s, "'", "\\t");
+			//str1=s.c_str();
+		}
+		return;
+	}
+
+	string clsUtil::CharReplace(string strsrc, string strfind, string strrep)
+	{
+		 for(string::size_type   pos(0);   pos!=string::npos;   pos+=strrep.length())   {     
+            if(   (pos=strsrc.find(strfind,pos))!=string::npos   )     
+                strsrc.replace(pos,strfind.length(),strrep);     
+            else   break;     
+        }
+        return   strsrc;   
+	}
+
 	std::string  clsUtil::fmt(char* fmt, ...)
 	{
 		va_list argptr;
--- a/src/core/renderer/clsUtil.h
查看文件 @a073644
+++ b/src/core/renderer/clsUtil.h
查看文件 @a073644
@@ -73,7 +73,11 @@ else { to[index]->Release(); to[index] = from; }\
 		static void GetFiles(string path, string exd, vector<string> & files);
 		static int  ParseStringTok(char * sz, char  toK, char ** szPtr, int maxPtr);
-		
+
+		static void ToJSONString(std::string &s);
+		static void ToXMLString(std::string &s);
+		static string CharReplace(string strsrc, string strfind, string strrep);
+
 		static std::string fmt(char *, ...);
 		static std::string fmt(const char*, ...);
 		static void ValueString(string * s, bool* bValue);
--- a/src/server/services/mapserver/mapping/dmpeditservice.cpp
查看文件 @a073644
+++ b/src/server/services/mapserver/mapping/dmpeditservice.cpp
查看文件 @a073644
@@ -22,10 +22,9 @@ namespace DmpMapping
     bool loadService(const DmpServerContext &context, ProjectMap& vectorMappingProjects)
     {
         const char *data = (char *)(context.request()->GetData());
-        std::string name = context.serverProject()->name();
-        std::string title = context.serverProject()->title();
+        
-        if(data== nullptr ||  *data == '\0') 
+        if(data== nullptr ||  *data == '\0' || context.request()->method() != DmpServerRequest::Method::POST_METHOD ) 
         {
              LOGGER_ERROR("post 参数错误");
              context.response()->writeJson("{\"status\":\"false\",\"message\":\"post 参数错误!\"}");
@@ -35,12 +34,14 @@ namespace DmpMapping
         if(!context.serverProject())
         {
              LOGGER_ERROR("加载服务信息失败，服务名称是否错误");
-             context.response()->writeJson("{\"status\":\"false\",\"message\":\"加载服务信息失败，服务名称是否错误!\"}");
+             context.response()->writeJson("{\"status\":\"false\",\"message\":\"加载服务信息失败，服务名称错误!\"}");
              return false;
         }
         try
         {
+            std::string name = context.serverProject()->name();
+            std::string title = context.serverProject()->title();
             std::stringstream stream(data);
             boost::property_tree::ptree pt;
             boost::property_tree::read_json(stream, pt);
@@ -105,7 +106,7 @@ namespace DmpMapping
                 json.append("]}");
-                context.response()->write( project->WriteJson());
+                context.response()->writeJson( json);
                 return true;
             }
             else