[mapguide-commits] r4228 - in trunk/MgDev/Web/src: ApacheAgent CgiAgent IsapiAgent

Wed Sep 16 17:41:25 EDT 2009

Author: chrisclaydon
Date: 2009-09-16 17:41:24 -0400 (Wed, 16 Sep 2009)
New Revision: 4228

Modified:
   trunk/MgDev/Web/src/ApacheAgent/ApacheResponseHandler.cpp
   trunk/MgDev/Web/src/CgiAgent/CgiResponseHandler.cpp
   trunk/MgDev/Web/src/IsapiAgent/IsapiResponseHandler.cpp
Log:
Re #1083 - Submit RollbackMapAgent patch on behalf of Christine Bao

Modified: trunk/MgDev/Web/src/ApacheAgent/ApacheResponseHandler.cpp
===================================================================

--- trunk/MgDev/Web/src/ApacheAgent/ApacheResponseHandler.cpp	2009-09-16 21:33:19 UTC (rev 4227)
+++ trunk/MgDev/Web/src/ApacheAgent/ApacheResponseHandler.cpp	2009-09-16 21:41:24 UTC (rev 4228)
@@ -56,7 +56,7 @@
             //TODO: Use a resource for the HTML error message
             STRING shortError = result->GetErrorMessage();
             STRING longError = result->GetDetailedErrorMessage();
-            sprintf(tempHeader, "%d %s", status, MG_WCHAR_TO_CHAR(shortError));
+            sprintf(tempHeader, "%d %s", status, MG_WCHAR_TO_CHAR(statusMessage));
             m_r->status = status;
             m_r->status_line = tempHeader;
             apr_table_set(m_r->headers_out, MapAgentStrings::StatusKey, tempHeader);
@@ -180,7 +180,7 @@
 
     char tempHeader[4096];
 
-    sprintf(tempHeader, "%d %s", 559, MG_WCHAR_TO_CHAR(shortError));
+    sprintf(tempHeader, "%d %s", 559, MG_WCHAR_TO_CHAR(statusMessage));
     m_r->status = 559;
     m_r->status_line = tempHeader;
     apr_table_set(m_r->headers_out, MapAgentStrings::StatusKey, tempHeader);

Modified: trunk/MgDev/Web/src/CgiAgent/CgiResponseHandler.cpp
===================================================================
--- trunk/MgDev/Web/src/CgiAgent/CgiResponseHandler.cpp	2009-09-16 21:33:19 UTC (rev 4227)
+++ trunk/MgDev/Web/src/CgiAgent/CgiResponseHandler.cpp	2009-09-16 21:41:24 UTC (rev 4228)
@@ -62,7 +62,7 @@
             //TODO: Use a resource for the HTML error message
             STRING shortError = result->GetErrorMessage();
             STRING longError = result->GetDetailedErrorMessage();
-            printf(MapAgentStrings::StatusHeader, status, MG_WCHAR_TO_CHAR(shortError));
+            printf(MapAgentStrings::StatusHeader, status, MG_WCHAR_TO_CHAR(statusMessage));
             printf(MapAgentStrings::ContentTypeHeader, MapAgentStrings::TextHtml, "");
             printf("\r\n"
                 "<html>\n<head>\n"
@@ -175,7 +175,7 @@
     STRING statusMessage = e->GetClassName();
 
     //TODO: Use a string resource for html error text format
-    printf(MapAgentStrings::StatusHeader, 559, MG_WCHAR_TO_CHAR(shortError));
+    printf(MapAgentStrings::StatusHeader, 559, MG_WCHAR_TO_CHAR(statusMessage));
     printf(MapAgentStrings::ContentTypeHeader, MapAgentStrings::TextHtml, MapAgentStrings::Utf8Text);
     printf("\r\n"
         "<html>\n<head>\n"

Modified: trunk/MgDev/Web/src/IsapiAgent/IsapiResponseHandler.cpp
===================================================================
--- trunk/MgDev/Web/src/IsapiAgent/IsapiResponseHandler.cpp	2009-09-16 21:33:19 UTC (rev 4227)
+++ trunk/MgDev/Web/src/IsapiAgent/IsapiResponseHandler.cpp	2009-09-16 21:41:24 UTC (rev 4228)
@@ -54,7 +54,7 @@
             //TODO: Use a resource for the HTML error message
             STRING shortError = result->GetErrorMessage();
             STRING longError = result->GetDetailedErrorMessage();
-            sprintf(tempHeader, MapAgentStrings::StatusHeader, status, MG_WCHAR_TO_CHAR(shortError));
+            sprintf(tempHeader, MapAgentStrings::StatusHeader, status, MG_WCHAR_TO_CHAR(statusMessage));
             sResponseHeader.append(tempHeader);
             sprintf(tempHeader, MapAgentStrings::ContentTypeHeader, MapAgentStrings::TextHtml, "");
             sResponseHeader.append(" ");
@@ -62,7 +62,7 @@
             sResponseHeader.append(MapAgentStrings::CrLf);
             m_pECB->dwHttpStatusCode = (DWORD)status;
             char tempStatus[4096];
-            sprintf(tempStatus, "%d %s", status, MG_WCHAR_TO_CHAR(shortError));
+            sprintf(tempStatus, "%d %s", status, MG_WCHAR_TO_CHAR(statusMessage));
             WriteHeader(sResponseHeader.c_str(), tempStatus);
             WriteContext("\r\n"
                 "<html>\n<head>\n"
@@ -193,14 +193,14 @@
     string sResponseHeader;
     char tempHeader[4096];
 
-    sprintf(tempHeader, MapAgentStrings::StatusHeader, 559, MG_WCHAR_TO_CHAR(shortError));
+    sprintf(tempHeader, MapAgentStrings::StatusHeader, 559, MG_WCHAR_TO_CHAR(statusMessage));
     sResponseHeader.append(tempHeader);
     sprintf(tempHeader, MapAgentStrings::ContentTypeHeader, MapAgentStrings::TextHtml, MapAgentStrings::Utf8Text);
     sResponseHeader.append(tempHeader);
     sResponseHeader.append(MapAgentStrings::CrLf);
     m_pECB->dwHttpStatusCode = (DWORD)status;
     char tempStatus[4096];
-    sprintf(tempStatus, "%d %s", status, MG_WCHAR_TO_CHAR(shortError));
+    sprintf(tempStatus, "%d %s", status, MG_WCHAR_TO_CHAR(statusMessage));
     WriteHeader(sResponseHeader.c_str(), tempStatus);
     WriteContext("\r\n"
         "<html>\n<head>\n"

