[mapguide-commits] r5233 - in trunk/MgDev/Server/src:
Common/Manager Core Services/Feature Services/Rendering
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Oct 2 02:18:55 EDT 2010
Author: waltweltonlair
Date: 2010-10-02 06:18:55 +0000 (Sat, 02 Oct 2010)
New Revision: 5233
Modified:
trunk/MgDev/Server/src/Common/Manager/CacheManager.cpp
trunk/MgDev/Server/src/Common/Manager/ServerManager.cpp
trunk/MgDev/Server/src/Core/OperationThread.cpp
trunk/MgDev/Server/src/Core/Server.cpp
trunk/MgDev/Server/src/Services/Feature/FilterUtil.cpp
trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp
trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp
trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
Log:
Just run my regular tab/cleanup script...
Modified: trunk/MgDev/Server/src/Common/Manager/CacheManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/CacheManager.cpp 2010-10-02 06:16:48 UTC (rev 5232)
+++ trunk/MgDev/Server/src/Common/Manager/CacheManager.cpp 2010-10-02 06:18:55 UTC (rev 5233)
@@ -321,7 +321,7 @@
///
bool MgCacheManager::IsResourceChangeNotificationNeeded(MgResourceIdentifier* resource)
{
- bool notificationNeeded = false;
+ bool notificationNeeded = false;
// Note that the filter below may be changed in the future or whenever
// a new resource type is supported.
@@ -352,9 +352,9 @@
&& MgResourceType::PrintLayoutDefinition != resourceType
&& MgResourceType::PrintLayoutElementDefinition != resourceType)
{
- notificationNeeded = true;
+ notificationNeeded = true;
}
}
- return notificationNeeded;
+ return notificationNeeded;
}
Modified: trunk/MgDev/Server/src/Common/Manager/ServerManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/ServerManager.cpp 2010-10-02 06:16:48 UTC (rev 5232)
+++ trunk/MgDev/Server/src/Common/Manager/ServerManager.cpp 2010-10-02 06:18:55 UTC (rev 5233)
@@ -979,7 +979,7 @@
// The ACE SELECT reactor does not have the same handle limit as the ACE WFMO reactor.
// The code below is left as is, but commented out in case the ACE WFMO reactor is ever used in the future.
- // The limit for the default Windows ACE WFMO reactor is 62 handles this is due to the 64 handle limit of
+ // The limit for the default Windows ACE WFMO reactor is 62 handles this is due to the 64 handle limit of
// the Windows WaitForMultipleObjects() API, but ACE uses 2 handles internally leaving only 62 handles for the application.
// The only reason the value 55 is chosen is because it is slightly under this value and
// so we can log an error as the # of active connections approaches the current ACE reactor limit.
Modified: trunk/MgDev/Server/src/Core/OperationThread.cpp
===================================================================
--- trunk/MgDev/Server/src/Core/OperationThread.cpp 2010-10-02 06:16:48 UTC (rev 5232)
+++ trunk/MgDev/Server/src/Core/OperationThread.cpp 2010-10-02 06:18:55 UTC (rev 5233)
@@ -413,7 +413,7 @@
{
ACE_Time_Value operationTime(0);
operationTime = ACE_OS::gettimeofday() - operationStartTime;
-
+
unsigned long opTime = operationTime.msec();
pConnection->IncrementProcessedOperations();
Modified: trunk/MgDev/Server/src/Core/Server.cpp
===================================================================
--- trunk/MgDev/Server/src/Core/Server.cpp 2010-10-02 06:16:48 UTC (rev 5232)
+++ trunk/MgDev/Server/src/Core/Server.cpp 2010-10-02 06:18:55 UTC (rev 5233)
@@ -727,9 +727,9 @@
{
report_status(SERVICE_RUNNING);
- // By default the executeable is the thread owner, but when this is being run as a
+ // By default the executeable is the thread owner, but when this is being run as a
// service the Windows Service Control Manager becomes the default thread owner.
- // We need to make this thread the owner of the ACE reactor because this is a
+ // We need to make this thread the owner of the ACE reactor because this is a
// requirement of the ACE SELECT reactor.
ACE_Reactor::instance()->owner(ACE_Thread::self());
}
Modified: trunk/MgDev/Server/src/Services/Feature/FilterUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FilterUtil.cpp 2010-10-02 06:16:48 UTC (rev 5232)
+++ trunk/MgDev/Server/src/Services/Feature/FilterUtil.cpp 2010-10-02 06:18:55 UTC (rev 5233)
@@ -153,7 +153,7 @@
else if (xmlcmp(wnm, L"PropertyName") == 0)
{
m_propName = process_identifier(root);
-
+
// This is a workaround for GML3. For Name and Description properties, there will be a "gml:" prefix
// Remove the prefix to make sure Name and Description properties can be found by FDO API.
size_t pos = m_propName.find_first_of(L":");
Modified: trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp 2010-10-02 06:16:48 UTC (rev 5232)
+++ trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp 2010-10-02 06:18:55 UTC (rev 5233)
@@ -41,7 +41,7 @@
CREFSTRING schemaName, MgStringCollection* classNames, bool& classNameHintUsed)
{
// IMPORTANT INFORMATION
- // FDO objects cannot be cached as they are not thread safe.
+ // FDO objects cannot be cached as they are not thread safe.
// This is not an issue because we create a MapGuide wrapper of this information that is thread safe.
FdoPtr<FdoFeatureSchemaCollection> ffsc;
ffsc = NULL;
@@ -1049,7 +1049,7 @@
}
// IMPORTANT INFORMATION
- // FDO objects cannot be cached as they are not thread safe.
+ // FDO objects cannot be cached as they are not thread safe.
// This is not an issue because we create a MapGuide wrapper of this information that is thread safe.
FdoPtr<FdoFeatureSchemaCollection> fdoSchemas;
fdoSchemas = NULL;
Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp 2010-10-02 06:16:48 UTC (rev 5232)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp 2010-10-02 06:18:55 UTC (rev 5233)
@@ -1286,7 +1286,7 @@
/// retrieve schema information. If this collection is null or empty, information
/// is returned for all feature classes.
/// \param outputFormat (String/string)
-/// A string identifying the output format of
+/// A string identifying the output format of
/// the retrieved schema information.
/// The supported values of output format are specified in OpenGIS Web Feature Service (WFS) Implementation Specification - section 8.2
/// http://portal.opengeospatial.org/files/?artifact_id=8339
@@ -1728,7 +1728,7 @@
/// \param wfsVersion (String/string)
/// A string identifying the wfs version
/// \param outputFormat (String/string)
-/// A string identifying the output format of
+/// A string identifying the output format of
/// the retrieved feature information.
/// The supported values of output format are specified in OpenGIS Web Feature Service (WFS) Implementation Specification - section 9.2
/// http://portal.opengeospatial.org/files/?artifact_id=8339
@@ -1746,9 +1746,9 @@
/// MgInvalidArgumentException
MgByteReader* MgServerFeatureService::GetWfsFeature(MgResourceIdentifier* fs,
CREFSTRING featureClass,
- MgStringCollection* propNames,
- CREFSTRING srs,
- CREFSTRING wfsFilter,
+ MgStringCollection* propNames,
+ CREFSTRING srs,
+ CREFSTRING wfsFilter,
INT32 maxFeatures,
CREFSTRING wfsVersion,
CREFSTRING outputFormat,
@@ -1830,7 +1830,7 @@
if(prop->GetPropertyType() == MgFeaturePropertyType::GeometricProperty)
{
STRING ogcFilter = MgUtil::ReplaceString(wfsFilter,GEOM_PROP_TAG.c_str(),prop->GetName().c_str());
-
+
if(!fdoFilterString.empty())
{
fdoFilterString += L" OR ";
@@ -1839,7 +1839,7 @@
}
}
}
-
+
options->SetFilter(fdoFilterString);
}
@@ -1854,7 +1854,7 @@
{
STRING sSortByProperty = sSortCriteria.substr(0, pos);
orderByProperties->Add(sSortByProperty);
-
+
STRING sSortOption = MgUtil::ToUpper(sSortCriteria.substr(pos+1));
if(sSortOption == L"D")
{
@@ -1890,7 +1890,7 @@
flags->SetMemberName(L"featureMember");
flags->SetMemberUri(L"http://www.opengis.net/gml");
- // set schemaLocations
+ // set schemaLocations
// gml schema location and version
if(L"text/xml; subtype=gml/2.1.2" == outputFormat)
@@ -1908,7 +1908,7 @@
throw new MgInvalidArgumentException(L"MgServerFeatureService.GetWfsFeature",
__LINE__, __WFILE__, NULL, L"", NULL);
}
-
+
// wfs schema location
if(L"1.0.0" == wfsVersion)
{
@@ -1923,16 +1923,16 @@
throw new MgInvalidArgumentException(L"MgServerFeatureService.GetWfsFeature",
__LINE__, __WFILE__, NULL, L"", NULL);
}
-
+
// default namespace schema location
flags->SetSchemaLocation(L"http://www.mynamespace.com/myns", L"http://www.mynamespace.com/myns/myns.xsd");
-
+
// set the default namespace
if(!namespacePrefix.empty())
{
STRING defaultNamespace(L"http://fdo.osgeo.org/schemas/feature/");
defaultNamespace += namespacePrefix;
-
+
flags->SetDefaultNamespace(defaultNamespace.c_str());
}
else
Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2010-10-02 06:16:48 UTC (rev 5232)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2010-10-02 06:18:55 UTC (rev 5233)
@@ -963,7 +963,7 @@
if (!tempInstance.get())
continue;
if (((map->GetWatermarkUsage() & MgMap::Viewer) != 0
- && (tempInstance->GetUsage() & WatermarkInstance::Viewer) == 0)
+ && (tempInstance->GetUsage() & WatermarkInstance::Viewer) == 0)
|| ((map->GetWatermarkUsage() & MgMap::WMS) != 0
&& (tempInstance->GetUsage() & WatermarkInstance::WMS) == 0))
continue;
@@ -998,7 +998,7 @@
continue;
ldf.reset(MgLayerBase::GetLayerDefinition(mapLayer->GetLayerResourceContent()));
-
+
WatermarkInstanceCollection* layerWatermarks = ldf->GetWatermarks();
for (int j=layerWatermarks->GetCount()-1; j>=0; j--)
tempWatermarkInstances.Adopt(layerWatermarks->OrphanAt(j));
@@ -1008,7 +1008,7 @@
if (!tempInstance.get())
continue;
if (((map->GetWatermarkUsage() & MgMap::Viewer) != 0
- && (tempInstance->GetUsage() & WatermarkInstance::Viewer) == 0)
+ && (tempInstance->GetUsage() & WatermarkInstance::Viewer) == 0)
|| ((map->GetWatermarkUsage() & MgMap::WMS) != 0
&& (tempInstance->GetUsage() & WatermarkInstance::WMS) == 0))
continue;
More information about the mapguide-commits
mailing list