[mapguide-commits] r5246 - in trunk/MgDev:
Common/MapGuideCommon/Services Common/PlatformBase/Services
Server/src/Services/Feature
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Oct 5 11:46:37 EDT 2010
Author: waltweltonlair
Date: 2010-10-05 15:46:37 +0000 (Tue, 05 Oct 2010)
New Revision: 5246
Modified:
trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp
trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h
trunk/MgDev/Common/PlatformBase/Services/FeatureService.h
trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp
trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.h
Log:
Minor clean up
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp 2010-10-05 06:28:43 UTC (rev 5245)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp 2010-10-05 15:46:37 UTC (rev 5246)
@@ -281,6 +281,8 @@
return GetCapabilities(providerName, connectionString);
}
+
+//////////////////////////////////////////////////////////////////
MgByteReader* MgProxyFeatureService::GetCapabilities(CREFSTRING providerName, CREFSTRING connectionString)
{
Ptr<MgUserInformation> userInfo = m_connProp->GetUserInfo();
@@ -301,6 +303,7 @@
return (MgByteReader*)cmd.GetReturnValue().val.m_obj;
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// Creates or updates a feature schema within the specified feature source.
@@ -317,7 +320,6 @@
void MgProxyFeatureService::ApplySchema(MgResourceIdentifier* resource, MgFeatureSchema* schema)
{
MgCommand cmd;
-
cmd.ExecuteCommand(m_connProp, // Connection
MgCommand::knVoid, // Return type expected
MgFeatureServiceOpId::ApplySchema_Id, // Command Code
@@ -331,6 +333,7 @@
SetWarning(cmd.GetWarningObject());
}
+
///////////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the definitions of one or more schemas contained in the
@@ -338,10 +341,10 @@
/// a class name does not exist, this method will throw an exception.
///
MgFeatureSchemaCollection* MgProxyFeatureService::DescribeSchema(MgResourceIdentifier* resource,
- CREFSTRING schemaName, MgStringCollection* classNames)
+ CREFSTRING schemaName,
+ MgStringCollection* classNames)
{
MgCommand cmd;
-
cmd.ExecuteCommand(m_connProp, // Connection
MgCommand::knObject, // Return type expected
MgFeatureServiceOpId::DescribeSchema_Id, // Command Code
@@ -358,15 +361,17 @@
return (MgFeatureSchemaCollection*)cmd.GetReturnValue().val.m_obj;
}
+
///////////////////////////////////////////////////////////////////////////////
/// This method has been deprecated. Use the above method.
///
MgFeatureSchemaCollection* MgProxyFeatureService::DescribeSchema(MgResourceIdentifier* resource,
- CREFSTRING schemaName)
+ CREFSTRING schemaName)
{
return DescribeSchema(resource, schemaName, NULL);
}
+
///////////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the definitions in XML format of one or more schemas contained in the
@@ -374,10 +379,10 @@
/// a class name does not exist, this method will throw an exception.
///
STRING MgProxyFeatureService::DescribeSchemaAsXml(MgResourceIdentifier* resource,
- CREFSTRING schemaName, MgStringCollection* classNames)
+ CREFSTRING schemaName,
+ MgStringCollection* classNames)
{
MgCommand cmd;
-
cmd.ExecuteCommand(m_connProp, // Connection
MgCommand::knString, // Return type expected
MgFeatureServiceOpId::DescribeSchemaAsXml_Id,// Command Code
@@ -397,15 +402,17 @@
return retVal;
}
+
///////////////////////////////////////////////////////////////////////////////
/// This method has been deprecated. Use the above method.
///
STRING MgProxyFeatureService::DescribeSchemaAsXml(MgResourceIdentifier* resource,
- CREFSTRING schemaName)
+ CREFSTRING schemaName)
{
return DescribeSchemaAsXml(resource, schemaName, NULL);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method returns the Fdo schema information in XML format
@@ -508,9 +515,9 @@
/// filter text.
/// 2. Interrogation of class definition would allow to determine properties of classes
/// which can be used for filter text.
-MgFeatureReader* MgProxyFeatureService::SelectFeatures(MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options)
+MgFeatureReader* MgProxyFeatureService::SelectFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options)
{
MgCommand cmd;
cmd.ExecuteCommand(m_connProp, // Connection
@@ -572,10 +579,10 @@
/// filter text.
/// 2. Interrogation of class definition would allow to determine properties of classes
/// which can be used for filter text.
-MgFeatureReader* MgProxyFeatureService::SelectFeatures(MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options,
- CREFSTRING coordinateSystem)
+MgFeatureReader* MgProxyFeatureService::SelectFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options,
+ CREFSTRING coordinateSystem)
{
throw new MgNotImplementedException(
L"MgProxyFeatureService::SelectFeatures",
@@ -609,7 +616,7 @@
/// </param>
/// <returns>
/// MgDataReader pointer which operates on the instance of actual reader returned from the
-/// FdoProvider ( OR NULL ).
+/// FdoProvider (OR NULL).
/// </returns>
/// EXCEPTIONS:
/// MgFeatureSourceException
@@ -712,6 +719,7 @@
return SAFE_ADDREF((MgPropertyCollection*)propCol);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// It executes all the commands specified in command collection
@@ -782,6 +790,7 @@
return SAFE_ADDREF((MgPropertyCollection*)propCol);
}
+
////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Gets the locked features
@@ -806,9 +815,9 @@
/// EXCEPTIONS:
/// MgFeatureServiceException
/// MgInvalidArgumentException
-MgFeatureReader* MgProxyFeatureService::GetLockedFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options )
+MgFeatureReader* MgProxyFeatureService::GetLockedFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options)
{
throw new MgNotImplementedException(
L"MgProxyFeatureService::GetLockedFeatures",
@@ -817,6 +826,7 @@
return NULL; // to make some compiler happy
}
+
////////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Starts a transaction on the specified feature source
@@ -837,7 +847,7 @@
/// MgInvalidArgumentException
/// MgInvalidOperationException
/// MgFdoException
-MgTransaction* MgProxyFeatureService::BeginTransaction( MgResourceIdentifier* resource )
+MgTransaction* MgProxyFeatureService::BeginTransaction(MgResourceIdentifier* resource)
{
MgCommand cmd;
cmd.ExecuteCommand(m_connProp, // Connection
@@ -858,6 +868,7 @@
return SAFE_ADDREF((MgProxyFeatureTransaction*)featTransaction);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes the SELECT SQL statement specified and returns a pointer to
@@ -910,6 +921,7 @@
return SAFE_ADDREF((MgProxySqlDataReader*)sqlReader);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes the SELECT SQL statement specified within a given transaction
@@ -948,7 +960,7 @@
MgSqlDataReader* MgProxyFeatureService::ExecuteSqlQuery(MgResourceIdentifier* resource,
CREFSTRING sqlStatement,
MgParameterCollection* params,
- MgTransaction* transaction )
+ MgTransaction* transaction)
{
STRING transactionId = L"";
MgProxyFeatureTransaction* proxyTransaction = dynamic_cast<MgProxyFeatureTransaction*>(transaction);
@@ -979,6 +991,7 @@
return SAFE_ADDREF((MgProxySqlDataReader*)sqlReader);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes the SELECT SQL statement specified within a given transaction
@@ -1067,6 +1080,7 @@
return SAFE_ADDREF((MgProxySqlDataReader*)sqlReader);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes all SQL statements supported by providers except SELECT.
@@ -1105,6 +1119,7 @@
return cmd.GetReturnValue().val.m_i32;
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes all SQL statements supported by providers except SELECT
@@ -1263,7 +1278,8 @@
/// MgInvalidResourceIdentifer
/// NOTE:
/// Subject to change in FDO R2
-MgLongTransactionReader* MgProxyFeatureService::GetLongTransactions(MgResourceIdentifier* resource, bool bActiveOnly)
+MgLongTransactionReader* MgProxyFeatureService::GetLongTransactions(MgResourceIdentifier* resource,
+ bool bActiveOnly)
{
MgCommand cmd;
cmd.ExecuteCommand(m_connProp, // Connection
@@ -1304,8 +1320,8 @@
/// MgNullArgumentException
/// MgInvalidResourceTypeException
/// MgSessionNotFoundException
-bool MgProxyFeatureService::SetLongTransaction( MgResourceIdentifier* featureSourceId,
- CREFSTRING longTransactionName)
+bool MgProxyFeatureService::SetLongTransaction(MgResourceIdentifier* featureSourceId,
+ CREFSTRING longTransactionName)
{
MgCommand cmd;
cmd.ExecuteCommand(m_connProp, // Connection
@@ -1345,6 +1361,7 @@
return (MgByteReader*)cmd.GetReturnValue().val.m_obj;
}
+
//////////////////////////////////////////////////////////////////
// Retrieves WFS schema information for the specified feature classes with specified format
MgByteReader* MgProxyFeatureService::DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
@@ -1368,6 +1385,7 @@
return (MgByteReader*)cmd.GetReturnValue().val.m_obj;
}
+
//////////////////////////////////////////////////////////////////
// Retrieves feature information in WFS format, based on the specified criteria
MgByteReader* MgProxyFeatureService::GetWfsFeature(MgResourceIdentifier* featureSourceId,
@@ -1397,6 +1415,7 @@
return (MgByteReader*)cmd.GetReturnValue().val.m_obj;
}
+
//////////////////////////////////////////////////////////////////
// Retrieves feature information in with specified WFS format, based on the specified criteria
MgByteReader* MgProxyFeatureService::GetWfsFeature(MgResourceIdentifier* featureSourceId,
@@ -1436,6 +1455,7 @@
return (MgByteReader*)cmd.GetReturnValue().val.m_obj;
}
+
//////////////////////////////////////////////////////////////////
MgBatchPropertyCollection* MgProxyFeatureService::GetFeatures(CREFSTRING featureReader)
{
@@ -1656,8 +1676,8 @@
// Returns the collection of identity properties for the specified class.
// If schemaName is empty, then className needs to be fully qualified.
MgClassDefinitionCollection* MgProxyFeatureService::GetIdentityProperties(MgResourceIdentifier* resource,
- CREFSTRING schemaName,
- MgStringCollection* classNames)
+ CREFSTRING schemaName,
+ MgStringCollection* classNames)
{
MgCommand cmd;
cmd.ExecuteCommand(m_connProp, // Connection
@@ -1695,6 +1715,7 @@
return (MgByteReader*)cmd.GetReturnValue().val.m_obj;
}
+
MgByteReader* MgProxyFeatureService::GetSchemaMapping(CREFSTRING providerName,
CREFSTRING partialConnString)
{
@@ -1714,6 +1735,7 @@
return (MgByteReader*)cmd.GetReturnValue().val.m_obj;
}
+
//////////////////////////////////////////////////////////////////
/// \brief
/// Sets the connection properties for the Proxy Service. This
@@ -1727,6 +1749,7 @@
m_connProp = SAFE_ADDREF(connProp);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// Get the FDO cache information.
@@ -1753,6 +1776,7 @@
return retVal;
}
+
//////////////////////////////////////////////////////////////////
MgClassDefinition* MgProxyFeatureService::GetClassDefinition(MgResourceIdentifier* resource,
CREFSTRING schemaName,
@@ -1777,6 +1801,8 @@
return (MgClassDefinition*)cmd.GetReturnValue().val.m_obj;
}
+
+//////////////////////////////////////////////////////////////////
bool MgProxyFeatureService::CommitTransaction(CREFSTRING transactionId)
{
MgCommand cmd;
@@ -1794,6 +1820,8 @@
return (bool)cmd.GetReturnValue().val.m_i8;
}
+
+//////////////////////////////////////////////////////////////////
bool MgProxyFeatureService::RollbackTransaction(CREFSTRING transactionId)
{
MgCommand cmd;
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h 2010-10-05 06:28:43 UTC (rev 5245)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h 2010-10-05 15:46:37 UTC (rev 5246)
@@ -147,9 +147,9 @@
/// \return
/// String Collection or NULL if nothing is found
///
- MgStringCollection* GetConnectionPropertyValues( CREFSTRING providerName,
- CREFSTRING propertyName,
- CREFSTRING partialConnString );
+ MgStringCollection* GetConnectionPropertyValues(CREFSTRING providerName,
+ CREFSTRING propertyName,
+ CREFSTRING partialConnString);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -252,7 +252,7 @@
///
/// \exception MgInvalidResourceIdentifier
///
- MgStringCollection* GetSchemas( MgResourceIdentifier* resource );
+ MgStringCollection* GetSchemas(MgResourceIdentifier* resource);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -271,7 +271,7 @@
///
/// \exception MgInvalidResourceIdentifier
///
- MgStringCollection* GetClasses( MgResourceIdentifier* resource, CREFSTRING schemaName );
+ MgStringCollection* GetClasses(MgResourceIdentifier* resource, CREFSTRING schemaName);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -292,9 +292,9 @@
///
/// \exception MgInvalidResourceIdentifier
///
- MgClassDefinition* GetClassDefinition( MgResourceIdentifier* resource,
- CREFSTRING schemaName,
- CREFSTRING className);
+ MgClassDefinition* GetClassDefinition(MgResourceIdentifier* resource,
+ CREFSTRING schemaName,
+ CREFSTRING className);
/////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -370,13 +370,14 @@
/// schema and classes.
///
MgFeatureSchemaCollection* DescribeSchema(MgResourceIdentifier* resource,
- CREFSTRING schemaName, MgStringCollection* classNames);
+ CREFSTRING schemaName,
+ MgStringCollection* classNames);
///////////////////////////////////////////////////////////////////////////
/// This method has been deprecated. Use the above method.
///
MgFeatureSchemaCollection* DescribeSchema(MgResourceIdentifier* resource,
- CREFSTRING schemaName);
+ CREFSTRING schemaName);
///////////////////////////////////////////////////////////////////////////
/// \brief
@@ -427,13 +428,14 @@
/// \exception MgFdoException
///
STRING DescribeSchemaAsXml(MgResourceIdentifier* resource,
- CREFSTRING schemaName, MgStringCollection* classNames);
+ CREFSTRING schemaName,
+ MgStringCollection* classNames);
///////////////////////////////////////////////////////////////////////////
/// This method has been deprecated. Use the above method.
///
STRING DescribeSchemaAsXml(MgResourceIdentifier* resource,
- CREFSTRING schemaName);
+ CREFSTRING schemaName);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -503,9 +505,9 @@
/// 2. Interrogation of class definition would allow to determine properties of classes
/// which can be used for filter text.
///
- MgFeatureReader* SelectFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options );
+ MgFeatureReader* SelectFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options);
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -550,10 +552,10 @@
/// \exception MgInvalidArgumentException
/// \exception MgFdoException
///
- virtual MgFeatureReader* SelectFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options,
- CREFSTRING coordinateSystem );
+ virtual MgFeatureReader* SelectFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options,
+ CREFSTRING coordinateSystem);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -580,7 +582,7 @@
///
/// \return
/// MgDataReader pointer which operates on the instance of actual reader returned from the
- /// FdoProvider ( OR NULL ).
+ /// FdoProvider (OR NULL).
///
/// \exception MgFeatureServiceException
/// \exception MgInvalidArgumentException
@@ -598,9 +600,9 @@
/// 4. Interrogation of class definition would allow to determine properties of classes
/// which can be used for filter text.
///
- MgDataReader* SelectAggregate( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureAggregateOptions* options );
+ MgDataReader* SelectAggregate(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureAggregateOptions* options);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -624,9 +626,9 @@
///
/// \exception MgInvalidResourceIdentifier
///
- MgPropertyCollection* UpdateFeatures( MgResourceIdentifier* resource,
- MgFeatureCommandCollection* commands,
- bool useTransaction );
+ MgPropertyCollection* UpdateFeatures(MgResourceIdentifier* resource,
+ MgFeatureCommandCollection* commands,
+ bool useTransaction);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -653,9 +655,9 @@
/// Index of commandCollection and index of IntCollection would match the result.
///
/// \exception MgInvalidResourceIdentifier
- MgPropertyCollection* UpdateFeatures( MgResourceIdentifier* resource,
- MgFeatureCommandCollection* commands,
- MgTransaction* transaction );
+ MgPropertyCollection* UpdateFeatures(MgResourceIdentifier* resource,
+ MgFeatureCommandCollection* commands,
+ MgTransaction* transaction);
////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -692,9 +694,9 @@
/// \exception MgInvalidArgumentException
/// \exception ...
///
- virtual MgFeatureReader* GetLockedFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options );
+ virtual MgFeatureReader* GetLockedFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options);
////////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
@@ -716,7 +718,7 @@
/// MgInvalidArgumentException
/// MgInvalidOperationException
/// MgFdoException
- MgTransaction* BeginTransaction( MgResourceIdentifier* resource );
+ MgTransaction* BeginTransaction(MgResourceIdentifier* resource);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -746,8 +748,8 @@
/// \exception MgInvalidSqlStatement
/// \exception MgSqlNotSupported
///
- MgSqlDataReader* ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement );
+ MgSqlDataReader* ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -783,10 +785,10 @@
/// \exception MgInvalidSqlStatement
/// \exception MgSqlNotSupported
///
- MgSqlDataReader* ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement,
- MgParameterCollection* params,
- MgTransaction* transaction );
+ MgSqlDataReader* ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement,
+ MgParameterCollection* params,
+ MgTransaction* transaction);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -826,11 +828,11 @@
/// \exception MgInvalidSqlStatement
/// \exception MgSqlNotSupported
///
- MgSqlDataReader* ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement,
- MgParameterCollection* params,
- MgTransaction* transaction,
- INT32 fetchSize);
+ MgSqlDataReader* ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement,
+ MgParameterCollection* params,
+ MgTransaction* transaction,
+ INT32 fetchSize);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -853,8 +855,8 @@
///
/// \exception MgInvalidResourceIdentifier
///
- INT32 ExecuteSqlNonQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlNonSelectStatement );
+ INT32 ExecuteSqlNonQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlNonSelectStatement);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -883,10 +885,10 @@
///
/// \exception MgInvalidResourceIdentifier
///
- INT32 ExecuteSqlNonQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlNonSelectStatement,
- MgParameterCollection* params,
- MgTransaction* transaction );
+ INT32 ExecuteSqlNonQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlNonSelectStatement,
+ MgParameterCollection* params,
+ MgTransaction* transaction);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -926,8 +928,8 @@
/// \note
/// Subject to change in FDO R2
///
- MgSpatialContextReader* GetSpatialContexts( MgResourceIdentifier* resource,
- bool bActiveOnly);
+ MgSpatialContextReader* GetSpatialContexts(MgResourceIdentifier* resource,
+ bool bActiveOnly);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -965,8 +967,8 @@
/// \note
/// Subject to change in FDO R2
///
- MgLongTransactionReader* GetLongTransactions( MgResourceIdentifier* resource,
- bool bActiveOnly);
+ MgLongTransactionReader* GetLongTransactions(MgResourceIdentifier* resource,
+ bool bActiveOnly);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -989,8 +991,8 @@
/// \exception MgInvalidResourceTypeException
/// \exception MgSessionNotFoundException
///
- bool SetLongTransaction( MgResourceIdentifier* featureSourceId,
- CREFSTRING longTransactionName);
+ bool SetLongTransaction(MgResourceIdentifier* featureSourceId,
+ CREFSTRING longTransactionName);
/////////////////////////////////////////////////////////////////
/// \brief
@@ -1026,7 +1028,8 @@
/// \return
/// Returns an MgByteReader containing the XML schema.
///
- MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId, MgStringCollection* featureClasses);
+ MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
+ MgStringCollection* featureClasses);
////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1060,7 +1063,9 @@
/// \return
/// Returns an MgByteReader containing the XML schema.
///
- virtual MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId, MgStringCollection* featureClasses,CREFSTRING outputFormat);
+ virtual MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
+ MgStringCollection* featureClasses,
+ CREFSTRING outputFormat);
////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1097,8 +1102,12 @@
/// \return
/// Returns an MgByteReader containing the requested feature information.
///
- MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId, CREFSTRING featureClass,
- MgStringCollection* requiredProperties, CREFSTRING srs, CREFSTRING filter, INT32 maxFeatures);
+ MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId,
+ CREFSTRING featureClass,
+ MgStringCollection* requiredProperties,
+ CREFSTRING srs,
+ CREFSTRING filter,
+ INT32 maxFeatures);
////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1151,8 +1160,17 @@
///
/// \exception MgInvalidArgumentException
///
- MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId, CREFSTRING featureClass,
- MgStringCollection* requiredProperties, CREFSTRING srs, CREFSTRING filter, INT32 maxFeatures,CREFSTRING wfsVersion, CREFSTRING outputFormat, CREFSTRING sortCriteria, CREFSTRING namespacePrefix, CREFSTRING namespaceUrl);
+ MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId,
+ CREFSTRING featureClass,
+ MgStringCollection* requiredProperties,
+ CREFSTRING srs,
+ CREFSTRING filter,
+ INT32 maxFeatures,
+ CREFSTRING wfsVersion,
+ CREFSTRING outputFormat,
+ CREFSTRING sortCriteria,
+ CREFSTRING namespacePrefix,
+ CREFSTRING namespaceUrl);
////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1256,10 +1274,10 @@
///
/// \exception MgInvalidResourceIdentifier
///
- MgClassDefinition* GetClassDefinition( MgResourceIdentifier* resource,
- CREFSTRING schemaName,
- CREFSTRING className,
- bool serialize);
+ MgClassDefinition* GetClassDefinition(MgResourceIdentifier* resource,
+ CREFSTRING schemaName,
+ CREFSTRING className,
+ bool serialize);
// Commit the transaction specified by the transaction id.
bool CommitTransaction(CREFSTRING transactionId);
Modified: trunk/MgDev/Common/PlatformBase/Services/FeatureService.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/FeatureService.h 2010-10-05 06:28:43 UTC (rev 5245)
+++ trunk/MgDev/Common/PlatformBase/Services/FeatureService.h 2010-10-05 15:46:37 UTC (rev 5246)
@@ -203,9 +203,9 @@
/// \exception MgInvalidArgumentException
/// \exception MgFdoException
///
- virtual MgStringCollection* GetConnectionPropertyValues( CREFSTRING providerName,
- CREFSTRING propertyName,
- CREFSTRING partialConnString ) = 0;
+ virtual MgStringCollection* GetConnectionPropertyValues(CREFSTRING providerName,
+ CREFSTRING propertyName,
+ CREFSTRING partialConnString) = 0;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -461,7 +461,8 @@
/// schema and classes.
///
virtual MgFeatureSchemaCollection* DescribeSchema(MgResourceIdentifier* resource,
- CREFSTRING schemaName, MgStringCollection* classNames) = 0;
+ CREFSTRING schemaName,
+ MgStringCollection* classNames) = 0;
///////////////////////////////////////////////////////////////////////////
/// \brief
@@ -505,7 +506,7 @@
/// schema and classes.
///
virtual MgFeatureSchemaCollection* DescribeSchema(MgResourceIdentifier* resource,
- CREFSTRING schemaName) = 0;
+ CREFSTRING schemaName) = 0;
///////////////////////////////////////////////////////////////////////////
/// \brief
@@ -556,7 +557,8 @@
/// \exception MgFdoException
///
virtual STRING DescribeSchemaAsXml(MgResourceIdentifier* resource,
- CREFSTRING schemaName, MgStringCollection* classNames) = 0;
+ CREFSTRING schemaName,
+ MgStringCollection* classNames) = 0;
///////////////////////////////////////////////////////////////////////////
/// \brief
@@ -599,7 +601,7 @@
/// \exception MgFdoException
///
virtual STRING DescribeSchemaAsXml(MgResourceIdentifier* resource,
- CREFSTRING schemaName) = 0;
+ CREFSTRING schemaName) = 0;
////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -715,9 +717,9 @@
/// \exception MgInvalidArgumentException
/// \exception MgFdoException
///
- virtual MgFeatureReader* SelectFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options ) = 0;
+ virtual MgFeatureReader* SelectFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options) = 0;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -765,10 +767,10 @@
/// \exception MgInvalidArgumentException
/// \exception MgFdoException
///
- virtual MgFeatureReader* SelectFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options,
- CREFSTRING coordinateSystem ) = 0;
+ virtual MgFeatureReader* SelectFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options,
+ CREFSTRING coordinateSystem) = 0;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -811,9 +813,9 @@
/// \exception MgInvalidArgumentException
/// \exception MgFdoException
///
- virtual MgDataReader* SelectAggregate( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureAggregateOptions* options ) = 0;
+ virtual MgDataReader* SelectAggregate(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureAggregateOptions* options) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -878,9 +880,9 @@
/// \exception MgInvalidOperationException
/// \exception MgFdoException
///
- virtual MgPropertyCollection* UpdateFeatures( MgResourceIdentifier* resource,
- MgFeatureCommandCollection* commands,
- bool useTransaction ) = 0;
+ virtual MgPropertyCollection* UpdateFeatures(MgResourceIdentifier* resource,
+ MgFeatureCommandCollection* commands,
+ bool useTransaction) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -951,9 +953,9 @@
/// \exception MgInvalidOperationException
/// \exception MgFdoException
///
- virtual MgPropertyCollection* UpdateFeatures( MgResourceIdentifier* resource,
- MgFeatureCommandCollection* commands,
- MgTransaction* transaction ) = 0;
+ virtual MgPropertyCollection* UpdateFeatures(MgResourceIdentifier* resource,
+ MgFeatureCommandCollection* commands,
+ MgTransaction* transaction) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -990,9 +992,9 @@
/// \exception MgInvalidArgumentException
/// \exception ...
///
- virtual MgFeatureReader* GetLockedFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options ) = 0;
+ virtual MgFeatureReader* GetLockedFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1023,7 +1025,7 @@
/// \exception MgInvalidOperationException
/// \exception MgFdoException
///
- virtual MgTransaction* BeginTransaction( MgResourceIdentifier* resource ) = 0;
+ virtual MgTransaction* BeginTransaction(MgResourceIdentifier* resource) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1071,8 +1073,8 @@
/// \exception MgInvalidOperationException
/// \exception MgFdoException
///
- virtual MgSqlDataReader* ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement ) = 0;
+ virtual MgSqlDataReader* ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1131,10 +1133,10 @@
/// \exception MgInvalidOperationException
/// \exception MgFdoException
///
- virtual MgSqlDataReader* ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement,
- MgParameterCollection* parameters,
- MgTransaction* transaction ) = 0;
+ virtual MgSqlDataReader* ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement,
+ MgParameterCollection* parameters,
+ MgTransaction* transaction) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1179,8 +1181,8 @@
/// \exception MgInvalidOperationException
/// \exception MgFdoException
///
- virtual INT32 ExecuteSqlNonQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlNonSelectStatement ) = 0;
+ virtual INT32 ExecuteSqlNonQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlNonSelectStatement) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1237,10 +1239,10 @@
/// \exception MgInvalidOperationException
/// \exception MgFdoException
///
- virtual INT32 ExecuteSqlNonQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlNonSelectStatement,
- MgParameterCollection* parameters,
- MgTransaction* transaction ) = 0;
+ virtual INT32 ExecuteSqlNonQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlNonSelectStatement,
+ MgParameterCollection* parameters,
+ MgTransaction* transaction) = 0;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1277,8 +1279,8 @@
/// \exception MgInvalidOperationException
/// \exception MgFdoException
///
- virtual MgSpatialContextReader* GetSpatialContexts( MgResourceIdentifier* resource,
- bool bActiveOnly) = 0;
+ virtual MgSpatialContextReader* GetSpatialContexts(MgResourceIdentifier* resource,
+ bool bActiveOnly) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1315,8 +1317,8 @@
/// \exception MgInvalidOperationException
/// \exception MgFdoException
///
- virtual MgLongTransactionReader* GetLongTransactions( MgResourceIdentifier* resource,
- bool bActiveOnly) = 0;
+ virtual MgLongTransactionReader* GetLongTransactions(MgResourceIdentifier* resource,
+ bool bActiveOnly) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1352,8 +1354,8 @@
/// \exception MgInvalidResourceTypeException
/// \exception MgSessionNotFoundException
///
- virtual bool SetLongTransaction( MgResourceIdentifier* featureSourceId,
- CREFSTRING longTransactionName) = 0;
+ virtual bool SetLongTransaction(MgResourceIdentifier* featureSourceId,
+ CREFSTRING longTransactionName) = 0;
/////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1383,7 +1385,7 @@
/// \exception MgInvalidArgumentException
/// \exception MgFdoException
///
- virtual MgStringCollection* GetSchemas( MgResourceIdentifier* resource ) = 0;
+ virtual MgStringCollection* GetSchemas(MgResourceIdentifier* resource) = 0;
/////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1416,7 +1418,7 @@
/// \exception MgInvalidArgumentException
/// \exception MgFdoException
///
- virtual MgStringCollection* GetClasses( MgResourceIdentifier* resource, CREFSTRING schemaName ) = 0;
+ virtual MgStringCollection* GetClasses(MgResourceIdentifier* resource, CREFSTRING schemaName) = 0;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1449,9 +1451,9 @@
/// \exception MgInvalidArgumentException
/// \exception MgFdoException
///
- virtual MgClassDefinition* GetClassDefinition( MgResourceIdentifier* resource,
- CREFSTRING schemaName,
- CREFSTRING className) = 0;
+ virtual MgClassDefinition* GetClassDefinition(MgResourceIdentifier* resource,
+ CREFSTRING schemaName,
+ CREFSTRING className) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1524,7 +1526,8 @@
/// \return
/// Returns an MgByteReader containing the XML schema.
///
- virtual MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId, MgStringCollection* featureClasses) = 0;
+ virtual MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
+ MgStringCollection* featureClasses) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1560,7 +1563,9 @@
/// \return
/// Returns an MgByteReader containing the XML schema.
///
- virtual MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId, MgStringCollection* featureClasses,CREFSTRING outputFormat) = 0;
+ virtual MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
+ MgStringCollection* featureClasses,
+ CREFSTRING outputFormat) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1599,8 +1604,12 @@
/// \return
/// Returns an MgByteReader containing the requested feature information.
///
- virtual MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId, CREFSTRING featureClass,
- MgStringCollection* requiredProperties, CREFSTRING srs, CREFSTRING filter, INT32 maxFeatures) = 0;
+ virtual MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId,
+ CREFSTRING featureClass,
+ MgStringCollection* requiredProperties,
+ CREFSTRING srs,
+ CREFSTRING filter,
+ INT32 maxFeatures) = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1654,8 +1663,17 @@
///
/// \exception MgInvalidArgumentException
///
- virtual MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId, CREFSTRING featureClass,
- MgStringCollection* requiredProperties, CREFSTRING srs, CREFSTRING filter, INT32 maxFeatures,CREFSTRING wfsVersion, CREFSTRING outputFormat, CREFSTRING sortCriteria, CREFSTRING namespacePrefix, CREFSTRING namespaceUrl) = 0;
+ virtual MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId,
+ CREFSTRING featureClass,
+ MgStringCollection* requiredProperties,
+ CREFSTRING srs,
+ CREFSTRING filter,
+ INT32 maxFeatures,
+ CREFSTRING wfsVersion,
+ CREFSTRING outputFormat,
+ CREFSTRING sortCriteria,
+ CREFSTRING namespacePrefix,
+ CREFSTRING namespaceUrl) = 0;
////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -1727,10 +1745,10 @@
virtual STRING GetFdoCacheInfo() = 0;
- virtual MgClassDefinition* GetClassDefinition( MgResourceIdentifier* resource,
- CREFSTRING schemaName,
- CREFSTRING className,
- bool serialize) = 0;
+ virtual MgClassDefinition* GetClassDefinition(MgResourceIdentifier* resource,
+ CREFSTRING schemaName,
+ CREFSTRING className,
+ bool serialize) = 0;
// Commit the transaction specified by the transaction id.
virtual bool CommitTransaction(CREFSTRING transactionId) = 0;
@@ -1803,11 +1821,11 @@
/// \exception MgInvalidOperationException
/// \exception MgFdoException
///
- virtual MgSqlDataReader* ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement,
- MgParameterCollection* parameters,
- MgTransaction* transaction,
- INT32 fetchSize ) = 0;
+ virtual MgSqlDataReader* ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement,
+ MgParameterCollection* parameters,
+ MgTransaction* transaction,
+ INT32 fetchSize) = 0;
protected:
Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp 2010-10-05 06:28:43 UTC (rev 5245)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp 2010-10-05 15:46:37 UTC (rev 5246)
@@ -64,6 +64,7 @@
{
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// Destructor
@@ -171,9 +172,9 @@
/// <returns>
/// String Collection or NULL if nothing is found
/// </returns>
-MgStringCollection* MgServerFeatureService::GetConnectionPropertyValues( CREFSTRING providerName,
- CREFSTRING propertyName,
- CREFSTRING partialConnString )
+MgStringCollection* MgServerFeatureService::GetConnectionPropertyValues(CREFSTRING providerName,
+ CREFSTRING propertyName,
+ CREFSTRING partialConnString)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::GetConnectionPropertyValues()");
@@ -219,7 +220,7 @@
/// <returns>
/// True if connection was successful
/// </returns>
-bool MgServerFeatureService::TestConnection( MgResourceIdentifier* resource )
+bool MgServerFeatureService::TestConnection(MgResourceIdentifier* resource)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::TestConnection()");
@@ -261,7 +262,7 @@
/// MgInvalidResourceIdentifer
/// NOTE:
/// Subject to change with FDO R2
-MgByteReader* MgServerFeatureService::GetCapabilities( CREFSTRING providerName )
+MgByteReader* MgServerFeatureService::GetCapabilities(CREFSTRING providerName)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::GetCapabilities()");
@@ -277,7 +278,9 @@
return msgpc.GetProviderCapabilities();
}
-MgByteReader* MgServerFeatureService::GetCapabilities( CREFSTRING providerName, CREFSTRING connectionString )
+
+///////////////////////////////////////////////////////////////////////////
+MgByteReader* MgServerFeatureService::GetCapabilities(CREFSTRING providerName, CREFSTRING connectionString)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::GetCapabilities()");
@@ -285,7 +288,8 @@
return msgpc.GetProviderCapabilities();
}
-/////////////////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////
/// \brief
/// Creates or updates a feature schema within the specified feature source.
///
@@ -297,6 +301,7 @@
msas.ApplySchema(resource, schema);
}
+
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the definitions of one or more schemas contained in the
@@ -304,7 +309,8 @@
/// a class name does not exist, this method will throw an exception.
///
MgFeatureSchemaCollection* MgServerFeatureService::DescribeSchema(MgResourceIdentifier* resource,
- CREFSTRING schemaName, MgStringCollection* classNames)
+ CREFSTRING schemaName,
+ MgStringCollection* classNames)
{
Ptr<MgFeatureSchemaCollection> schemas;
@@ -330,15 +336,17 @@
return schemas.Detach();
}
+
///////////////////////////////////////////////////////////////////////////////
/// This method has been deprecated. Use the above method.
///
MgFeatureSchemaCollection* MgServerFeatureService::DescribeSchema(MgResourceIdentifier* resource,
- CREFSTRING schemaName)
+ CREFSTRING schemaName)
{
return DescribeSchema(resource, schemaName, NULL);
}
+
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the definitions in XML format of one or more schemas contained in the
@@ -346,7 +354,8 @@
/// a class name does not exist, this method will throw an exception.
///
STRING MgServerFeatureService::DescribeSchemaAsXml(MgResourceIdentifier* resource,
- CREFSTRING schemaName, MgStringCollection* classNames)
+ CREFSTRING schemaName,
+ MgStringCollection* classNames)
{
STRING schemaXml;
@@ -372,15 +381,17 @@
return schemaXml;
}
+
///////////////////////////////////////////////////////////////////////////////
/// This method has been deprecated. Use the above method.
///
STRING MgServerFeatureService::DescribeSchemaAsXml(MgResourceIdentifier* resource,
- CREFSTRING schemaName)
+ CREFSTRING schemaName)
{
return DescribeSchemaAsXml(resource, schemaName, NULL);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// Select features returns feature information from an Fdo Provider. An MgFeatureReader
@@ -414,9 +425,9 @@
/// filter text.
/// 2. Interrogation of class definition would allow to determine properties of classes
/// which can be used for filter text.
-MgFeatureReader* MgServerFeatureService::SelectFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options )
+MgFeatureReader* MgServerFeatureService::SelectFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::SelectFeatures()");
@@ -482,10 +493,10 @@
/// filter text.
/// 2. Interrogation of class definition would allow to determine properties of classes
/// which can be used for filter text.
-MgFeatureReader* MgServerFeatureService::SelectFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options,
- CREFSTRING coordinateSystem )
+MgFeatureReader* MgServerFeatureService::SelectFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options,
+ CREFSTRING coordinateSystem)
{
throw new MgNotImplementedException(
L"MgServerFeatureService::SelectFeatures",
@@ -534,9 +545,9 @@
/// 3. Interrogation of provider capabilities will inform list of operations supported
/// 4. Interrogation of class definition would allow to determine properties of classes
/// which can be used for filter text.
-MgDataReader* MgServerFeatureService::SelectAggregate( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureAggregateOptions* options )
+MgDataReader* MgServerFeatureService::SelectAggregate(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureAggregateOptions* options)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::SelectAggregate()");
@@ -574,9 +585,9 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
-MgPropertyCollection* MgServerFeatureService::UpdateFeatures( MgResourceIdentifier* resource,
- MgFeatureCommandCollection* commands,
- bool useTransaction )
+MgPropertyCollection* MgServerFeatureService::UpdateFeatures(MgResourceIdentifier* resource,
+ MgFeatureCommandCollection* commands,
+ bool useTransaction)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::UpdateFeatures()");
@@ -584,6 +595,7 @@
return asuf.Execute(resource, commands, useTransaction);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// It executes all the commands specified in command collection
@@ -606,9 +618,9 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
-MgPropertyCollection* MgServerFeatureService::UpdateFeatures( MgResourceIdentifier* resource,
- MgFeatureCommandCollection* commands,
- MgTransaction* transaction )
+MgPropertyCollection* MgServerFeatureService::UpdateFeatures(MgResourceIdentifier* resource,
+ MgFeatureCommandCollection* commands,
+ MgTransaction* transaction)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::UpdateFeatures()");
@@ -616,6 +628,7 @@
return asuf.Execute(resource, commands, transaction);
}
+
////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Gets the locked features
@@ -640,9 +653,9 @@
/// EXCEPTIONS:
/// MgFeatureServiceException
/// MgInvalidArgumentException
-MgFeatureReader* MgServerFeatureService::GetLockedFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options )
+MgFeatureReader* MgServerFeatureService::GetLockedFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options)
{
throw new MgNotImplementedException(
L"MgServerFeatureService::GetLockedFeatures",
@@ -651,6 +664,7 @@
return NULL; // to make some compiler happy
}
+
////////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Starts a transaction on the specified feature source
@@ -671,7 +685,7 @@
/// MgInvalidArgumentException
/// MgInvalidOperationException
/// MgFdoException
-MgTransaction* MgServerFeatureService::BeginTransaction( MgResourceIdentifier* resource )
+MgTransaction* MgServerFeatureService::BeginTransaction(MgResourceIdentifier* resource)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::BeginTransaction()");
@@ -689,6 +703,7 @@
return transaction.Detach();
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes the SELECT SQL statement specified and returns a pointer to
@@ -718,8 +733,8 @@
/// MgInvalidResourceIdentifer
/// MgInvalidSqlStatement
/// MgSqlNotSupported
-MgSqlDataReader* MgServerFeatureService::ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement )
+MgSqlDataReader* MgServerFeatureService::ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::ExecuteSqlQuery()");
@@ -727,6 +742,7 @@
return sqlCommand.ExecuteQuery(resource, sqlStatement, NULL, NULL);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes the SELECT SQL statement specified within a given transaction
@@ -762,10 +778,10 @@
/// MgInvalidResourceIdentifer
/// MgInvalidSqlStatement
/// MgSqlNotSupported
-MgSqlDataReader* MgServerFeatureService::ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement,
- MgParameterCollection* params,
- MgTransaction* transaction )
+MgSqlDataReader* MgServerFeatureService::ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement,
+ MgParameterCollection* params,
+ MgTransaction* transaction)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::ExecuteSqlQuery()");
@@ -773,6 +789,7 @@
return sqlCommand.ExecuteQuery(resource, sqlStatement, params, transaction);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes the SELECT SQL statement specified within a given transaction
@@ -812,18 +829,19 @@
/// MgInvalidResourceIdentifer
/// MgInvalidSqlStatement
/// MgSqlNotSupported
-MgSqlDataReader* MgServerFeatureService::ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement,
- MgParameterCollection* params,
- MgTransaction* transaction,
- INT32 fetchSize )
+MgSqlDataReader* MgServerFeatureService::ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement,
+ MgParameterCollection* params,
+ MgTransaction* transaction,
+ INT32 fetchSize)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::ExecuteSqlQuery()");
MgServerSqlCommand sqlCommand;
- return sqlCommand.ExecuteQuery(resource, sqlStatement, params, transaction, fetchSize );
+ return sqlCommand.ExecuteQuery(resource, sqlStatement, params, transaction, fetchSize);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes all SQL statements supported by providers except SELECT.
@@ -843,8 +861,8 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
-INT32 MgServerFeatureService::ExecuteSqlNonQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlNonSelectStatement )
+INT32 MgServerFeatureService::ExecuteSqlNonQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlNonSelectStatement)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::ExecuteSqlNonQuery()");
@@ -852,6 +870,7 @@
return sqlCommand.ExecuteNonQuery(resource, sqlNonSelectStatement, NULL, NULL);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes all SQL statements supported by providers except SELECT
@@ -879,10 +898,10 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
-INT32 MgServerFeatureService::ExecuteSqlNonQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlNonSelectStatement,
- MgParameterCollection* params,
- MgTransaction* transaction )
+INT32 MgServerFeatureService::ExecuteSqlNonQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlNonSelectStatement,
+ MgParameterCollection* params,
+ MgTransaction* transaction)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::ExecuteSqlNonQuery()");
@@ -890,6 +909,7 @@
return sqlCommand.ExecuteNonQuery(resource, sqlNonSelectStatement, params, transaction);
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// This method executes the SELECT statement to return all available spatial context
@@ -925,7 +945,7 @@
/// MgInvalidResourceIdentifer
/// NOTE:
/// Subject to change in FDO R2
-MgSpatialContextReader* MgServerFeatureService::GetSpatialContexts( MgResourceIdentifier* resource,
+MgSpatialContextReader* MgServerFeatureService::GetSpatialContexts(MgResourceIdentifier* resource,
bool bActiveOnly)
{
Ptr<MgSpatialContextReader> reader;
@@ -985,7 +1005,8 @@
/// MgInvalidResourceIdentifer
/// NOTE:
/// Subject to change in FDO R2
-MgLongTransactionReader* MgServerFeatureService::GetLongTransactions(MgResourceIdentifier* resource, bool bActiveOnly)
+MgLongTransactionReader* MgServerFeatureService::GetLongTransactions(MgResourceIdentifier* resource,
+ bool bActiveOnly)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::GetLongTransactions()");
@@ -1015,8 +1036,8 @@
/// MgNullArgumentException
/// MgInvalidResourceTypeException
/// MgSessionNotFoundException
-bool MgServerFeatureService::SetLongTransaction( MgResourceIdentifier* featureSourceId,
- CREFSTRING longTransactionName)
+bool MgServerFeatureService::SetLongTransaction(MgResourceIdentifier* featureSourceId,
+ CREFSTRING longTransactionName)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::SetLongTransaction()");
@@ -1045,6 +1066,7 @@
}
+///////////////////////////////////////////////////////////////////////////
// Just a simple hashing algorithm
unsigned MgServerFeatureService::StringHasher(FdoString* pszString)
{
@@ -1063,6 +1085,7 @@
return uRet;
}
+
///////////////////////////////////////////////////////////////////////////////
/// \brief
/// Find a class definition from the specified schemas.
@@ -1130,6 +1153,7 @@
}
}
+
//////////////////////////////////////////////////////////////////
/// \brief
/// Retrieves schema information about a set of feature classes for a given feature source.
@@ -1157,7 +1181,8 @@
/// \return
/// Returns an MgByteReader containing the XML schema.
///
-MgByteReader* MgServerFeatureService::DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId, MgStringCollection* featureClasses)
+MgByteReader* MgServerFeatureService::DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
+ MgStringCollection* featureClasses)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::DescribeWfsFeatureType()");
@@ -1294,7 +1319,9 @@
/// \return
/// Returns an MgByteReader containing the XML schema.
///
-MgByteReader* MgServerFeatureService::DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId, MgStringCollection* featureClasses,CREFSTRING outputFormat)
+MgByteReader* MgServerFeatureService::DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
+ MgStringCollection* featureClasses,
+ CREFSTRING outputFormat)
{
throw new MgNotImplementedException(
L"MgServerFeatureService::DescribeWfsFeatureType",
@@ -1430,9 +1457,9 @@
//////////////////////////////////////////////////////////////////
-MgClassDefinition* MgServerFeatureService::GetClassDefinition( MgResourceIdentifier* resource,
- CREFSTRING schemaName,
- CREFSTRING className)
+MgClassDefinition* MgServerFeatureService::GetClassDefinition(MgResourceIdentifier* resource,
+ CREFSTRING schemaName,
+ CREFSTRING className)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::GetClassDefinition()");
@@ -1440,11 +1467,12 @@
return msds.GetClassDefinition(resource, schemaName, className, true);
}
+
//////////////////////////////////////////////////////////////////
-MgClassDefinition* MgServerFeatureService::GetClassDefinition( MgResourceIdentifier* resource,
- CREFSTRING schemaName,
- CREFSTRING className,
- bool serialize)
+MgClassDefinition* MgServerFeatureService::GetClassDefinition(MgResourceIdentifier* resource,
+ CREFSTRING schemaName,
+ CREFSTRING className,
+ bool serialize)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::GetClassDefinition()");
@@ -1684,8 +1712,8 @@
// Returns the collection of identity properties for the specified class.
// If schemaName is empty, then className needs to be fully qualified.
MgClassDefinitionCollection* MgServerFeatureService::GetIdentityProperties(MgResourceIdentifier* resource,
- CREFSTRING schemaName,
- MgStringCollection* classNames)
+ CREFSTRING schemaName,
+ MgStringCollection* classNames)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::GetIdentityProperties()");
@@ -1693,6 +1721,7 @@
return msds.GetIdentityProperties(resource, schemaName, classNames);
}
+
////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
/// Retrieves feature information based on the supplied criteria with specified format.
@@ -1745,16 +1774,16 @@
/// EXCEPTIONS:
/// MgInvalidArgumentException
MgByteReader* MgServerFeatureService::GetWfsFeature(MgResourceIdentifier* fs,
- CREFSTRING featureClass,
- MgStringCollection* propNames,
- CREFSTRING srs,
- CREFSTRING wfsFilter,
- INT32 maxFeatures,
- CREFSTRING wfsVersion,
- CREFSTRING outputFormat,
- CREFSTRING sortCriteria,
- CREFSTRING namespacePrefix,
- CREFSTRING namespaceUrl)
+ CREFSTRING featureClass,
+ MgStringCollection* propNames,
+ CREFSTRING srs,
+ CREFSTRING wfsFilter,
+ INT32 maxFeatures,
+ CREFSTRING wfsVersion,
+ CREFSTRING outputFormat,
+ CREFSTRING sortCriteria,
+ CREFSTRING namespacePrefix,
+ CREFSTRING namespaceUrl)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::GetWfsFeature()");
@@ -1940,8 +1969,6 @@
flags->SetDefaultNamespace(L"http://www.mynamespace.com/myns");
}
-
-
//create the FDO xml serializer stack and write out the features
FdoPtr<FdoXmlWriter> xmlWriter = FdoXmlWriter::Create(fileName.c_str(), false);
FdoPtr<FdoXmlFeaturePropertyWriter> propWriter = FdoXmlFeaturePropertyWriter::Create(xmlWriter,flags);
@@ -1973,11 +2000,11 @@
/// This method has been deprecated. Use the above method.
///
MgByteReader* MgServerFeatureService::GetWfsFeature(MgResourceIdentifier* fs,
- CREFSTRING featureClass,
- MgStringCollection* propNames,
- CREFSTRING srs,
- CREFSTRING wfsFilter,
- INT32 maxFeatures)
+ CREFSTRING featureClass,
+ MgStringCollection* propNames,
+ CREFSTRING srs,
+ CREFSTRING wfsFilter,
+ INT32 maxFeatures)
{
return GetWfsFeature(fs, featureClass, propNames, srs, wfsFilter, maxFeatures, L"1.0.0", L"text/xml; subtype=gml/2.1.2", L"", L"", L"");
}
@@ -2003,6 +2030,7 @@
return mseds.EnumerateDataStores(providerName, partialConnString);
}
+
////////////////////////////////////////////////////////////////////////////////
/// \brief
/// This method returns all of the logical to physical schema mappings for
@@ -2023,12 +2051,15 @@
return msgsm.GetSchemaMapping(providerName, partialConnString);
}
+
////////////////////////////////////////////////////////////////////////////////
void MgServerFeatureService::SetConnectionProperties(MgConnectionProperties*)
{
// Do nothing. No connection properties are required for Server-side service objects.
}
+
+///////////////////////////////////////////////////////////////////////////
bool MgServerFeatureService::CommitTransaction(CREFSTRING transactionId)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::CommitTransaction()");
@@ -2047,6 +2078,8 @@
return bResult;
}
+
+///////////////////////////////////////////////////////////////////////////
bool MgServerFeatureService::RollbackTransaction(CREFSTRING transactionId)
{
MG_LOG_TRACE_ENTRY(L"MgServerFeatureService::RollbackTransaction()");
@@ -2065,6 +2098,7 @@
return bResult;
}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// Gets the FDO cache information for the server
@@ -2087,6 +2121,7 @@
return info;
}
+
///////////////////////////////////////////////////////////////////////////////
/// \brief
/// Handle the Resource Change Notification event.
@@ -2131,6 +2166,7 @@
return success;
}
+
///////////////////////////////////////////////////////////////////////////////
/// \brief
/// Handle the Resource Change Notification event.
Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.h 2010-10-05 06:28:43 UTC (rev 5245)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.h 2010-10-05 15:46:37 UTC (rev 5246)
@@ -132,9 +132,9 @@
/// <returns>
/// String Collection or NULL if nothing is found
/// </returns>
- MgStringCollection* GetConnectionPropertyValues( CREFSTRING providerName,
- CREFSTRING propertyName,
- CREFSTRING partialConnString );
+ MgStringCollection* GetConnectionPropertyValues(CREFSTRING providerName,
+ CREFSTRING propertyName,
+ CREFSTRING partialConnString);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -227,7 +227,7 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
- MgStringCollection* GetSchemas( MgResourceIdentifier* resource );
+ MgStringCollection* GetSchemas(MgResourceIdentifier* resource);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -246,7 +246,7 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
- MgStringCollection* GetClasses( MgResourceIdentifier* resource, CREFSTRING schemaName );
+ MgStringCollection* GetClasses(MgResourceIdentifier* resource, CREFSTRING schemaName);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -267,9 +267,9 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
- MgClassDefinition* GetClassDefinition( MgResourceIdentifier* resource,
- CREFSTRING schemaName,
- CREFSTRING className);
+ MgClassDefinition* GetClassDefinition(MgResourceIdentifier* resource,
+ CREFSTRING schemaName,
+ CREFSTRING className);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -290,10 +290,10 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
- MgClassDefinition* GetClassDefinition( MgResourceIdentifier* resource,
- CREFSTRING schemaName,
- CREFSTRING className,
- bool serialize);
+ MgClassDefinition* GetClassDefinition(MgResourceIdentifier* resource,
+ CREFSTRING schemaName,
+ CREFSTRING className,
+ bool serialize);
/////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -308,13 +308,14 @@
/// a class name does not exist, this method will throw an exception.
///
MgFeatureSchemaCollection* DescribeSchema(MgResourceIdentifier* resource,
- CREFSTRING schemaName, MgStringCollection* classNames);
+ CREFSTRING schemaName,
+ MgStringCollection* classNames);
///////////////////////////////////////////////////////////////////////////
/// This method has been deprecated. Use the above method.
///
MgFeatureSchemaCollection* DescribeSchema(MgResourceIdentifier* resource,
- CREFSTRING schemaName);
+ CREFSTRING schemaName);
///////////////////////////////////////////////////////////////////////////
/// \brief
@@ -323,13 +324,14 @@
/// a class name does not exist, this method will throw an exception.
///
STRING DescribeSchemaAsXml(MgResourceIdentifier* resource,
- CREFSTRING schemaName, MgStringCollection* classNames);
+ CREFSTRING schemaName,
+ MgStringCollection* classNames);
///////////////////////////////////////////////////////////////////////////
/// This method has been deprecated. Use the above method.
///
STRING DescribeSchemaAsXml(MgResourceIdentifier* resource,
- CREFSTRING schemaName);
+ CREFSTRING schemaName);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -364,9 +366,9 @@
/// filter text.
/// 2. Interrogation of class definition would allow to determine properties of classes
/// which can be used for filter text.
- MgFeatureReader* SelectFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options );
+ MgFeatureReader* SelectFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -405,10 +407,10 @@
/// filter text.
/// 2. Interrogation of class definition would allow to determine properties of classes
/// which can be used for filter text.
- MgFeatureReader* SelectFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options,
- CREFSTRING coordinateSystem );
+ MgFeatureReader* SelectFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options,
+ CREFSTRING coordinateSystem);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -434,7 +436,7 @@
/// </param>
/// <returns>
/// MgDataReader pointer which operates on the instance of actual reader returned from the
- /// FdoProvider ( OR NULL ).
+ /// FdoProvider (OR NULL).
/// </returns>
/// EXCEPTIONS:
/// MgFeatureSourceException
@@ -449,9 +451,9 @@
/// 3. Interrogation of provider capabilities will inform list of operations supported
/// 4. Interrogation of class definition would allow to determine properties of classes
/// which can be used for filter text.
- MgDataReader* SelectAggregate( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureAggregateOptions* options );
+ MgDataReader* SelectAggregate(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureAggregateOptions* options);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -474,9 +476,9 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
- MgPropertyCollection* UpdateFeatures( MgResourceIdentifier* resource,
- MgFeatureCommandCollection* commands,
- bool useTransaction );
+ MgPropertyCollection* UpdateFeatures(MgResourceIdentifier* resource,
+ MgFeatureCommandCollection* commands,
+ bool useTransaction);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -500,9 +502,9 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
- MgPropertyCollection* UpdateFeatures( MgResourceIdentifier* resource,
- MgFeatureCommandCollection* commands,
- MgTransaction* transaction );
+ MgPropertyCollection* UpdateFeatures(MgResourceIdentifier* resource,
+ MgFeatureCommandCollection* commands,
+ MgTransaction* transaction);
////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
@@ -528,9 +530,9 @@
/// EXCEPTIONS:
/// MgFeatureServiceException
/// MgInvalidArgumentException
- MgFeatureReader* GetLockedFeatures( MgResourceIdentifier* resource,
- CREFSTRING className,
- MgFeatureQueryOptions* options );
+ MgFeatureReader* GetLockedFeatures(MgResourceIdentifier* resource,
+ CREFSTRING className,
+ MgFeatureQueryOptions* options);
////////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
@@ -552,7 +554,7 @@
/// MgInvalidArgumentException
/// MgInvalidOperationException
/// MgFdoException
- MgTransaction* BeginTransaction( MgResourceIdentifier* resource );
+ MgTransaction* BeginTransaction(MgResourceIdentifier* resource);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -583,8 +585,8 @@
/// MgInvalidResourceIdentifer
/// MgInvalidSqlStatement
/// MgSqlNotSupported
- MgSqlDataReader* ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement );
+ MgSqlDataReader* ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -624,10 +626,10 @@
/// MgInvalidResourceIdentifer
/// MgInvalidSqlStatement
/// MgSqlNotSupported
- MgSqlDataReader* ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement,
- MgParameterCollection* params,
- MgTransaction* transaction );
+ MgSqlDataReader* ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement,
+ MgParameterCollection* params,
+ MgTransaction* transaction);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -671,11 +673,11 @@
/// MgInvalidResourceIdentifer
/// MgInvalidSqlStatement
/// MgSqlNotSupported
- MgSqlDataReader* ExecuteSqlQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlStatement,
- MgParameterCollection* params,
- MgTransaction* transaction,
- INT32 fetchSize );
+ MgSqlDataReader* ExecuteSqlQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlStatement,
+ MgParameterCollection* params,
+ MgTransaction* transaction,
+ INT32 fetchSize);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -696,8 +698,8 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
- INT32 ExecuteSqlNonQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlNonSelectStatement );
+ INT32 ExecuteSqlNonQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlNonSelectStatement);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -729,10 +731,10 @@
///
/// EXCEPTIONS:
/// MgInvalidResourceIdentifer
- INT32 ExecuteSqlNonQuery( MgResourceIdentifier* resource,
- CREFSTRING sqlNonSelectStatement,
- MgParameterCollection* params,
- MgTransaction* transaction );
+ INT32 ExecuteSqlNonQuery(MgResourceIdentifier* resource,
+ CREFSTRING sqlNonSelectStatement,
+ MgParameterCollection* params,
+ MgTransaction* transaction);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -769,8 +771,8 @@
/// MgInvalidResourceIdentifer
/// NOTE:
/// Subject to change in FDO R2
- MgSpatialContextReader* GetSpatialContexts( MgResourceIdentifier* resource,
- bool bActiveOnly);
+ MgSpatialContextReader* GetSpatialContexts(MgResourceIdentifier* resource,
+ bool bActiveOnly);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -805,8 +807,8 @@
/// MgInvalidResourceIdentifer
/// NOTE:
/// Subject to change in FDO R2
- MgLongTransactionReader* GetLongTransactions( MgResourceIdentifier* resource,
- bool bActiveOnly);
+ MgLongTransactionReader* GetLongTransactions(MgResourceIdentifier* resource,
+ bool bActiveOnly);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
@@ -830,8 +832,8 @@
/// MgInvalidResourceTypeException
/// MgSessionNotFoundException
///
- bool SetLongTransaction( MgResourceIdentifier* featureSourceId,
- CREFSTRING longTransactionName);
+ bool SetLongTransaction(MgResourceIdentifier* featureSourceId,
+ CREFSTRING longTransactionName);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -851,7 +853,8 @@
/// Returns an MgByteReader containing the XML schema.
/// </returns>
///
- MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId, MgStringCollection* featureClasses);
+ MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
+ MgStringCollection* featureClasses);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -876,7 +879,9 @@
/// Returns an MgByteReader containing the XML schema.
/// </returns>
///
- MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId, MgStringCollection* featureClasses, CREFSTRING outputFormat);
+ MgByteReader* DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
+ MgStringCollection* featureClasses,
+ CREFSTRING outputFormat);
//////////////////////////////////////////////////////////////////
/// <summary>
@@ -927,14 +932,27 @@
///
/// EXCEPTIONS:
/// MgInvalidArgumentException
- MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId, CREFSTRING featureClass,
- MgStringCollection* requiredProperties, CREFSTRING srs, CREFSTRING filter, INT32 maxFeatures, CREFSTRING wfsVersion, CREFSTRING outputFormat, CREFSTRING sortCriteria, CREFSTRING namespacePrefix, CREFSTRING namespaceUrl);
+ MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId,
+ CREFSTRING featureClass,
+ MgStringCollection* requiredProperties,
+ CREFSTRING srs,
+ CREFSTRING filter,
+ INT32 maxFeatures,
+ CREFSTRING wfsVersion,
+ CREFSTRING outputFormat,
+ CREFSTRING sortCriteria,
+ CREFSTRING namespacePrefix,
+ CREFSTRING namespaceUrl);
///////////////////////////////////////////////////////////////////////////
/// This method has been deprecated. Use the above method.
///
- MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId, CREFSTRING featureClass,
- MgStringCollection* requiredProperties, CREFSTRING srs, CREFSTRING filter, INT32 maxFeatures);
+ MgByteReader* GetWfsFeature(MgResourceIdentifier* featureSourceId,
+ CREFSTRING featureClass,
+ MgStringCollection* requiredProperties,
+ CREFSTRING srs,
+ CREFSTRING filter,
+ INT32 maxFeatures);
////////////////////////////////////////////////////////////////////////////////
/// <summary>
@@ -1015,10 +1033,8 @@
CREFSTRING schemaName,
MgStringCollection* classNames);
- virtual bool NotifyResourcesChanged(const set<STRING>& resources,
- bool strict = true);
- virtual bool NotifyResourcesChanged(MgSerializableCollection* resources,
- bool strict = true);
+ virtual bool NotifyResourcesChanged(const set<STRING>& resources, bool strict = true);
+ virtual bool NotifyResourcesChanged(MgSerializableCollection* resources, bool strict = true);
STRING GetFdoCacheInfo();
More information about the mapguide-commits
mailing list