[mapguide-commits] r5257 - trunk/MgDev/Web/src/HttpHandler

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Oct 7 13:58:46 EDT 2010


Author: waltweltonlair
Date: 2010-10-07 17:58:46 +0000 (Thu, 07 Oct 2010)
New Revision: 5257

Modified:
   trunk/MgDev/Web/src/HttpHandler/HttpWfsGetFeature.cpp
   trunk/MgDev/Web/src/HttpHandler/HttpWmsGetMap.cpp
Log:
Fix build warning in Linux...

Modified: trunk/MgDev/Web/src/HttpHandler/HttpWfsGetFeature.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpWfsGetFeature.cpp	2010-10-07 17:16:36 UTC (rev 5256)
+++ trunk/MgDev/Web/src/HttpHandler/HttpWfsGetFeature.cpp	2010-10-07 17:58:46 UTC (rev 5257)
@@ -23,36 +23,36 @@
 #include "OgcFramework.h"
 #include "OgcWfsServer.h"
 
-///////////////////////////////////////////////////////////////////////////////////////////
-//                                      MgException* or derivative                       //
-//                                      |                 MgOgcWfsException::kpsz...     //
-//                                      |                 |                  OgcServer&  //
-//                                      |                 |                  |           //
-#define CATCH_MGEXCEPTION_HANDLE_AS_OGC(mg_exception_type,ogc_exception_code,ogc_server)  \
-        catch (mg_exception_type* e) {                                                    \
-            STRING sReport = e->GetExceptionMessage();                                    \
-            ogc_server.ServiceExceptionReportResponse(                                    \
-                MgOgcWfsException(MgOgcWfsException::ogc_exception_code,                  \
-                                  sReport.c_str() ));                                     \
-            Ptr<MgByteReader> capabilities = responseStream.Stream().GetReader();         \
-            hResult->SetResultObject(capabilities, capabilities->GetMimeType());          \
-            e->Release();                                                                 \
-        }                                                                                 \
-///////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////
+//                                          MgException* or derivative                       //
+//                                          |                 MgOgcWfsException::kpsz...     //
+//                                          |                 |                  OgcServer&  //
+//                                          |                 |                  |           //
+#define CATCH_MGEXCEPTION_HANDLE_AS_OGC_WFS(mg_exception_type,ogc_exception_code,ogc_server)  \
+        catch (mg_exception_type* e) {                                                        \
+            STRING sReport = e->GetExceptionMessage();                                        \
+            ogc_server.ServiceExceptionReportResponse(                                        \
+                MgOgcWfsException(MgOgcWfsException::ogc_exception_code,                      \
+                                  sReport.c_str() ));                                         \
+            Ptr<MgByteReader> capabilities = responseStream.Stream().GetReader();             \
+            hResult->SetResultObject(capabilities, capabilities->GetMimeType());              \
+            e->Release();                                                                     \
+        }                                                                                     \
+///////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////////////////////
-//                                   MgOgcWfsException::kpsz...                          //
-//                                   |                  OgcServer&                       //
-//                                   |                  |                                //
-#define CATCH_ANYTHING_HANDLE_AS_OGC(ogc_exception_code,ogc_server)                       \
-        catch (...) {                                                                     \
-            ogc_server.ServiceExceptionReportResponse(                                    \
-                MgOgcWfsException(MgOgcWfsException::kpszInternalError,                   \
+///////////////////////////////////////////////////////////////////////////////////////////////
+//                                       MgOgcWfsException::kpsz...                          //
+//                                       |                  OgcServer&                       //
+//                                       |                  |                                //
+#define CATCH_ANYTHING_HANDLE_AS_OGC_WFS(ogc_exception_code,ogc_server)                       \
+        catch (...) {                                                                         \
+            ogc_server.ServiceExceptionReportResponse(                                        \
+                MgOgcWfsException(MgOgcWfsException::kpszInternalError,                       \
                                   _("Unexpected exception was thrown.  No additional details available.")));\
-            Ptr<MgByteReader> capabilities = responseStream.Stream().GetReader();         \
-            hResult->SetResultObject(capabilities, capabilities->GetMimeType());          \
-        }                                                                                 \
-///////////////////////////////////////////////////////////////////////////////////////////
+            Ptr<MgByteReader> capabilities = responseStream.Stream().GetReader();             \
+            hResult->SetResultObject(capabilities, capabilities->GetMimeType());              \
+        }                                                                                     \
+///////////////////////////////////////////////////////////////////////////////////////////////
 
 HTTP_IMPLEMENT_CREATE_OBJECT(MgHttpWfsGetFeature)
 
@@ -138,8 +138,8 @@
         hResult->SetResultObject(responseReader, responseReader->GetMimeType());
     }
     
-    CATCH_MGEXCEPTION_HANDLE_AS_OGC(MgException,kpszInternalError,wfsServer)
-    CATCH_ANYTHING_HANDLE_AS_OGC(pszInternalError,wfsServer)
+    CATCH_MGEXCEPTION_HANDLE_AS_OGC_WFS(MgException,kpszInternalError,wfsServer)
+    CATCH_ANYTHING_HANDLE_AS_OGC_WFS(pszInternalError,wfsServer)
     MG_HTTP_HANDLER_CATCH_AND_THROW_EX(L"MgHttpWfsGetFeature.Execute")
 }
 

Modified: trunk/MgDev/Web/src/HttpHandler/HttpWmsGetMap.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpWmsGetMap.cpp	2010-10-07 17:16:36 UTC (rev 5256)
+++ trunk/MgDev/Web/src/HttpHandler/HttpWmsGetMap.cpp	2010-10-07 17:58:46 UTC (rev 5257)
@@ -26,39 +26,39 @@
 
 // TODO: migrate these to a common Mg*.h header (not Ogc*.h) for use in other handlers.
 
-///////////////////////////////////////////////////////////////////////////////////////////
-//                                      MgException* or derivative                       //
-//                                      |                 MgOgcWmsException::kpsz...     //
-//                                      |                 |                  OgcServer&  //
-//                                      |                 |                  |           //
-#define CATCH_MGEXCEPTION_HANDLE_AS_OGC(mg_exception_type,ogc_exception_code,ogc_server)  \
-        catch (mg_exception_type* e) {                                                    \
-            STRING sReport = e->GetExceptionMessage();                                    \
-            sReport += _("<details>");                                                    \
-            sReport += e->GetDetails();                                                   \
-            sReport += _("</details>");                                                   \
-            ogc_server.ServiceExceptionReportResponse(                                    \
-                MgOgcWmsException(MgOgcWmsException::ogc_exception_code,                  \
-                                  sReport.c_str() ));                                     \
-            Ptr<MgByteReader> capabilities = responseStream.Stream().GetReader();         \
-            hResult->SetResultObject(capabilities, capabilities->GetMimeType());          \
-            e->Release();                                                                 \
-        }                                                                                 \
-///////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////
+//                                          MgException* or derivative                       //
+//                                          |                 MgOgcWmsException::kpsz...     //
+//                                          |                 |                  OgcServer&  //
+//                                          |                 |                  |           //
+#define CATCH_MGEXCEPTION_HANDLE_AS_OGC_WMS(mg_exception_type,ogc_exception_code,ogc_server)  \
+        catch (mg_exception_type* e) {                                                        \
+            STRING sReport = e->GetExceptionMessage();                                        \
+            sReport += _("<details>");                                                        \
+            sReport += e->GetDetails();                                                       \
+            sReport += _("</details>");                                                       \
+            ogc_server.ServiceExceptionReportResponse(                                        \
+                MgOgcWmsException(MgOgcWmsException::ogc_exception_code,                      \
+                                  sReport.c_str() ));                                         \
+            Ptr<MgByteReader> capabilities = responseStream.Stream().GetReader();             \
+            hResult->SetResultObject(capabilities, capabilities->GetMimeType());              \
+            e->Release();                                                                     \
+        }                                                                                     \
+///////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////////////////////
-//                                   MgOgcWmsException::kpsz...                          //
-//                                   |                  OgcServer&                       //
-//                                   |                  |                                //
-#define CATCH_ANYTHING_HANDLE_AS_OGC(ogc_exception_code,ogc_server)                       \
-        catch (...) {                                                                     \
-            ogc_server.ServiceExceptionReportResponse(                                    \
-                MgOgcWmsException(MgOgcWmsException::kpszInternalError,                   \
+///////////////////////////////////////////////////////////////////////////////////////////////
+//                                       MgOgcWmsException::kpsz...                          //
+//                                       |                  OgcServer&                       //
+//                                       |                  |                                //
+#define CATCH_ANYTHING_HANDLE_AS_OGC_WMS(ogc_exception_code,ogc_server)                       \
+        catch (...) {                                                                         \
+            ogc_server.ServiceExceptionReportResponse(                                        \
+                MgOgcWmsException(MgOgcWmsException::kpszInternalError,                       \
                                   _("Unexpected exception was thrown.  No additional details available.")));\
-            Ptr<MgByteReader> capabilities = responseStream.Stream().GetReader();         \
-            hResult->SetResultObject(capabilities, capabilities->GetMimeType());          \
-        }                                                                                 \
-///////////////////////////////////////////////////////////////////////////////////////////
+            Ptr<MgByteReader> capabilities = responseStream.Stream().GetReader();             \
+            hResult->SetResultObject(capabilities, capabilities->GetMimeType());              \
+        }                                                                                     \
+///////////////////////////////////////////////////////////////////////////////////////////////
 
 HTTP_IMPLEMENT_CREATE_OBJECT(MgHttpWmsGetMap)
 
@@ -192,9 +192,9 @@
         //  Custom catch clauses.  In short, NO, we do NOT want to let MapGuide exceptions
         //  pass through.  The buck stops here, with an exception report that WE generate
         //  according to OGC specifications.
-        CATCH_MGEXCEPTION_HANDLE_AS_OGC(MgInvalidCoordinateSystemException,kpszInvalidCRS,   wms)
-        CATCH_MGEXCEPTION_HANDLE_AS_OGC(MgException,                       kpszInternalError,wms)
-        CATCH_ANYTHING_HANDLE_AS_OGC(                                      kpszInternalError,wms)
+        CATCH_MGEXCEPTION_HANDLE_AS_OGC_WMS(MgInvalidCoordinateSystemException,kpszInvalidCRS,   wms)
+        CATCH_MGEXCEPTION_HANDLE_AS_OGC_WMS(MgException,                       kpszInternalError,wms)
+        CATCH_ANYTHING_HANDLE_AS_OGC_WMS(                                      kpszInternalError,wms)
     }
     else
     {



More information about the mapguide-commits mailing list