Apply recent changes in mapscript to make mapObj serializable

MapServer · Dec 1, 2015 · b74b1ce · b74b1ce
1 parent 617f146
commit b74b1ce
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/mapscript/csharp/csmodule.i b/mapscript/csharp/csmodule.i
@@ -264,7 +264,7 @@ static SWIG_CSharpByteArrayHelperCallback SWIG_csharp_bytearray_callback = NULL;
 
 %ignore imageObj::write;
 
-%typemap(cscode) imageObj %{
+%typemap(cscode) imageObj, struct imageObj %{
   private byte[] gdbuffer;
   private void CreateByteArray(IntPtr data, int size)
   {
@@ -290,7 +290,9 @@ static SWIG_CSharpByteArrayHelperCallback SWIG_csharp_bytearray_callback = NULL;
 %csmethodmodifiers processLegendTemplate "private";
 %csmethodmodifiers processQueryTemplate "private";
 
-%typemap(cscode) mapObj %{
+%typemap(csinterfaces) mapObj "IDisposable, System.Runtime.Serialization.ISerializable"; 
+%typemap(csattributes) mapObj  "[Serializable]"
+%typemap(cscode) mapObj, struct mapObj %{
   public string processTemplate(int bGenerateImages, string[] names, string[] values)
   {
 	if (names.Length != values.Length)
@@ -311,6 +313,18 @@ static SWIG_CSharpByteArrayHelperCallback SWIG_csharp_bytearray_callback = NULL;
 	    throw new ArgumentException("Invalid array length specified!");
 	return processQueryTemplate(names, values, values.Length);
   }
+
+  public mapObj(
+      System.Runtime.Serialization.SerializationInfo info
+      , System.Runtime.Serialization.StreamingContext context) : this(info.GetString("mapText"), 1)
+  {       
+        //this constructor is needed for ISerializable interface
+  }
+
+  public void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) 
+  {    
+        info.AddValue( "mapText", this.convertToString() );        
+  }
 %}
 
 

diff --git a/mapscript/mapscript.i b/mapscript/mapscript.i
@@ -58,6 +58,11 @@
 #include "pygdioctx/pygdioctx.h"
 #endif
 
+#if defined(WIN32) && defined(SWIGCSHARP)
+/* <windows.h> is needed for GetExceptionCode() for unhandled exception */
+#include <windows.h>
+#endif
+
 %}
 
 /* Problem with SWIG CSHARP typemap for pointers */

diff --git a/mapscript/swiginc/map.i b/mapscript/swiginc/map.i
@@ -40,6 +40,13 @@
             return msNewMapObj();
         }      
     }
+
+#ifdef SWIGCSHARP      
+    mapObj(char *mapText, int isMapText /*used as signature only to differentiate this constructor from default constructor*/ ) 
+    {
+        return msLoadMapFromString(mapText, NULL);
+    }
+#endif 
 
     ~mapObj() 
     {
@@ -192,7 +199,17 @@
 
   %newobject draw;
   imageObj *draw() {
+#if defined(WIN32) && defined(SWIGCSHARP)
+    __try {
     return msDrawMap(self, MS_FALSE);
+    }    
+    __except(1 /*EXCEPTION_EXECUTE_HANDLER, catch every exception so it doesn't crash IIS*/) {  
+        msSetError(MS_IMGERR, "Unhandled exception in drawing map image 0x%08x", "msDrawMap()", GetExceptionCode());
+    }
+#else    
+    return msDrawMap(self, MS_FALSE);
+#endif    
+
   }
 
   %newobject drawQuery;