[mapguide-commits] r5232 - in trunk/MgDev/Web/src: CgiAgent HttpHandler MapAgentCommon WebSupport

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Sat Oct 2 02:16:48 EDT 2010


Author: waltweltonlair
Date: 2010-10-02 06:16:48 +0000 (Sat, 02 Oct 2010)
New Revision: 5232

Modified:
   trunk/MgDev/Web/src/CgiAgent/CgiAgent.cpp
   trunk/MgDev/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp
   trunk/MgDev/Web/src/HttpHandler/HttpWfsGetCapabilities.cpp
   trunk/MgDev/Web/src/HttpHandler/OgcServer.cpp
   trunk/MgDev/Web/src/HttpHandler/OgcWfsServer.cpp
   trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.cpp
   trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.h
   trunk/MgDev/Web/src/HttpHandler/WfsGetFeatureParams.cpp
   trunk/MgDev/Web/src/HttpHandler/WmsMapUtil.cpp
   trunk/MgDev/Web/src/MapAgentCommon/MapAgentCommon.cpp
   trunk/MgDev/Web/src/WebSupport/InitializeWebTier.cpp
Log:
Just run my regular tab/cleanup script...

Modified: trunk/MgDev/Web/src/CgiAgent/CgiAgent.cpp
===================================================================
--- trunk/MgDev/Web/src/CgiAgent/CgiAgent.cpp	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/CgiAgent/CgiAgent.cpp	2010-10-02 06:16:48 UTC (rev 5232)
@@ -293,7 +293,7 @@
     MgConfiguration* cfg = MgConfiguration::GetInstance();
     bool bCITEWfsEnabled = false;
     cfg->GetBoolValue(MgConfigProperties::OgcPropertiesSection, MgConfigProperties::CITEWfsEnabled, bCITEWfsEnabled, MgConfigProperties::DefaultCITEWfsEnabled);
-    
+
     return bCITEWfsEnabled;
 }
 
@@ -392,9 +392,9 @@
     MgConfiguration* cfg = MgConfiguration::GetInstance();
 
     // OGC CITE: Test wfs:wfs-1.1.0-Basic-GetCapabilities-tc16.2 (s0012/d1e34887_1/d1e732_1/d1e25171_1/d1e903_1)
-    // Assertion: 
-    // In the event that a GetCapabilities request cannot be processed for any reason, 
-    // the response entity shall include an exception report. The exception code must 
+    // Assertion:
+    // In the event that a GetCapabilities request cannot be processed for any reason,
+    // the response entity shall include an exception report. The exception code must
     // be one of those listed in Table 5.
     if(!isWms && !isWfs)
     {

Modified: trunk/MgDev/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp	2010-10-02 06:16:48 UTC (rev 5232)
@@ -83,7 +83,7 @@
     {
         featureTypeList = MgStringCollection::ParseCollection(sFeatureTypes, L",");
     }
-    
+
     // Determine required output format
     CPSZ pszOutputFormat = Wfs.RequestParameter(MgHttpResourceStrings::reqWfsOutputFormat.c_str());
     STRING sOutputFormat = pszOutputFormat? pszOutputFormat : _("");

Modified: trunk/MgDev/Web/src/HttpHandler/HttpWfsGetCapabilities.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpWfsGetCapabilities.cpp	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/HttpHandler/HttpWfsGetCapabilities.cpp	2010-10-02 06:16:48 UTC (rev 5232)
@@ -135,7 +135,7 @@
 void MgHttpWfsGetCapabilities::InitializeRequestParameters(MgOgcWfsServer& oServer)
 {
     // OGC CITE: Test wfs:wfs-1.1.0-Basic-GetCapabilities-tc19.2 (s0012/d1e34887_1/d1e732_1/d1e25171_1/d1e949_1)
-    // Assertion: 
+    // Assertion:
     // The response to a GetCapabilities request that includes a sections parameter
     // listing optional elements shall include only the requested elements in the
     // response entity.
@@ -143,7 +143,7 @@
     if(pszSections)
     {
         STRING sSections = MgUtil::ToLower(STRING(pszSections));
-        
+
         if(sSections.find(kpszServiceIdentification) != STRING::npos)
         {
             oServer.SetGetCapabilitiesSection(kpszDefinitionSectionServiceIdentification);

Modified: trunk/MgDev/Web/src/HttpHandler/OgcServer.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/OgcServer.cpp	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/HttpHandler/OgcServer.cpp	2010-10-02 06:16:48 UTC (rev 5232)
@@ -1664,9 +1664,9 @@
                     if(bLowest) {
                         // OGC spec: "If a version lower than any of those known to the server
                         // then the server shall send the lowest version it supports."
-                        
-                        // This fixed a potential issue for an unknown request version which just 
-                        // greater than the lowest version and lower than any other supported 
+
+                        // This fixed a potential issue for an unknown request version which just
+                        // greater than the lowest version and lower than any other supported
                         // versions, then we should return the loweset version.
                         m_sNegotiatedVersion = sVersion;
 

Modified: trunk/MgDev/Web/src/HttpHandler/OgcWfsServer.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/OgcWfsServer.cpp	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/HttpHandler/OgcWfsServer.cpp	2010-10-02 06:16:48 UTC (rev 5232)
@@ -263,7 +263,7 @@
                         bSupported = true;
                         break;
                     }
-                }    
+                }
             }
         }
         if(!bSupported)
@@ -288,8 +288,8 @@
         return false;
     }
 
-    // If all the validation passed, we add the FeatureTypeList into definition to 
-    // make ProcedureEnumFeatureTypes happy. 
+    // If all the validation passed, we add the FeatureTypeList into definition to
+    // make ProcedureEnumFeatureTypes happy.
     AddDefinition(kpszDefinitionSectionFeatureTypeList,kpszOmittedValue);
 
     return true;
@@ -330,7 +330,7 @@
                         bSupported = true;
                         break;
                     }
-                }    
+                }
             }
         }
         if(!bSupported)
@@ -474,7 +474,7 @@
 void MgOgcWfsServer::ProcedureEnumFeatureTypes(MgXmlProcessingInstruction& PIEnum)
 {
     // OGC CITE: Test wfs:wfs-1.1.0-Basic-GetCapabilities-tc19.2 (s0012/d1e34887_1/d1e732_1/d1e25171_1/d1e949_1)
-    // Assertion: 
+    // Assertion:
     // The response to a GetCapabilities request that includes a sections parameter
     // listing optional elements shall include only the requested elements in the
     // response entity.
@@ -492,7 +492,7 @@
     ProcessExpandableTextIntoString(sSubset,sSubset);
 
     int iNum = 0;
-    
+
     if(NULL != m_pFeatures)
     {
         while(m_pFeatures->Next())
@@ -533,7 +533,7 @@
             CDictionaryStackFrame ForEachFeature(this);
 
             m_pFeatureSet->GenerateDefinitions(*m_pTopOfDefinitions);
-            
+
             if(IsIterationInSubset(++iNum,sSubset,kpszPiDefinitionFeatureIteration) && (*m_pTopOfDefinitions)[L"Feature.OuterXml"] )
             {
                 ProcessExpandableText(sFormat);

Modified: trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.cpp	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.cpp	2010-10-02 06:16:48 UTC (rev 5232)
@@ -662,7 +662,7 @@
             if(pszSupportedFormats != NULL)
             {
                 MgXmlParser SupportedFormats(pszSupportedFormats);
-                
+
                 while(SupportedFormats.Next())
                 {
                     MgXmlNode& node = SupportedFormats.Current();
@@ -867,8 +867,8 @@
     if(version == NULL)
     {
         // In WMS version 1.0.0, the name of this parameter was "WMTVER".
-        // That name is now deprecated, but for backwards compatibility and 
-        // version negotiation a post-1.0.0 server should accept 
+        // That name is now deprecated, but for backwards compatibility and
+        // version negotiation a post-1.0.0 server should accept
         // either form without issuing a Service Exception.
         version = RequestParameter(kpszQueryStringVersion);
     }

Modified: trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.h
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.h	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.h	2010-10-02 06:16:48 UTC (rev 5232)
@@ -93,7 +93,7 @@
     bool ValidateGetFeatureInfoParameters();
     bool ValidateMapParameters();
     bool ValidateMapParameters(MgStringCollection* queryableLayers);
-    
+
     // Hetp method to get WMS request version
     STRING GetRequestVersion();
 

Modified: trunk/MgDev/Web/src/HttpHandler/WfsGetFeatureParams.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/WfsGetFeatureParams.cpp	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/HttpHandler/WfsGetFeatureParams.cpp	2010-10-02 06:16:48 UTC (rev 5232)
@@ -99,7 +99,7 @@
     // Get the requested output format
     m_outputFormat = GetRequestParameter(oServer,MgHttpResourceStrings::reqWfsOutputFormat);
 
-    // Get the wfs version 
+    // Get the wfs version
     m_version = GetRequestParameter(oServer,MgHttpResourceStrings::reqWfsVersion);
 
     // Get the sortby property name

Modified: trunk/MgDev/Web/src/HttpHandler/WmsMapUtil.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/WmsMapUtil.cpp	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/HttpHandler/WmsMapUtil.cpp	2010-10-02 06:16:48 UTC (rev 5232)
@@ -234,7 +234,7 @@
 
     INT16 quadrant = cs->GetEpsgQuadrant();
 
-    //X increases to the East,  Y increases to the North 
+    //X increases to the East,  Y increases to the North
     if(0 == quadrant || 1 == quadrant)
         return;
 
@@ -246,11 +246,11 @@
         {
             coords[i] = MgUtil::StringToDouble(bounds->GetItem(i));
         }
-        
+
         switch(quadrant)
         {
             //X increases to the West,  Y increases to the North
-            case 2: 
+            case 2:
                 ReverseCoords(coords[0],coords[2]);
                 break;
             //X increases to the West,  Y increases to the South
@@ -288,7 +288,7 @@
             default:
                 break;
         }
-       
+
         bbox.clear();
         for(INT32 i=0;i<4;i++)
         {

Modified: trunk/MgDev/Web/src/MapAgentCommon/MapAgentCommon.cpp
===================================================================
--- trunk/MgDev/Web/src/MapAgentCommon/MapAgentCommon.cpp	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/MapAgentCommon/MapAgentCommon.cpp	2010-10-02 06:16:48 UTC (rev 5232)
@@ -38,7 +38,7 @@
     MgConfiguration* cfg = MgConfiguration::GetInstance();
     bool bCITEWfsEnabled = false;
     cfg->GetBoolValue(MgConfigProperties::OgcPropertiesSection, MgConfigProperties::CITEWfsEnabled, bCITEWfsEnabled, MgConfigProperties::DefaultCITEWfsEnabled);
-    
+
     return bCITEWfsEnabled;
 }
 
@@ -139,9 +139,9 @@
     MgConfiguration* cfg = MgConfiguration::GetInstance();
 
     // OGC CITE: Test wfs:wfs-1.1.0-Basic-GetCapabilities-tc16.2 (s0012/d1e34887_1/d1e732_1/d1e25171_1/d1e903_1)
-    // Assertion: 
-    // In the event that a GetCapabilities request cannot be processed for any reason, 
-    // the response entity shall include an exception report. The exception code must 
+    // Assertion:
+    // In the event that a GetCapabilities request cannot be processed for any reason,
+    // the response entity shall include an exception report. The exception code must
     // be one of those listed in Table 5.
     if(!isWms && !isWfs)
     {

Modified: trunk/MgDev/Web/src/WebSupport/InitializeWebTier.cpp
===================================================================
--- trunk/MgDev/Web/src/WebSupport/InitializeWebTier.cpp	2010-10-02 06:07:46 UTC (rev 5231)
+++ trunk/MgDev/Web/src/WebSupport/InitializeWebTier.cpp	2010-10-02 06:16:48 UTC (rev 5232)
@@ -26,9 +26,9 @@
 #  define DllExport   __declspec( dllexport )
 #  define SWIGSTDCALL __stdcall
 #else
-#  define DllExport  
+#  define DllExport
 #  define SWIGSTDCALL
-#endif 
+#endif
 
 void MgInitializeWebTierInternal(CREFSTRING configFile)
 {



More information about the mapguide-commits mailing list