[mapguide-commits] r8449 - in trunk/MgDev/Desktop/MgDesktop: . MapLayer Services Services/Feature Services/Feature/Commands Services/Rendering Services/Resource
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Nov 16 22:24:02 PST 2014
Author: jng
Date: 2014-11-16 22:24:02 -0800 (Sun, 16 Nov 2014)
New Revision: 8449
Modified:
trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp
trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h
trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.cpp
trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.h
trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.cpp
trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.h
trunk/MgDev/Desktop/MgDesktop/MgDesktop.h
trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj
trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters
trunk/MgDev/Desktop/MgDesktop/Services/DataReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/DataReader.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureStringFunctions.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureStringFunctions.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/RasterHelper.h
trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.h
trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.h
trunk/MgDev/Desktop/MgDesktop/Services/MappingService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/MappingService.h
trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.h
trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.h
trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.h
trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.h
trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.h
trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h
trunk/MgDev/Desktop/MgDesktop/Services/ServiceFactory.cpp
trunk/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h
trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.h
trunk/MgDev/Desktop/MgDesktop/Services/Transaction.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Transaction.h
Log:
mg-desktop: tab -> space cleanup and remove some broken file references in project file
Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -121,14 +121,14 @@
// If we cannot pull the identity properties, silently ignore it.
try
{
- /*
+ /*
//TODO: Pull site connection directly from resource service
Ptr<MgUserInformation> userInfo = resourceService->GetUserInfo();
Ptr<MgSiteConnection> conn = new MgSiteConnection();
conn->Open(userInfo);
- */
+ */
Ptr<MgdServiceFactory> fact = new MgdServiceFactory();
- Ptr<MgFeatureService> featureService = static_cast<MgFeatureService*>(fact->CreateService(MgServiceType::FeatureService));
+ Ptr<MgFeatureService> featureService = static_cast<MgFeatureService*>(fact->CreateService(MgServiceType::FeatureService));
Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(m_featureSourceId);
// If the class name is fully qualified (prefixed with a schema name),
@@ -338,7 +338,7 @@
MgStringCollection arguments;
arguments.Add(errorMsg);
//TODO: MgdInvalidFeatureSourceException
- throw new MgFeatureServiceException(L"MgdLayer::UpdateFeatures", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgFeatureServiceException(L"MgdLayer::UpdateFeatures", __LINE__, __WFILE__, &arguments, L"", NULL);
}
auto_ptr<MdfModel::FeatureSource> featureSource;
@@ -436,7 +436,7 @@
MgSpatialContextReader* MgdLayer::GetSpatialContexts(bool active)
{
- Ptr<MgSpatialContextReader> reader;
+ Ptr<MgSpatialContextReader> reader;
MG_TRY()
@@ -562,7 +562,7 @@
{
//TODO: How do we deal with different schemas? Just use first one for now...
Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(m_featureSourceId);
- if (resId->GetResourceType().compare(L"FeatureSource") == 0) //MgResourceType::FeatureSource gives LNK2001 (huh?)
+ if (resId->GetResourceType().compare(L"FeatureSource") == 0) //MgResourceType::FeatureSource gives LNK2001 (huh?)
{
try
{
Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -9,7 +9,7 @@
/// \{
class MG_DESKTOP_API MgdLayer : public MgLayerBase
{
- MG_DECL_DYNCREATE()
+ MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgdLayer)
PUBLISHED_API:
@@ -33,19 +33,19 @@
virtual INT32 UpdateMatchingFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter);
- virtual INT32 DeleteFeatures(CREFSTRING filter);
+ virtual INT32 DeleteFeatures(CREFSTRING filter);
virtual MgFeatureReader* InsertFeatures(MgPropertyCollection* propertyValues, MgTransaction* trans);
- virtual INT32 UpdateMatchingFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
+ virtual INT32 UpdateMatchingFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
- virtual INT32 DeleteFeatures(CREFSTRING filter, MgTransaction* trans);
+ virtual INT32 DeleteFeatures(CREFSTRING filter, MgTransaction* trans);
virtual bool IsPotentiallyVisibleAtScale(double scale, bool bConsiderParentGroupVisibility);
virtual bool HasTooltips();
- virtual MgSpatialContextReader* GetSpatialContexts(bool active);
+ virtual MgSpatialContextReader* GetSpatialContexts(bool active);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief
Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -437,7 +437,7 @@
// Now that we've added all the layers (dynamic and base map) to the m_layers collection,
// bulk load the identity properties for all layers
- Ptr<MgFeatureService> featureService = static_cast<MgFeatureService*>(GetService(MgServiceType::FeatureService));
+ Ptr<MgFeatureService> featureService = static_cast<MgFeatureService*>(GetService(MgServiceType::FeatureService));
BulkLoadIdentityProperties(featureService);
// build the sorted list of finite display scales
@@ -506,7 +506,7 @@
//
void MgdMap::Open(MgResourceService* resourceService, CREFSTRING mapName)
{
-
+
}
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -15,7 +15,7 @@
/// \{
class MG_DESKTOP_API MgdMap : public MgMapBase
{
- MG_DECL_DYNCREATE()
+ MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgdMap)
PUBLISHED_API:
@@ -104,14 +104,14 @@
return m_cls_id;
}
- virtual void Dispose() { delete this; }
+ virtual void Dispose() { delete this; }
private:
void InitializeResourceService(MgResourceService* resourceService);
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MapLayer_Map;
+ static const INT32 m_cls_id = MapGuide_Desktop_MapLayer_Map;
private:
Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -115,7 +115,7 @@
//
void MgdSelection::Open(MgResourceService* resourceService, CREFSTRING mapName)
{
- /*
+ /*
STRING sessionId;
Ptr<MgUserInformation> userInfo = resourceService->GetUserInfo();
if (userInfo.p != NULL) sessionId = userInfo->GetMgSessionId();
@@ -126,7 +126,7 @@
Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(GetResourceName(sessionId, mapName));
MgResource::Open(resourceService, resId);
- */
+ */
}
@@ -135,7 +135,7 @@
//
void MgdSelection::Save(MgResourceService* resourceService, CREFSTRING mapName)
{
- /*
+ /*
STRING sessionId;
Ptr<MgUserInformation> userInfo = resourceService->GetUserInfo();
if (userInfo.p != NULL) sessionId = userInfo->GetMgSessionId();
@@ -146,7 +146,7 @@
Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(GetResourceName(sessionId, mapName));
MgResource::Save(resourceService, resId);
- */
+ */
}
Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -8,7 +8,7 @@
/// \{
class MG_DESKTOP_API MgdSelection : public MgSelectionBase
{
- MG_DECL_DYNCREATE()
+ MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgdSelection)
PUBLISHED_API:
@@ -33,7 +33,7 @@
protected:
- void Dispose() { delete this; }
+ void Dispose() { delete this; }
virtual INT32 GetClassId()
{
Modified: trunk/MgDev/Desktop/MgDesktop/MgDesktop.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MgDesktop.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/MgDesktop.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -76,7 +76,7 @@
#include "Services/Resource/UnmanagedDataType.h"
#define NOT_IMPLEMENTED(method) \
- throw new MgNotImplementedException(method, __LINE__, __WFILE__, NULL, L"", NULL)
+ throw new MgNotImplementedException(method, __LINE__, __WFILE__, NULL, L"", NULL)
//Uncomment to debug memory leaks. This is the header for Visual Leak Detector
//See: http://vld.codeplex.com for download and setup
Modified: trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj 2014-11-17 06:24:02 UTC (rev 8449)
@@ -489,12 +489,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="Services\Feature\CreateFeatureSource.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="Services\Rendering\CustomLogoInfo.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -555,12 +549,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="Services\Feature\FdoConnection.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="Services\Feature\FdoConnectionPool.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1045,7 +1033,6 @@
<ClInclude Include="System\ClassId.h" />
<ClInclude Include="System\ConfigProperties.h" />
<ClInclude Include="Exception\ConnectionFailedException.h" />
- <ClInclude Include="Services\Feature\CreateFeatureSource.h" />
<ClInclude Include="Services\Rendering\CustomLogoInfo.h" />
<ClInclude Include="Services\Rendering\CustomTextInfo.h" />
<ClInclude Include="Services\DataReader.h" />
@@ -1057,7 +1044,6 @@
<ClInclude Include="Exception\DwfSectionNotFoundException.h" />
<ClInclude Include="Exception\DwfSectionResourceNotFoundException.h" />
<ClInclude Include="Services\Rendering\DwfVersion.h" />
- <ClInclude Include="Services\Feature\FdoConnection.h" />
<ClInclude Include="Services\Feature\FdoConnectionPool.h" />
<ClInclude Include="Services\Feature\FdoConnectionUtil.h" />
<ClInclude Include="Services\Feature\FdoForcedOneToOneFeatureReader.h" />
Modified: trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters 2014-11-17 06:24:02 UTC (rev 8449)
@@ -30,9 +30,6 @@
<ClCompile Include="Exception\ConnectionFailedException.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Services\Feature\CreateFeatureSource.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="Services\Rendering\CustomLogoInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -63,9 +60,6 @@
<ClCompile Include="Services\Rendering\DwfVersion.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Services\Feature\FdoConnection.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="Services\Feature\FdoConnectionPool.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -416,9 +410,6 @@
<ClInclude Include="Exception\ConnectionFailedException.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Services\Feature\CreateFeatureSource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="Services\Rendering\CustomLogoInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -452,9 +443,6 @@
<ClInclude Include="Services\Rendering\DwfVersion.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Services\Feature\FdoConnection.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="Services\Feature\FdoConnectionPool.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/MgDev/Desktop/MgDesktop/Services/DataReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/DataReader.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/DataReader.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -8,7 +8,7 @@
MgdDataReader::MgdDataReader(MgdFeatureConnection* conn, FdoIDataReader* reader)
{
- m_reader = FDO_SAFE_ADDREF(reader);
+ m_reader = FDO_SAFE_ADDREF(reader);
m_connection = SAFE_ADDREF(conn);
// The reader takes ownership of the FDO connection
@@ -17,41 +17,41 @@
MgdDataReader::~MgdDataReader()
{
- FDO_SAFE_RELEASE(m_reader);
+ FDO_SAFE_RELEASE(m_reader);
m_connection = NULL;
}
bool MgdDataReader::ReadNext()
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- ret = m_reader->ReadNext();
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::ReadNext")
- return ret;
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ ret = m_reader->ReadNext();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::ReadNext")
+ return ret;
}
INT32 MgdDataReader::GetPropertyCount()
{
- INT32 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetPropertyCount();
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetPropertyCount")
- return ret;
+ INT32 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ ret = m_reader->GetPropertyCount();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetPropertyCount")
+ return ret;
}
STRING MgdDataReader::GetPropertyName(INT32 index)
{
- STRING ret = L"";
- MG_FEATURE_SERVICE_TRY()
- FdoString* name = m_reader->GetPropertyName(index);
- ret = STRING(name);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetPropertyName")
- return ret;
+ STRING ret = L"";
+ MG_FEATURE_SERVICE_TRY()
+ FdoString* name = m_reader->GetPropertyName(index);
+ ret = STRING(name);
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetPropertyName")
+ return ret;
}
INT32 MgdDataReader::GetPropertyType(CREFSTRING propertyName)
{
- INT32 type = MgPropertyType::Null;
+ INT32 type = MgPropertyType::Null;
MG_FEATURE_SERVICE_TRY()
@@ -96,27 +96,27 @@
INT32 MgdDataReader::GetPropertyType(INT32 index)
{
- INT32 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetPropertyType(index);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetPropertyType")
- return ret;
+ INT32 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ ret = m_reader->GetPropertyType(index);
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetPropertyType")
+ return ret;
}
bool MgdDataReader::IsNull(CREFSTRING propertyName)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- ret = m_reader->IsNull(propertyName.c_str());
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::IsNull")
- return ret;
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ ret = m_reader->IsNull(propertyName.c_str());
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::IsNull")
+ return ret;
}
bool MgdDataReader::GetBoolean(CREFSTRING propertyName)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- try
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = m_reader->GetBoolean(propertyName.c_str());
}
@@ -133,15 +133,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetBoolean")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetBoolean")
+ return ret;
}
BYTE MgdDataReader::GetByte(CREFSTRING propertyName)
{
- BYTE ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ BYTE ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (BYTE)m_reader->GetByte(propertyName.c_str());
}
@@ -158,15 +158,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetByte")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetByte")
+ return ret;
}
MgDateTime* MgdDataReader::GetDateTime(CREFSTRING propertyName)
{
- Ptr<MgDateTime> mdt;
- MG_FEATURE_SERVICE_TRY()
- try
+ Ptr<MgDateTime> mdt;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
FdoDateTime val = m_reader->GetDateTime(propertyName.c_str());
mdt = new MgDateTime((INT16)val.year, (INT8)val.month, (INT8)val.day,
@@ -185,15 +185,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetByte")
- return mdt.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetByte")
+ return mdt.Detach();
}
float MgdDataReader::GetSingle(CREFSTRING propertyName)
{
- float ret = 0.0f;
- MG_FEATURE_SERVICE_TRY()
- try
+ float ret = 0.0f;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = m_reader->GetSingle(propertyName.c_str());
}
@@ -210,15 +210,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetSingle")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetSingle")
+ return ret;
}
double MgdDataReader::GetDouble(CREFSTRING propertyName)
{
- double ret = 0.0;
- MG_FEATURE_SERVICE_TRY()
- try
+ double ret = 0.0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = m_reader->GetDouble(propertyName.c_str());
}
@@ -235,15 +235,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetDouble")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetDouble")
+ return ret;
}
INT16 MgdDataReader::GetInt16(CREFSTRING propertyName)
{
- INT16 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ INT16 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (INT16)m_reader->GetInt16(propertyName.c_str());
}
@@ -260,15 +260,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt16")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt16")
+ return ret;
}
INT32 MgdDataReader::GetInt32(CREFSTRING propertyName)
{
- INT32 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ INT32 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (INT32)m_reader->GetInt32(propertyName.c_str());
}
@@ -285,15 +285,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt32")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt32")
+ return ret;
}
INT64 MgdDataReader::GetInt64(CREFSTRING propertyName)
{
- INT64 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ INT64 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (INT64)m_reader->GetInt64(propertyName.c_str());
}
@@ -310,15 +310,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt64")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt64")
+ return ret;
}
STRING MgdDataReader::GetString(CREFSTRING propertyName)
{
- STRING ret = L"";
- MG_FEATURE_SERVICE_TRY()
- try
+ STRING ret = L"";
+ MG_FEATURE_SERVICE_TRY()
+ try
{
INT32 length = 0;
const wchar_t* str = this->GetString(propertyName.c_str(), length);
@@ -340,14 +340,14 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetString")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetString")
+ return ret;
}
MgByteReader* MgdDataReader::GetBLOB(CREFSTRING propertyName)
{
- Ptr<MgByteReader> blob;
- MG_FEATURE_SERVICE_TRY()
+ Ptr<MgByteReader> blob;
+ MG_FEATURE_SERVICE_TRY()
FdoPtr<FdoLOBValue> fdoVal = m_reader->GetLOB(propertyName.c_str());
if (fdoVal != NULL)
{
@@ -360,14 +360,14 @@
blob = byteSource->GetReader();
}
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetBLOB")
- return blob.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetBLOB")
+ return blob.Detach();
}
MgByteReader* MgdDataReader::GetCLOB(CREFSTRING propertyName)
{
- Ptr<MgByteReader> clob;
- MG_FEATURE_SERVICE_TRY()
+ Ptr<MgByteReader> clob;
+ MG_FEATURE_SERVICE_TRY()
FdoPtr<FdoLOBValue> fdoVal = m_reader->GetLOB(propertyName.c_str());
if (fdoVal != NULL)
{
@@ -380,14 +380,14 @@
clob = byteSource->GetReader();
}
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetCLOB")
- return clob.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetCLOB")
+ return clob.Detach();
}
MgByteReader* MgdDataReader::GetGeometry(CREFSTRING propertyName)
{
- Ptr<MgByteReader> geom;
- MG_FEATURE_SERVICE_TRY()
+ Ptr<MgByteReader> geom;
+ MG_FEATURE_SERVICE_TRY()
try
{
FdoPtr<FdoByteArray> byteArray = m_reader->GetGeometry(propertyName.c_str());
@@ -415,8 +415,8 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetGeometry")
- return geom.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetGeometry")
+ return geom.Detach();
}
MgRaster* MgdDataReader::GetRaster(CREFSTRING propertyName)
@@ -442,7 +442,7 @@
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetRaster")
- return retVal.Detach();
+ return retVal.Detach();
}
MgByteReader* MgdDataReader::GetRaster(STRING rasterPropName, INT32 xSize, INT32 ySize)
@@ -492,151 +492,151 @@
INT32 MgdDataReader::GetPropertyIndex(CREFSTRING propertyName)
{
- INT32 ret = -1;
- MG_FEATURE_SERVICE_TRY()
+ INT32 ret = -1;
+ MG_FEATURE_SERVICE_TRY()
ret = m_reader->GetPropertyIndex(propertyName.c_str());
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetPropertyIndex")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetPropertyIndex")
+ return ret;
}
bool MgdDataReader::IsNull(INT32 index)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = IsNull(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::IsNull")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::IsNull")
+ return ret;
}
bool MgdDataReader::GetBoolean(INT32 index)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetBoolean(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetBoolean")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetBoolean")
+ return ret;
}
BYTE MgdDataReader::GetByte(INT32 index)
{
- BYTE ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ BYTE ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetByte(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetByte")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetByte")
+ return ret;
}
MgDateTime* MgdDataReader::GetDateTime(INT32 index)
{
- Ptr<MgDateTime> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgDateTime> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetDateTime(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetDateTime")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetDateTime")
+ return ret;
}
float MgdDataReader::GetSingle(INT32 index)
{
- float ret = 0.0f;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ float ret = 0.0f;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetSingle(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetSingle")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetSingle")
+ return ret;
}
double MgdDataReader::GetDouble(INT32 index)
{
- double ret = 0.0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ double ret = 0.0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetDouble(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetDouble")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetDouble")
+ return ret;
}
INT16 MgdDataReader::GetInt16(INT32 index)
{
- INT16 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ INT16 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetInt16(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt16")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt16")
+ return ret;
}
INT32 MgdDataReader::GetInt32(INT32 index)
{
- INT32 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ INT32 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetInt32(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt32")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt32")
+ return ret;
}
INT64 MgdDataReader::GetInt64(INT32 index)
{
- INT64 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ INT64 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetInt64(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt64")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetInt64")
+ return ret;
}
STRING MgdDataReader::GetString(INT32 index)
{
- STRING ret = L"";
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ STRING ret = L"";
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetString(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetString")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetString")
+ return ret;
}
MgByteReader* MgdDataReader::GetBLOB(INT32 index)
{
- Ptr<MgByteReader> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgByteReader> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetBLOB(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetBLOB")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetBLOB")
+ return ret;
}
MgByteReader* MgdDataReader::GetCLOB(INT32 index)
{
- Ptr<MgByteReader> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgByteReader> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetCLOB(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetCLOB")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetCLOB")
+ return ret;
}
MgByteReader* MgdDataReader::GetGeometry(INT32 index)
{
- Ptr<MgByteReader> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgByteReader> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetGeometry(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetGeometry")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetGeometry")
+ return ret;
}
MgRaster* MgdDataReader::GetRaster(INT32 index)
{
- Ptr<MgRaster> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgRaster> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetRaster(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetRaster")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::GetRaster")
+ return ret;
}
void MgdDataReader::Close()
@@ -654,19 +654,19 @@
m_connection = NULL;
//MgdFdoConnectionUtil::CloseConnection(fdoConnection);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::Close");
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::Close");
}
INT32 MgdDataReader::GetReaderType()
{
- return MgReaderType::FeatureReader;
+ return MgReaderType::FeatureReader;
}
//EXTERNAL_API:
MgByteReader* MgdDataReader::ToXml()
{
- throw new MgNotImplementedException(L"MgdDataReader::ToXml", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNotImplementedException(L"MgdDataReader::ToXml", __LINE__, __WFILE__, NULL, L"", NULL);
}
//INTERNAL_API:
@@ -718,10 +718,10 @@
void MgdDataReader::Serialize(MgStream* stream)
{
- throw new MgNotImplementedException(L"MgdDataReader::Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNotImplementedException(L"MgdDataReader::Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
}
void MgdDataReader::Deserialize(MgStream* stream)
{
- throw new MgNotImplementedException(L"MgdDataReader::Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNotImplementedException(L"MgdDataReader::Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
}
\ No newline at end of file
Modified: trunk/MgDev/Desktop/MgDesktop/Services/DataReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/DataReader.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/DataReader.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -11,10 +11,10 @@
class MG_DESKTOP_API MgdDataReader : public MgDataReader
{
INTERNAL_API:
- MgdDataReader(MgdFeatureConnection* conn, FdoIDataReader* reader);
+ MgdDataReader(MgdFeatureConnection* conn, FdoIDataReader* reader);
EXTERNAL_API:
- virtual ~MgdDataReader();
+ virtual ~MgdDataReader();
PUBLISHED_API:
virtual bool ReadNext();
@@ -184,12 +184,12 @@
MgByteReader* GetRaster(STRING rasterPropName, INT32 xSize, INT32 ySize);
protected:
- virtual void Dispose() { delete this; }
+ virtual void Dispose() { delete this; }
private:
STRING GetRasterPropertyName();
- FdoIDataReader* m_reader;
+ FdoIDataReader* m_reader;
Ptr<MgdFeatureConnection> m_connection;
};
/// \}
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -227,12 +227,12 @@
MG_FEATURE_SERVICE_TRY()
CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdUpdateFeaturesCommand::ExecuteInsert");
- CHECKARGUMENTNULL(propertyValues, L"MgdUpdateFeaturesCommand::ExecuteInsert");
- if (className.empty())
- throw new MgNullArgumentException(L"MgdUpdateFeaturesCommand::ExecuteInsert", __LINE__, __WFILE__, NULL, L"", NULL);
-
+ CHECKARGUMENTNULL(propertyValues, L"MgdUpdateFeaturesCommand::ExecuteInsert");
+ if (className.empty())
+ throw new MgNullArgumentException(L"MgdUpdateFeaturesCommand::ExecuteInsert", __LINE__, __WFILE__, NULL, L"", NULL);
+
Ptr<MgdFeatureConnection> connWrap;
- FdoPtr<FdoIConnection> conn;
+ FdoPtr<FdoIConnection> conn;
FdoPtr<FdoITransaction> fdoTrans;
Ptr<MgdTransaction> mgTrans = dynamic_cast<MgdTransaction*>(trans);
if (NULL != mgTrans)
@@ -252,25 +252,25 @@
}
conn = connWrap->GetConnection();
- FdoPtr<FdoIInsert> insert = (FdoIInsert*)conn->CreateCommand(FdoCommandType_Insert);
-
- insert->SetFeatureClassName(className.c_str());
+ FdoPtr<FdoIInsert> insert = (FdoIInsert*)conn->CreateCommand(FdoCommandType_Insert);
+
+ insert->SetFeatureClassName(className.c_str());
- FdoPtr<FdoPropertyValueCollection> propVals = insert->GetPropertyValues();
- for (INT32 i = 0; i < propertyValues->GetCount(); i++)
- {
- Ptr<MgProperty> mgp = propertyValues->GetItem(i);
- FdoPtr<FdoPropertyValue> pv = MgdFeatureUtil::MgPropertyToFdoProperty(mgp);
+ FdoPtr<FdoPropertyValueCollection> propVals = insert->GetPropertyValues();
+ for (INT32 i = 0; i < propertyValues->GetCount(); i++)
+ {
+ Ptr<MgProperty> mgp = propertyValues->GetItem(i);
+ FdoPtr<FdoPropertyValue> pv = MgdFeatureUtil::MgPropertyToFdoProperty(mgp);
- propVals->Add(pv);
- }
+ propVals->Add(pv);
+ }
if (NULL != fdoTrans.p)
insert->SetTransaction(fdoTrans);
- FdoPtr<FdoIFeatureReader> insertRes = insert->Execute();
+ FdoPtr<FdoIFeatureReader> insertRes = insert->Execute();
- reader = new MgdFeatureReader(connWrap, insertRes);
+ reader = new MgdFeatureReader(connWrap, insertRes);
MG_FEATURE_SERVICE_CATCH_AND_THROW_WITH_FEATURE_SOURCE(L"MgdUpdateFeaturesCommand::ExecuteInsert", resource)
@@ -284,12 +284,12 @@
MG_FEATURE_SERVICE_TRY()
CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdUpdateFeaturesCommand::ExecuteUpdate");
- CHECKARGUMENTNULL(propertyValues, L"MgdUpdateFeaturesCommand::ExecuteUpdate");
- if (className.empty())
- throw new MgNullArgumentException(L"MgdUpdateFeaturesCommand::ExecuteUpdate", __LINE__, __WFILE__, NULL, L"", NULL);
+ CHECKARGUMENTNULL(propertyValues, L"MgdUpdateFeaturesCommand::ExecuteUpdate");
+ if (className.empty())
+ throw new MgNullArgumentException(L"MgdUpdateFeaturesCommand::ExecuteUpdate", __LINE__, __WFILE__, NULL, L"", NULL);
Ptr<MgdFeatureConnection> connWrap;
- FdoPtr<FdoIConnection> conn;
+ FdoPtr<FdoIConnection> conn;
FdoPtr<FdoITransaction> fdoTrans;
Ptr<MgdTransaction> mgTrans = dynamic_cast<MgdTransaction*>(trans);
if (NULL != mgTrans)
@@ -309,25 +309,25 @@
}
conn = connWrap->GetConnection();
- FdoPtr<FdoIUpdate> update = (FdoIUpdate*)conn->CreateCommand(FdoCommandType_Update);
- update->SetFeatureClassName(className.c_str());
-
- if (!filter.empty())
- update->SetFilter(filter.c_str());
+ FdoPtr<FdoIUpdate> update = (FdoIUpdate*)conn->CreateCommand(FdoCommandType_Update);
+ update->SetFeatureClassName(className.c_str());
+
+ if (!filter.empty())
+ update->SetFilter(filter.c_str());
if (NULL != fdoTrans.p)
update->SetTransaction(fdoTrans);
- FdoPtr<FdoPropertyValueCollection> propVals = update->GetPropertyValues();
- for (INT32 i = 0; i < propertyValues->GetCount(); i++)
- {
- Ptr<MgProperty> mgp = propertyValues->GetItem(i);
- FdoPtr<FdoPropertyValue> pv = MgdFeatureUtil::MgPropertyToFdoProperty(mgp);
+ FdoPtr<FdoPropertyValueCollection> propVals = update->GetPropertyValues();
+ for (INT32 i = 0; i < propertyValues->GetCount(); i++)
+ {
+ Ptr<MgProperty> mgp = propertyValues->GetItem(i);
+ FdoPtr<FdoPropertyValue> pv = MgdFeatureUtil::MgPropertyToFdoProperty(mgp);
- propVals->Add(pv);
- }
+ propVals->Add(pv);
+ }
- updated = update->Execute();
+ updated = update->Execute();
MG_FEATURE_SERVICE_CATCH_AND_THROW_WITH_FEATURE_SOURCE(L"MgdUpdateFeaturesCommand::ExecuteUpdate", resource)
@@ -341,11 +341,11 @@
MG_FEATURE_SERVICE_TRY()
CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdUpdateFeaturesCommand::ExecuteDelete");
- if (className.empty())
- throw new MgNullArgumentException(L"MgdUpdateFeaturesCommand::ExecuteDelete", __LINE__, __WFILE__, NULL, L"", NULL);
+ if (className.empty())
+ throw new MgNullArgumentException(L"MgdUpdateFeaturesCommand::ExecuteDelete", __LINE__, __WFILE__, NULL, L"", NULL);
Ptr<MgdFeatureConnection> connWrap;
- FdoPtr<FdoIConnection> conn;
+ FdoPtr<FdoIConnection> conn;
FdoPtr<FdoITransaction> fdoTrans;
Ptr<MgdTransaction> mgTrans = dynamic_cast<MgdTransaction*>(trans);
@@ -366,15 +366,15 @@
}
conn = connWrap->GetConnection();
- FdoPtr<FdoIDelete> fdoDelete = (FdoIDelete*)conn->CreateCommand(FdoCommandType_Delete);
- fdoDelete->SetFeatureClassName(className.c_str());
+ FdoPtr<FdoIDelete> fdoDelete = (FdoIDelete*)conn->CreateCommand(FdoCommandType_Delete);
+ fdoDelete->SetFeatureClassName(className.c_str());
if (!filter.empty())
- fdoDelete->SetFilter(filter.c_str());
+ fdoDelete->SetFilter(filter.c_str());
if (NULL != fdoTrans.p)
fdoDelete->SetTransaction(fdoTrans);
- deleted = fdoDelete->Execute();
+ deleted = fdoDelete->Execute();
MG_FEATURE_SERVICE_CATCH_AND_THROW_WITH_FEATURE_SOURCE(L"MgdUpdateFeaturesCommand::ExecuteDelete", resource)
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -44,7 +44,7 @@
INT32 ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
- INT32 ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
+ INT32 ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
private:
void Connect(MgResourceIdentifier* resource, MgTransaction* transaction);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -33,18 +33,18 @@
providerNoVersion += L".";
providerNoVersion += (FdoString*)local->GetString();
- FdoPtr<IConnectionManager> connMgr = FdoFeatureAccessManager::GetConnectionManager();
- conn = connMgr->CreateConnection(providerNoVersion.c_str());
+ FdoPtr<IConnectionManager> connMgr = FdoFeatureAccessManager::GetConnectionManager();
+ conn = connMgr->CreateConnection(providerNoVersion.c_str());
//Some providers may be sensitive to being assigned an empty string
if (!connectionString.empty())
{
- conn->SetConnectionString(connectionString.c_str());
+ conn->SetConnectionString(connectionString.c_str());
}
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFdoConnectionUtil::CreateConnection")
- return conn.Detach();
+ return conn.Detach();
}
FdoIConnection* MgdFdoConnectionUtil::CreateConnection(MgResourceIdentifier* resource)
@@ -53,22 +53,22 @@
FdoPtr<FdoIConnection> conn;
- MG_FEATURE_SERVICE_TRY()
+ MG_FEATURE_SERVICE_TRY()
CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdFdoConnectionUtil::CreateConnection");
Ptr<MgdServiceFactory> fact = new MgdServiceFactory();
Ptr<MgdResourceService> resSvc = static_cast<MgdResourceService*>(fact->CreateService(MgServiceType::ResourceService));
- std::string xmlContent;
- Ptr<MgByteReader> content = resSvc->GetResourceContent(resource, L"");
+ std::string xmlContent;
+ Ptr<MgByteReader> content = resSvc->GetResourceContent(resource, L"");
- content->ToStringUtf8(xmlContent);
+ content->ToStringUtf8(xmlContent);
MdfModel::FeatureSource* fs = GetFeatureSource(resource);
- STRING provider = (STRING)fs->GetProvider();
+ STRING provider = (STRING)fs->GetProvider();
STRING configDoc = (STRING)fs->GetConfigurationDocument();
- FdoPtr<IConnectionManager> connMgr = FdoFeatureAccessManager::GetConnectionManager();
+ FdoPtr<IConnectionManager> connMgr = FdoFeatureAccessManager::GetConnectionManager();
FdoPtr<FdoProviderNameTokens> tokens = FdoProviderNameTokens::Create(provider.c_str());
FdoStringsP tokenValues = tokens->GetNameTokens();
@@ -80,9 +80,9 @@
providerNoVersion += L".";
providerNoVersion += (FdoString*)local->GetString();
- conn = connMgr->CreateConnection(providerNoVersion.c_str());
- FdoPtr<FdoIConnectionInfo> connInfo = conn->GetConnectionInfo();
- FdoPtr<FdoIConnectionPropertyDictionary> dict = connInfo->GetConnectionProperties();
+ conn = connMgr->CreateConnection(providerNoVersion.c_str());
+ FdoPtr<FdoIConnectionInfo> connInfo = conn->GetConnectionInfo();
+ FdoPtr<FdoIConnectionPropertyDictionary> dict = connInfo->GetConnectionProperties();
STRING username;
STRING password;
@@ -111,10 +111,10 @@
}
}
- MdfModel::NameStringPairCollection* params = fs->GetParameters();
- for (INT32 i = 0; i < params->GetCount(); i++)
- {
- MdfModel::NameStringPair* pair = params->GetAt(i);
+ MdfModel::NameStringPairCollection* params = fs->GetParameters();
+ for (INT32 i = 0; i < params->GetCount(); i++)
+ {
+ MdfModel::NameStringPair* pair = params->GetAt(i);
STRING n = pair->GetName();
STRING v = pair->GetValue();
@@ -122,8 +122,8 @@
//Perform tag substitution if found
PerformTagSubstitution(resSvc, v, resource, username, password);
- dict->SetProperty(n.c_str(), v.c_str());
- }
+ dict->SetProperty(n.c_str(), v.c_str());
+ }
MgdLogDetail logDetail(MgServiceType::FeatureService, MgdLogDetail::InternalTrace, L"MgdFdoConnectionUtil::CreateConnection", mgStackParams);
logDetail.AddResourceIdentifier(L"resource", resource);
@@ -162,9 +162,9 @@
}
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW_WITH_FEATURE_SOURCE(L"MgdFdoConnectionUtil::CreateConnection", resource)
+ MG_FEATURE_SERVICE_CATCH_AND_THROW_WITH_FEATURE_SOURCE(L"MgdFdoConnectionUtil::CreateConnection", resource)
- return conn.Detach();
+ return conn.Detach();
}
void MgdFdoConnectionUtil::PerformTagSubstitution(MgdResourceService* resSvc, REFSTRING str, MgResourceIdentifier* resource, CREFSTRING username, CREFSTRING password)
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -30,7 +30,7 @@
static FdoIConnection* CreateConnection(MgResourceIdentifier* resource);
//Createa a connection by raw FDO connection string. No tag subsitution is performed.
- static FdoIConnection* CreateConnection(CREFSTRING provider, CREFSTRING connectionString);
+ static FdoIConnection* CreateConnection(CREFSTRING provider, CREFSTRING connectionString);
#ifdef DEBUG_FDO_CONNECTION_POOL
static void CheckCallStats();
#endif
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -217,7 +217,7 @@
bool MgdFeatureConnection::IsSupportedFunction(FdoFunction* fdoFunc)
{
- CHECKNULL(m_fdoConn, L"MgdFeatureConnection.SupportsFunction");
+ CHECKNULL(m_fdoConn, L"MgdFeatureConnection.SupportsFunction");
FdoPtr<FdoIExpressionCapabilities> fec = m_fdoConn->GetExpressionCapabilities();
CHECKNULL((FdoIExpressionCapabilities*)fec, L"MgdFeatureConnection.SupportsFunction");
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureConnection.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -39,7 +39,7 @@
bool SupportsSelectOrdering();
FdoJoinType GetJoinTypes() const;
- bool IsSupportedFunction(FdoFunction* function);
+ bool IsSupportedFunction(FdoFunction* function);
void OwnReader();
private:
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -72,10 +72,10 @@
// TODO: Should we really check this, may be we can ignore ??
// because we can only come to here if property type is numeric
if (!this->CheckSupportedPropertyType())
- {
- throw new MgInvalidPropertyTypeException(
- L"MgdFeatureGeometricFunctions.Initialize", __LINE__, __WFILE__, NULL, L"", NULL);
- }
+ {
+ throw new MgInvalidPropertyTypeException(
+ L"MgdFeatureGeometricFunctions.Initialize", __LINE__, __WFILE__, NULL, L"", NULL);
+ }
// We must have an property alias
// Though we can name a property with same name as function expression
@@ -247,7 +247,7 @@
// Check whether property type is a supported type
bool MgdFeatureGeometricFunctions::CheckSupportedPropertyType()
{
- return MgPropertyType::Geometry == m_type;
+ return MgPropertyType::Geometry == m_type;
}
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureGeometricFunctions.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -62,11 +62,11 @@
MgReader* GetReader(MgGeometryCollection* returnGeom);
- //WTF: The original method was void and threw MgInvalidPropertyTypeException if not supported
- //MSVC 2008 blows up on the linker phase with a combination of C1001 at this method and LNK1000
- //
- //Changing this method to return bool (supported = true) and throwing MgInvalidPropertyTypeException in
- //the method that calls this (Initialize()) makes the problem go away. Real WTF there!
+ //WTF: The original method was void and threw MgInvalidPropertyTypeException if not supported
+ //MSVC 2008 blows up on the linker phase with a combination of C1001 at this method and LNK1000
+ //
+ //Changing this method to return bool (supported = true) and throwing MgInvalidPropertyTypeException in
+ //the method that calls this (Initialize()) makes the problem go away. Real WTF there!
bool CheckSupportedPropertyType();
private:
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -6,12 +6,12 @@
DECLARE_CLASSNAME(MgdFeatureSetReader);
INTERNAL_API:
- MgdFeatureSetReader(MgFeatureSet* featureSet);
+ MgdFeatureSetReader(MgFeatureSet* featureSet);
EXTERNAL_API:
- virtual ~MgdFeatureSetReader();
+ virtual ~MgdFeatureSetReader();
- //MgReader
+ //MgReader
PUBLISHED_API:
virtual bool ReadNext();
@@ -173,7 +173,7 @@
void AssignFeatureSet(MgFeatureSet* featureSet);
- //MgFeatureReader
+ //MgFeatureReader
PUBLISHED_API:
virtual MgClassDefinition* GetClassDefinition();
@@ -196,7 +196,7 @@
MgByteReader* GetRaster(STRING rasterPropName, INT32 xSize, INT32 ySize);
protected:
- virtual void Dispose() { delete this; }
+ virtual void Dispose() { delete this; }
private:
MgProperty* GetProperty(CREFSTRING propertyName, INT16 expectedType);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureStringFunctions.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureStringFunctions.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureStringFunctions.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -70,11 +70,11 @@
// TODO: Should we really check this, may be we can ignore ??
// because we can only come to here if property type is numeric
- if (!this->CheckSupportedPropertyType())
- {
- throw new MgInvalidPropertyTypeException(
+ if (!this->CheckSupportedPropertyType())
+ {
+ throw new MgInvalidPropertyTypeException(
L"MgdFeatureStringFunctions.Initialize", __LINE__, __WFILE__, NULL, L"", NULL);
- }
+ }
// We must have an property alias
// Though we can name a property with same name as function expression
// But Fdo forces to have an alias. Therefore we implement this restriction.
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureStringFunctions.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureStringFunctions.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureStringFunctions.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -49,11 +49,11 @@
void ExecuteOperation(std::map<STRING, char>& values, std::vector<STRING>& distValues);
MgReader* GetReader(std::vector<STRING>& distValues);
- //WTF: The original method was void and threw MgInvalidPropertyTypeException if not supported
- //MSVC 2008 blows up on the linker phase with a combination of C1001 at this method and LNK1000
- //
- //Changing this method to return bool (supported = true) and throwing MgInvalidPropertyTypeException in
- //the method that calls this (Initialize()) makes the problem go away. Real WTF there!
+ //WTF: The original method was void and threw MgInvalidPropertyTypeException if not supported
+ //MSVC 2008 blows up on the linker phase with a combination of C1001 at this method and LNK1000
+ //
+ //Changing this method to return bool (supported = true) and throwing MgInvalidPropertyTypeException in
+ //the method that calls this (Initialize()) makes the problem go away. Real WTF there!
bool CheckSupportedPropertyType();
private:
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -64,7 +64,7 @@
{
bool ret = false;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->IsNull(propertyName);
+ ret = m_reader->IsNull(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::IsNull")
return ret;
}
@@ -73,7 +73,7 @@
{
bool ret = false;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetBoolean(propertyName);
+ ret = m_reader->GetBoolean(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetBoolean")
return ret;
}
@@ -82,7 +82,7 @@
{
BYTE ret = 0;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetByte(propertyName);
+ ret = m_reader->GetByte(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetByte")
return ret;
}
@@ -91,7 +91,7 @@
{
Ptr<MgDateTime> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetDateTime(propertyName);
+ ret = m_reader->GetDateTime(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetDateTime")
return ret.Detach();
}
@@ -100,7 +100,7 @@
{
float ret = 0.0f;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetSingle(propertyName);
+ ret = m_reader->GetSingle(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetSingle")
return ret;
}
@@ -109,7 +109,7 @@
{
double ret = 0.0;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetDouble(propertyName);
+ ret = m_reader->GetDouble(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetDouble")
return ret;
}
@@ -118,7 +118,7 @@
{
INT16 ret = 0;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetInt16(propertyName);
+ ret = m_reader->GetInt16(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetInt16")
return ret;
}
@@ -127,7 +127,7 @@
{
INT32 ret = 0;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetInt32(propertyName);
+ ret = m_reader->GetInt32(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetInt32")
return ret;
}
@@ -136,7 +136,7 @@
{
INT64 ret = 0;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetInt64(propertyName);
+ ret = m_reader->GetInt64(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetInt32")
return ret;
}
@@ -145,7 +145,7 @@
{
STRING ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetString(propertyName);
+ ret = m_reader->GetString(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetString")
return ret;
}
@@ -154,7 +154,7 @@
{
Ptr<MgByteReader> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetBLOB(propertyName);
+ ret = m_reader->GetBLOB(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetBLOB")
return ret.Detach();
}
@@ -163,7 +163,7 @@
{
Ptr<MgByteReader> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetCLOB(propertyName);
+ ret = m_reader->GetCLOB(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetCLOB")
return ret.Detach();
}
@@ -172,7 +172,7 @@
//that will not return this type of reader
BYTE_ARRAY_OUT MgdProjectedFeatureReader::GetGeometry(CREFSTRING propertyName, INT32& length)
{
- NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetGeometry");
+ NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetGeometry");
}
//This won't be used by RS_FeatureReader because stylization will use SelectFeatures()
@@ -186,7 +186,7 @@
{
Ptr<MgRaster> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetRaster(propertyName);
+ ret = m_reader->GetRaster(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetRaster")
return ret.Detach();
}
@@ -200,7 +200,7 @@
{
bool ret = false;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->IsNull(index);
+ ret = m_reader->IsNull(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::IsNull")
return ret;
}
@@ -209,7 +209,7 @@
{
bool ret = false;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetBoolean(index);
+ ret = m_reader->GetBoolean(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetBoolean")
return ret;
}
@@ -218,7 +218,7 @@
{
BYTE ret = 0;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetByte(index);
+ ret = m_reader->GetByte(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetByte")
return ret;
}
@@ -227,7 +227,7 @@
{
Ptr<MgDateTime> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetDateTime(index);
+ ret = m_reader->GetDateTime(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetDateTime")
return ret.Detach();
}
@@ -236,7 +236,7 @@
{
float ret = 0.0f;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetSingle(index);
+ ret = m_reader->GetSingle(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetSingle")
return ret;
}
@@ -245,7 +245,7 @@
{
double ret = 0.0;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetDouble(index);
+ ret = m_reader->GetDouble(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetDouble")
return ret;
}
@@ -254,7 +254,7 @@
{
INT16 ret = 0;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetInt16(index);
+ ret = m_reader->GetInt16(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetInt16")
return ret;
}
@@ -263,7 +263,7 @@
{
INT32 ret = 0;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetInt32(index);
+ ret = m_reader->GetInt32(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetInt32")
return ret;
}
@@ -272,7 +272,7 @@
{
INT64 ret = 0;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetInt64(index);
+ ret = m_reader->GetInt64(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetInt64")
return ret;
}
@@ -281,7 +281,7 @@
{
STRING ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetString(index);
+ ret = m_reader->GetString(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetString")
return ret;
}
@@ -290,7 +290,7 @@
{
Ptr<MgByteReader> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetBLOB(index);
+ ret = m_reader->GetBLOB(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetBLOB")
return ret.Detach();
}
@@ -299,7 +299,7 @@
{
Ptr<MgByteReader> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetCLOB(index);
+ ret = m_reader->GetCLOB(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetCLOB")
return ret.Detach();
}
@@ -308,14 +308,14 @@
{
Ptr<MgRaster> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetRaster(index);
+ ret = m_reader->GetRaster(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetRaster")
return ret.Detach();
}
INT32 MgdProjectedFeatureReader::GetReaderType()
{
- return m_reader->GetReaderType();
+ return m_reader->GetReaderType();
}
//EXTERNAL_API:
@@ -324,7 +324,7 @@
{
Ptr<MgByteReader> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->ToXml();
+ ret = m_reader->ToXml();
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::ToXml")
return ret.Detach();
}
@@ -349,20 +349,20 @@
const wchar_t* MgdProjectedFeatureReader::GetString(CREFSTRING propertyName, INT32& length)
{
- return m_reader->GetString(propertyName, length);
+ return m_reader->GetString(propertyName, length);
}
void MgdProjectedFeatureReader::Serialize(MgStream* stream)
{
MG_FEATURE_SERVICE_TRY()
- m_reader->Serialize(stream);
+ m_reader->Serialize(stream);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::Serialize")
}
void MgdProjectedFeatureReader::Deserialize(MgStream* stream)
{
MG_FEATURE_SERVICE_TRY()
- m_reader->Deserialize(stream);
+ m_reader->Deserialize(stream);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::Deserialize")
}
@@ -382,7 +382,7 @@
{
Ptr<MgClassDefinition> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetClassDefinitionNoXml();
+ ret = m_reader->GetClassDefinitionNoXml();
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetClassDefinitionNoXml")
return ret.Detach();
}
@@ -391,7 +391,7 @@
{
Ptr<MgFeatureReader> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetFeatureObject(propertyName);
+ ret = m_reader->GetFeatureObject(propertyName);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetFeatureObject")
return ret.Detach();
}
@@ -400,7 +400,7 @@
{
Ptr<MgFeatureReader> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetFeatureObject(index);
+ ret = m_reader->GetFeatureObject(index);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetFeatureObject")
return ret.Detach();
}
@@ -411,7 +411,7 @@
{
Ptr<MgFeatureSet> ret;
MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetFeatures(count);
+ ret = m_reader->GetFeatures(count);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdProjectedFeatureReader::GetFeatures")
return ret.Detach();
}
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -165,7 +165,7 @@
virtual void Deserialize(MgStream* stream);
- //MgFeatureReader
+ //MgFeatureReader
PUBLISHED_API:
virtual MgClassDefinition* GetClassDefinition();
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/RasterHelper.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/RasterHelper.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/RasterHelper.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -144,7 +144,7 @@
virtual INT32 DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter);
- virtual INT32 DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
+ virtual INT32 DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
virtual INT32 UpdateMatchingFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -8,7 +8,7 @@
MgdFeatureReader::MgdFeatureReader(MgdFeatureConnection* conn, FdoIFeatureReader* reader, MgStringCollection* forceIdProps)
{
- m_reader = FDO_SAFE_ADDREF(reader);
+ m_reader = FDO_SAFE_ADDREF(reader);
m_connection = SAFE_ADDREF(conn);
m_forceIdProps = SAFE_ADDREF(forceIdProps); //This is only passed in for select queries that involve the FDO Join APIs
@@ -18,33 +18,33 @@
MgdFeatureReader::~MgdFeatureReader()
{
- FDO_SAFE_RELEASE(m_reader);
+ FDO_SAFE_RELEASE(m_reader);
m_connection = NULL;
}
bool MgdFeatureReader::ReadNext()
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- ret = m_reader->ReadNext();
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::ReadNext")
- return ret;
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ ret = m_reader->ReadNext();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::ReadNext")
+ return ret;
}
bool MgdFeatureReader::IsNull(CREFSTRING propertyName)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- ret = m_reader->IsNull(propertyName.c_str());
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::IsNull")
- return ret;
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ ret = m_reader->IsNull(propertyName.c_str());
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::IsNull")
+ return ret;
}
bool MgdFeatureReader::GetBoolean(CREFSTRING propertyName)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- try
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = m_reader->GetBoolean(propertyName.c_str());
}
@@ -61,15 +61,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetBoolean")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetBoolean")
+ return ret;
}
BYTE MgdFeatureReader::GetByte(CREFSTRING propertyName)
{
- BYTE ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ BYTE ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (BYTE)m_reader->GetByte(propertyName.c_str());
}
@@ -86,15 +86,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetByte")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetByte")
+ return ret;
}
MgDateTime* MgdFeatureReader::GetDateTime(CREFSTRING propertyName)
{
- Ptr<MgDateTime> ret;
- MG_FEATURE_SERVICE_TRY()
- try
+ Ptr<MgDateTime> ret;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
FdoDateTime val = m_reader->GetDateTime(propertyName.c_str());
ret = new MgDateTime((INT16)val.year, (INT8)val.month, (INT8)val.day,
@@ -113,15 +113,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetDateTime")
- return ret.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetDateTime")
+ return ret.Detach();
}
float MgdFeatureReader::GetSingle(CREFSTRING propertyName)
{
- float ret = 0.0f;
- MG_FEATURE_SERVICE_TRY()
- try
+ float ret = 0.0f;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = m_reader->GetSingle(propertyName.c_str());
}
@@ -138,15 +138,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetSingle")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetSingle")
+ return ret;
}
double MgdFeatureReader::GetDouble(CREFSTRING propertyName)
{
- double ret = 0.0;
- MG_FEATURE_SERVICE_TRY()
- try
+ double ret = 0.0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = m_reader->GetDouble(propertyName.c_str());
}
@@ -163,15 +163,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetDouble")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetDouble")
+ return ret;
}
INT16 MgdFeatureReader::GetInt16(CREFSTRING propertyName)
{
- INT16 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ INT16 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (INT16)m_reader->GetInt16(propertyName.c_str());
}
@@ -188,15 +188,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt16")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt16")
+ return ret;
}
INT32 MgdFeatureReader::GetInt32(CREFSTRING propertyName)
{
- INT32 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ INT32 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (INT32)m_reader->GetInt32(propertyName.c_str());
}
@@ -213,15 +213,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt32")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt32")
+ return ret;
}
INT64 MgdFeatureReader::GetInt64(CREFSTRING propertyName)
{
- INT64 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ INT64 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (INT64)m_reader->GetInt64(propertyName.c_str());
}
@@ -238,15 +238,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt64")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt64")
+ return ret;
}
STRING MgdFeatureReader::GetString(CREFSTRING propertyName)
{
- STRING ret = L"";
- MG_FEATURE_SERVICE_TRY()
- try
+ STRING ret = L"";
+ MG_FEATURE_SERVICE_TRY()
+ try
{
INT32 length = 0;
const wchar_t* str = this->GetString(propertyName.c_str(), length);
@@ -268,14 +268,14 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetString")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetString")
+ return ret;
}
MgByteReader* MgdFeatureReader::GetBLOB(CREFSTRING propertyName)
{
- Ptr<MgByteReader> byteReader;
- MG_FEATURE_SERVICE_TRY()
+ Ptr<MgByteReader> byteReader;
+ MG_FEATURE_SERVICE_TRY()
try
{
FdoPtr<FdoLOBValue> fdoVal = m_reader->GetLOB(propertyName.c_str());
@@ -304,14 +304,14 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetBLOB")
- return byteReader.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetBLOB")
+ return byteReader.Detach();
}
MgByteReader* MgdFeatureReader::GetCLOB(CREFSTRING propertyName)
{
- Ptr<MgByteReader> byteReader;
- MG_FEATURE_SERVICE_TRY()
+ Ptr<MgByteReader> byteReader;
+ MG_FEATURE_SERVICE_TRY()
try
{
FdoPtr<FdoLOBValue> fdoVal = m_reader->GetLOB(propertyName.c_str());
@@ -340,14 +340,14 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetCLOB")
- return byteReader.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetCLOB")
+ return byteReader.Detach();
}
MgByteReader* MgdFeatureReader::GetGeometry(CREFSTRING propertyName)
{
- Ptr<MgByteReader> retVal;
- MG_FEATURE_SERVICE_TRY()
+ Ptr<MgByteReader> retVal;
+ MG_FEATURE_SERVICE_TRY()
try
{
FdoInt32 len = 0;
@@ -374,14 +374,14 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetGeometry")
- return retVal.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetGeometry")
+ return retVal.Detach();
}
//Didn't want to implement, but needed by the RS_FeatureReader
BYTE_ARRAY_OUT MgdFeatureReader::GetGeometry(CREFSTRING propertyName, INT32& length)
{
- CHECKNULL(m_reader, L"MgdFeatureReader::GetGeometry");
+ CHECKNULL(m_reader, L"MgdFeatureReader::GetGeometry");
const FdoByte* data = NULL;
@@ -415,17 +415,17 @@
//Didn't want to implement, but needed by the RS_FeatureReader
BYTE_ARRAY_OUT MgdFeatureReader::GetGeometry(INT32 index, INT32& length)
{
- BYTE_ARRAY_OUT ret = NULL;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ BYTE_ARRAY_OUT ret = NULL;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetGeometry(propertyName, length);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetGeometry")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetGeometry")
+ return ret;
}
MgRaster* MgdFeatureReader::GetRaster(CREFSTRING propertyName)
{
- Ptr<MgRaster> ret;
+ Ptr<MgRaster> ret;
MG_FEATURE_SERVICE_TRY()
@@ -446,7 +446,7 @@
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetRaster")
- return ret.Detach();
+ return ret.Detach();
}
MgByteReader* MgdFeatureReader::GetRaster(STRING rasterPropName, INT32 xSize, INT32 ySize)
@@ -479,142 +479,142 @@
bool MgdFeatureReader::IsNull(INT32 index)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = IsNull(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::IsNull")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::IsNull")
+ return ret;
}
bool MgdFeatureReader::GetBoolean(INT32 index)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetBoolean(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetBoolean")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetBoolean")
+ return ret;
}
BYTE MgdFeatureReader::GetByte(INT32 index)
{
- BYTE ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ BYTE ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetByte(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetByte")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetByte")
+ return ret;
}
MgDateTime* MgdFeatureReader::GetDateTime(INT32 index)
{
- Ptr<MgDateTime> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgDateTime> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetDateTime(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetDateTime")
- return ret.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetDateTime")
+ return ret.Detach();
}
float MgdFeatureReader::GetSingle(INT32 index)
{
- float ret = 0.0f;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ float ret = 0.0f;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetSingle(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetSingle")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetSingle")
+ return ret;
}
double MgdFeatureReader::GetDouble(INT32 index)
{
- double ret = 0.0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ double ret = 0.0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetDouble(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetDouble")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetDouble")
+ return ret;
}
INT16 MgdFeatureReader::GetInt16(INT32 index)
{
- INT16 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ INT16 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetInt16(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt16")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt16")
+ return ret;
}
INT32 MgdFeatureReader::GetInt32(INT32 index)
{
- INT32 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ INT32 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetInt32(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt32")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt32")
+ return ret;
}
INT64 MgdFeatureReader::GetInt64(INT32 index)
{
- INT64 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ INT64 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetInt64(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt64")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetInt64")
+ return ret;
}
STRING MgdFeatureReader::GetString(INT32 index)
{
- STRING ret = L"";
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ STRING ret = L"";
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetString(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetString")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetString")
+ return ret;
}
MgByteReader* MgdFeatureReader::GetBLOB(INT32 index)
{
- Ptr<MgByteReader> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgByteReader> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetBLOB(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetBLOB")
- return ret.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetBLOB")
+ return ret.Detach();
}
MgByteReader* MgdFeatureReader::GetCLOB(INT32 index)
{
- Ptr<MgByteReader> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgByteReader> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetCLOB(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetCLOB")
- return ret.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetCLOB")
+ return ret.Detach();
}
MgByteReader* MgdFeatureReader::GetGeometry(INT32 index)
{
- Ptr<MgByteReader> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgByteReader> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetGeometry(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetGeometry")
- return ret.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetGeometry")
+ return ret.Detach();
}
MgRaster* MgdFeatureReader::GetRaster(INT32 index)
{
- Ptr<MgRaster> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgRaster> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetRaster(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetRaster")
- return ret.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetRaster")
+ return ret.Detach();
}
void MgdFeatureReader::Close()
@@ -636,14 +636,14 @@
INT32 MgdFeatureReader::GetReaderType()
{
- return MgReaderType::FeatureReader;
+ return MgReaderType::FeatureReader;
}
//EXTERNAL_API:
MgByteReader* MgdFeatureReader::ToXml()
{
- throw new MgNotImplementedException(L"MgdFeatureReader::ToXml", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNotImplementedException(L"MgdFeatureReader::ToXml", __LINE__, __WFILE__, NULL, L"", NULL);
}
//INTERNAL_API:
@@ -666,7 +666,7 @@
const wchar_t* MgdFeatureReader::GetString(CREFSTRING propertyName, INT32& length)
{
- CHECKNULL(m_reader, L"MgdFeatureReader::GetString");
+ CHECKNULL(m_reader, L"MgdFeatureReader::GetString");
FdoString* retVal = NULL;
@@ -696,12 +696,12 @@
void MgdFeatureReader::Serialize(MgStream* stream)
{
- throw new MgNotImplementedException(L"MgdFeatureReader::Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNotImplementedException(L"MgdFeatureReader::Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
}
void MgdFeatureReader::Deserialize(MgStream* stream)
{
- throw new MgNotImplementedException(L"MgdFeatureReader::Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNotImplementedException(L"MgdFeatureReader::Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
}
//MgFeatureReader
@@ -774,7 +774,7 @@
//This is internal, but MgdMappingUtil needs it. So we have to implement it
MgClassDefinition* MgdFeatureReader::GetClassDefinitionNoXml()
{
- CHECKNULL(m_reader, L"MgdFeatureReader::GetClassDefinitionNoXml");
+ CHECKNULL(m_reader, L"MgdFeatureReader::GetClassDefinitionNoXml");
Ptr<MgClassDefinition> classDef;
@@ -830,9 +830,9 @@
MgFeatureReader* MgdFeatureReader::GetFeatureObject(CREFSTRING propertyName)
{
- Ptr<MgFeatureReader> reader;
+ Ptr<MgFeatureReader> reader;
- MG_FEATURE_SERVICE_TRY()
+ MG_FEATURE_SERVICE_TRY()
try
{
@@ -858,30 +858,30 @@
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetFeatureObject")
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetFeatureObject")
- return reader.Detach();
+ return reader.Detach();
}
MgFeatureReader* MgdFeatureReader::GetFeatureObject(INT32 index)
{
- Ptr<MgFeatureReader> ret;
+ Ptr<MgFeatureReader> ret;
- MG_FEATURE_SERVICE_TRY()
+ MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ STRING propertyName = GetPropertyName(index);
ret = GetFeatureObject(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetFeatureObject")
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureReader::GetFeatureObject")
- return ret.Detach();
+ return ret.Detach();
}
//INTERNAL_API:
MgFeatureSet* MgdFeatureReader::GetFeatures(INT32 count)
{
- throw new MgNotImplementedException(L"MgdFeatureReader::GetFeatures", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNotImplementedException(L"MgdFeatureReader::GetFeatures", __LINE__, __WFILE__, NULL, L"", NULL);
}
FdoIFeatureReader* MgdFeatureReader::GetInternalReader()
Modified: trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -13,12 +13,12 @@
class MG_DESKTOP_API MgdFeatureReader : public MgFeatureReader
{
INTERNAL_API:
- MgdFeatureReader(MgdFeatureConnection* conn, FdoIFeatureReader* reader, MgStringCollection* forceIdProps = NULL);
+ MgdFeatureReader(MgdFeatureConnection* conn, FdoIFeatureReader* reader, MgStringCollection* forceIdProps = NULL);
EXTERNAL_API:
- virtual ~MgdFeatureReader();
+ virtual ~MgdFeatureReader();
- //MgReader
+ //MgReader
PUBLISHED_API:
virtual bool ReadNext();
@@ -174,7 +174,7 @@
virtual void Deserialize(MgStream* stream);
- //MgFeatureReader
+ //MgFeatureReader
PUBLISHED_API:
virtual MgClassDefinition* GetClassDefinition();
@@ -197,13 +197,13 @@
MgByteReader* GetRaster(STRING rasterPropName, INT32 xSize, INT32 ySize);
protected:
- virtual void Dispose() { delete this; }
+ virtual void Dispose() { delete this; }
INTERNAL_API:
FdoIFeatureReader* GetInternalReader();
protected:
- FdoIFeatureReader* m_reader;
+ FdoIFeatureReader* m_reader;
Ptr<MgClassDefinition> m_classDef;
Ptr<MgdFeatureConnection> m_connection;
Ptr<MgStringCollection> m_forceIdProps;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -34,7 +34,7 @@
MgdFeatureService::~MgdFeatureService()
{
-
+
}
MgByteReader* MgdFeatureService::GetFeatureProviders()
@@ -65,7 +65,7 @@
MG_FEATURE_SERVICE_THROW()
- return reader.Detach();
+ return reader.Detach();
}
MgStringCollection* MgdFeatureService::GetConnectionPropertyValues(CREFSTRING providerName,
@@ -108,12 +108,12 @@
MG_FEATURE_SERVICE_THROW()
- return values.Detach();
+ return values.Detach();
}
bool MgdFeatureService::TestConnection(CREFSTRING providerName, CREFSTRING connectionString)
{
- bool ok = false;
+ bool ok = false;
MG_LOG_OPERATION_MESSAGE(L"TestConnection");
@@ -128,7 +128,7 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::TestConnection()");
- Ptr<MgdFeatureConnection> conn = new MgdFeatureConnection(providerName, connectionString);
+ Ptr<MgdFeatureConnection> conn = new MgdFeatureConnection(providerName, connectionString);
ok = conn->IsConnectionOpen();
// Successful operation
@@ -148,7 +148,7 @@
MG_FEATURE_SERVICE_THROW()
- return ok;
+ return ok;
}
bool MgdFeatureService::TestConnection(MgResourceIdentifier* resource)
@@ -168,8 +168,8 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::TestConnection()");
- Ptr<MgdFeatureConnection> conn = new MgdFeatureConnection(resource);
- ok = conn->IsConnectionOpen();
+ Ptr<MgdFeatureConnection> conn = new MgdFeatureConnection(resource);
+ ok = conn->IsConnectionOpen();
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
@@ -188,7 +188,7 @@
MG_FEATURE_SERVICE_THROW()
- return ok;
+ return ok;
}
MgByteReader* MgdFeatureService::GetCapabilities(CREFSTRING providerName)
@@ -206,7 +206,7 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::GetCapabilities()");
- ret = GetCapabilities(providerName, L"");
+ ret = GetCapabilities(providerName, L"");
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
@@ -265,7 +265,7 @@
MG_FEATURE_SERVICE_THROW()
- return caps.Detach();
+ return caps.Detach();
}
void MgdFeatureService::ApplySchema(MgResourceIdentifier* resource, MgFeatureSchema* schema)
@@ -357,7 +357,7 @@
MgStringCollection* findClassNames,
bool serialize)
{
- CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdFeatureService::DescribeSchema");
+ CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdFeatureService::DescribeSchema");
Ptr<MgFeatureSchemaCollection> fsCollection;
Ptr<MgFeatureSchemaCollection> clone;
@@ -436,7 +436,7 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::DescribeSchema()");
- ret = DescribeSchema(resource, schemaName, NULL);
+ ret = DescribeSchema(resource, schemaName, NULL);
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
@@ -523,7 +523,7 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::DescribeSchemaAsXml()");
- ret = DescribeSchemaAsXml(resource, schemaName, NULL);
+ ret = DescribeSchemaAsXml(resource, schemaName, NULL);
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
@@ -586,7 +586,7 @@
MgFeatureSchemaCollection* MgdFeatureService::XmlToSchema(CREFSTRING xml)
{
- Ptr<MgFeatureSchemaCollection> mgSchemaCol;
+ Ptr<MgFeatureSchemaCollection> mgSchemaCol;
MG_LOG_OPERATION_MESSAGE(L"XmlToSchema");
@@ -696,7 +696,7 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"STRING");
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MgdLogDetail logDetail(MgServiceType::FeatureService, MgdLogDetail::Trace, L"MgdFeatureService::SelectFeatures", mgStackParams);
+ MgdLogDetail logDetail(MgServiceType::FeatureService, MgdLogDetail::Trace, L"MgdFeatureService::SelectFeatures", mgStackParams);
logDetail.AddResourceIdentifier(L"Resource", resource);
logDetail.AddString(L"ClassName", className);
logDetail.AddObject(L"Options", options);
@@ -834,7 +834,7 @@
MG_FEATURE_SERVICE_TRY()
CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdFeatureService::SelectAggregate");
- CHECKARGUMENTNULL(options, L"MgdFeatureService::SelectAggregate");
+ CHECKARGUMENTNULL(options, L"MgdFeatureService::SelectAggregate");
MG_LOG_OPERATION_MESSAGE_INIT(MG_API_VERSION(1, 0, 0), 3);
MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
@@ -872,7 +872,7 @@
MG_FEATURE_SERVICE_THROW()
- return reader.Detach();
+ return reader.Detach();
}
MgPropertyCollection* MgdFeatureService::UpdateFeatures(MgResourceIdentifier* resource,
@@ -943,7 +943,7 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::UpdateFeatures()");
- CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdFeatureService::UpdateFeatures");
+ CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdFeatureService::UpdateFeatures");
CHECKARGUMENTNULL(commands, L"MgdFeatureService::UpdateFeatures");
MgdUpdateFeaturesCommand cmd;
@@ -989,7 +989,7 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::InsertFeatures()");
- MgdUpdateFeaturesCommand cmd;
+ MgdUpdateFeaturesCommand cmd;
ret = cmd.ExecuteInsert(resource, className, propertyValues, NULL);
// Successful operation
@@ -1054,7 +1054,7 @@
MG_FEATURE_SERVICE_THROW()
- return reader.Detach();
+ return reader.Detach();
}
MgFeatureReader* MgdFeatureService::InsertFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgBatchPropertyCollection* batchPropertyValues)
@@ -1205,7 +1205,7 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::UpdateMatchingFeatures()");
- ret = UpdateMatchingFeatures(resource, className, propertyValues, filter, NULL);
+ ret = UpdateMatchingFeatures(resource, className, propertyValues, filter, NULL);
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
@@ -1270,7 +1270,7 @@
MG_FEATURE_SERVICE_THROW()
- return updated;
+ return updated;
}
INT32 MgdFeatureService::DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter)
@@ -1293,7 +1293,7 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::DeleteFeatures()");
- MgdUpdateFeaturesCommand cmd;
+ MgdUpdateFeaturesCommand cmd;
deleted = cmd.ExecuteDelete(resource, className, filter, NULL);
// Successful operation
@@ -1357,7 +1357,7 @@
MG_FEATURE_SERVICE_THROW()
- return deleted;
+ return deleted;
}
void MgdFeatureService::PurgeCache(MgResourceIdentifier* resource)
@@ -1419,7 +1419,7 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::GetLockedFeatures()");
- MgdSelectFeatures select;
+ MgdSelectFeatures select;
ret = dynamic_cast<MgFeatureReader*>(select.SelectFeatures(resource, className, options, false, false, true));
CHECKNULL(ret.p, L"MgdFeatureService::GetLockedFeatures");
@@ -1502,7 +1502,7 @@
MG_LOG_TRACE_ENTRY(L"MgdFeatureService::ExecuteSqlQuery()");
- MgdSqlCommand cmd;
+ MgdSqlCommand cmd;
reader = cmd.ExecuteQuery(resource, sqlStatement, NULL, NULL);
// Successful operation
@@ -1522,7 +1522,7 @@
MG_FEATURE_SERVICE_THROW()
- return reader.Detach();
+ return reader.Detach();
}
MgSqlDataReader* MgdFeatureService::ExecuteSqlQuery(MgResourceIdentifier* resource,
@@ -1581,7 +1581,7 @@
Ptr<MgSqlDataReader> reader;
MG_FEATURE_SERVICE_TRY()
- CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdFeatureService::ExecuteSqlQuery");
+ CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdFeatureService::ExecuteSqlQuery");
if (sqlStatement.empty())
throw new MgInvalidArgumentException(L"MgdFeatureService::ExecuteSqlQuery", __LINE__, __WFILE__, NULL, L"", NULL);
@@ -1688,7 +1688,7 @@
MG_FEATURE_SERVICE_THROW()
- return ret;
+ return ret;
}
MgSpatialContextReader* MgdFeatureService::GetSpatialContexts(MgResourceIdentifier* resId, bool bActiveOnly)
@@ -1712,8 +1712,8 @@
logDetail.AddBool(L"ActiveOnly", bActiveOnly);
logDetail.Create();
- CHECK_FEATURE_SOURCE_ARGUMENT(resId, L"MgdFeatureService::GetSpatialContexts");
-
+ CHECK_FEATURE_SOURCE_ARGUMENT(resId, L"MgdFeatureService::GetSpatialContexts");
+
MgdGetSpatialContexts cmd;
mgSpatialContextReader = cmd.GetSpatialContexts(resId);
@@ -1774,7 +1774,7 @@
MG_FEATURE_SERVICE_THROW()
- return reader.Detach();
+ return reader.Detach();
}
bool MgdFeatureService::SetLongTransaction(MgResourceIdentifier* resource, CREFSTRING longTransactionName)
@@ -1795,12 +1795,12 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(longTransactionName.c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- Ptr<MgdFeatureConnection> connWrap = new MgdFeatureConnection(resource);
- FdoPtr<FdoIConnection> conn = connWrap->GetConnection();
- FdoPtr<FdoIActivateLongTransaction> activate = (FdoIActivateLongTransaction*)conn->CreateCommand(FdoCommandType_ActivateLongTransaction);
- activate->SetName(longTransactionName.c_str());
- activate->Execute();
- ok = true;
+ Ptr<MgdFeatureConnection> connWrap = new MgdFeatureConnection(resource);
+ FdoPtr<FdoIConnection> conn = connWrap->GetConnection();
+ FdoPtr<FdoIActivateLongTransaction> activate = (FdoIActivateLongTransaction*)conn->CreateCommand(FdoCommandType_ActivateLongTransaction);
+ activate->SetName(longTransactionName.c_str());
+ activate->Execute();
+ ok = true;
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
@@ -1819,7 +1819,7 @@
MG_FEATURE_SERVICE_THROW()
- return ok;
+ return ok;
}
MgStringCollection* MgdFeatureService::GetSchemas(MgResourceIdentifier* resource)
@@ -1953,8 +1953,8 @@
bool serialize)
{
CHECK_FEATURE_SOURCE_ARGUMENT(resource, L"MgdFeatureService::GetClassDefinition");
-
- Ptr<MgClassDefinition> classDefinition;
+
+ Ptr<MgClassDefinition> classDefinition;
Ptr<MgClassDefinition> clone;
MG_FEATURE_SERVICE_TRY()
@@ -2012,7 +2012,7 @@
MgByteReader* MgdFeatureService::DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
MgStringCollection* featureClasses)
{
- NOT_IMPLEMENTED(L"MgdFeatureService::DescribeWfsFeatureType");
+ NOT_IMPLEMENTED(L"MgdFeatureService::DescribeWfsFeatureType");
}
MgByteReader* MgdFeatureService::DescribeWfsFeatureType(MgResourceIdentifier* featureSourceId,
@@ -2020,7 +2020,7 @@
CREFSTRING namespacePrefix,
CREFSTRING namespaceUrl)
{
- NOT_IMPLEMENTED(L"MgdFeatureService::DescribeWfsFeatureType");
+ NOT_IMPLEMENTED(L"MgdFeatureService::DescribeWfsFeatureType");
}
MgByteReader* MgdFeatureService::GetWfsFeature(MgResourceIdentifier* featureSourceId,
@@ -2032,7 +2032,7 @@
{
Ptr<MgByteReader> ret;
MG_FEATURE_SERVICE_TRY()
- ret = GetWfsFeature(featureSourceId, featureClass, requiredProperties, srs, wfsFilter, maxFeatures, L"1.0.0", L"text/xml; subtype=gml/2.1.2", L"", L"", L"");
+ ret = GetWfsFeature(featureSourceId, featureClass, requiredProperties, srs, wfsFilter, maxFeatures, L"1.0.0", L"text/xml; subtype=gml/2.1.2", L"", L"", L"");
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdFeatureService::GetWfsFeature")
return ret;
}
@@ -2049,7 +2049,7 @@
CREFSTRING namespacePrefix,
CREFSTRING namespaceUrl)
{
- NOT_IMPLEMENTED(L"MgdFeatureService::GetWfsFeature");
+ NOT_IMPLEMENTED(L"MgdFeatureService::GetWfsFeature");
}
MgByteReader* MgdFeatureService::EnumerateDataStores(CREFSTRING providerName, CREFSTRING partialConnString)
@@ -2093,7 +2093,7 @@
{
Ptr<MgByteReader> byteReader;
- MG_LOG_OPERATION_MESSAGE(L"GetSchemaMapping");
+ MG_LOG_OPERATION_MESSAGE(L"GetSchemaMapping");
MG_FEATURE_SERVICE_TRY()
@@ -2361,7 +2361,7 @@
string utf8Text = MgUtil::WideCharToMultiByte(content);
Ptr<MgByteSource> byteSource = new MgByteSource((BYTE_ARRAY_IN) utf8Text.c_str(), (INT32)utf8Text.length());
byteSource->SetMimeType(MgMimeType::Xml);
- ret = byteSource->GetReader();
+ ret = byteSource->GetReader();
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
Modified: trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -35,13 +35,13 @@
DECLARE_CLASSNAME(MgdFeatureService)
INTERNAL_API:
- MgdFeatureService();
+ MgdFeatureService();
EXTERNAL_API:
- virtual ~MgdFeatureService();
+ virtual ~MgdFeatureService();
protected:
- virtual void Dispose() { delete this; }
+ virtual void Dispose() { delete this; }
PUBLISHED_API:
virtual MgByteReader* GetFeatureProviders();
@@ -181,7 +181,7 @@
virtual INT32 DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter);
- virtual INT32 DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
+ virtual INT32 DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
virtual INT32 UpdateMatchingFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/MappingService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/MappingService.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/MappingService.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -88,7 +88,7 @@
MgdConfigProperties::DefaultRenderingServicePropertyMaxRasterImageHeight);
// Set Mapping Service related properties
- pConf->GetIntValue(MgdConfigProperties::RenderingServicePropertiesSection,
+ pConf->GetIntValue(MgdConfigProperties::RenderingServicePropertiesSection,
MgdConfigProperties::RenderingServicePropertyRasterGridSizeForPlot,
m_rasterGridSizeForPlot,
MgdConfigProperties::DefaultRenderingServicePropertyRasterGridSizeForPlot);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/MappingService.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/MappingService.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/MappingService.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -65,14 +65,14 @@
private:
virtual MgByteReader* GenerateMultiPlotInternal(MgdMapPlotCollection* mapPlots, MgdDwfVersion* dwfVersion);
- bool FeatureTypeStyleSupportsGeomType(MdfModel::FeatureTypeStyle* fts, INT32 geomType);
+ bool FeatureTypeStyleSupportsGeomType(MdfModel::FeatureTypeStyle* fts, INT32 geomType);
// member data
Ptr<MgFeatureService> m_svcFeature;
Ptr<MgResourceService> m_svcResource;
Ptr<MgdDrawingService> m_svcDrawing;
Ptr<MgCoordinateSystemFactory> m_pCSFactory;
-
+
// Mapping Service configuration properties
INT32 m_rasterGridSizeForPlot;
INT32 m_minRasterGridSizeForPlot;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -5,13 +5,13 @@
MgdProfilingService::MgdProfilingService()
{
- Ptr<MgdServiceFactory> fact = new MgdServiceFactory();
- m_svcRendering = static_cast<MgdRenderingService*>(fact->CreateService(MgServiceType::RenderingService));
+ Ptr<MgdServiceFactory> fact = new MgdServiceFactory();
+ m_svcRendering = static_cast<MgdRenderingService*>(fact->CreateService(MgServiceType::RenderingService));
}
MgdProfilingService::~MgdProfilingService()
{
- SAFE_RELEASE(m_svcRendering);
+ SAFE_RELEASE(m_svcRendering);
}
MgByteReader* MgdProfilingService::ProfileRenderDynamicOverlay(
@@ -19,7 +19,7 @@
MgdSelection* selection,
MgdRenderingOptions* options)
{
- Ptr<MgByteReader> ret;
+ Ptr<MgByteReader> ret;
MG_TRY()
@@ -61,7 +61,7 @@
CREFSTRING format,
bool bKeepSelection)
{
- Ptr<MgByteReader> ret;
+ Ptr<MgByteReader> ret;
MG_TRY()
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -94,7 +94,7 @@
MgdProfilingService();
EXTERNAL_API:
- virtual ~MgdProfilingService();
+ virtual ~MgdProfilingService();
protected:
@@ -105,7 +105,7 @@
/// \return
/// The integer value
///
- virtual INT32 GetClassId() { return m_cls_id; }
+ virtual INT32 GetClassId() { return m_cls_id; }
//////////////////////////////////////////////////////////////////
/// \brief
@@ -114,10 +114,10 @@
/// \return
/// Nothing
///
- virtual void Dispose() { delete this; }
+ virtual void Dispose() { delete this; }
private:
- MgdRenderingService* m_svcRendering;
+ MgdRenderingService* m_svcRendering;
CLASS_ID:
static const INT32 m_cls_id = MapGuide_Desktop_ProfilingService_ProfilingService;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -352,7 +352,7 @@
bool selection,
bool extractColors,
ProfileRenderLayersResultBase* pPRLsResult,
- CancelStylization cancel)
+ CancelStylization cancel)
{
#ifdef _DEBUG
long dwStart = GetTickCount();
@@ -419,13 +419,13 @@
ldf.reset(MgLayerBase::GetLayerDefinition(svcResource, layerid));
Ptr<MgLayerGroup> group = mapLayer->GetGroup();
-
+
MgdLogDetail logDetail(MgServiceType::MappingService, MgdLogDetail::InternalTrace, L"MgdMappingUtil.StylizeLayers", mgStackParams);
logDetail.AddString(L"Map",map->GetName());
logDetail.AddResourceIdentifier(L"LayerId",layerid);
logDetail.Create();
-
+
//base map layers are not editable
bool bEditable = true;
if (mapLayer->GetLayerType() == MgLayerType::BaseMap)
@@ -863,7 +863,7 @@
// layer failed in addition to logging the error.
//MgServerManager* serverManager = MgServerManager::GetInstance();
//STRING locale = (NULL == serverManager)? MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
- STRING locale = MgResources::DefaultMessageLocale;
+ STRING locale = MgResources::DefaultMessageLocale;
// Get the layer that failed
MgStringCollection arguments;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -58,7 +58,7 @@
double scale,
bool selection = false,
bool extractColors = false,
- ProfileRenderLayersResultBase* = NULL,
+ ProfileRenderLayersResultBase* = NULL,
CancelStylization cancel = NULL);
static RSMgdFeatureReader* ExecuteFeatureQuery(MgFeatureService* svcFeature,
Modified: trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -760,7 +760,7 @@
{
//MgServerManager* serverManager = MgServerManager::GetInstance();
//STRING locale = (NULL == serverManager)? MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
- STRING locale = MgResources::DefaultMessageLocale;
+ STRING locale = MgResources::DefaultMessageLocale;
Ptr<MgResourceIdentifier> mapResId = map->GetMapDefinition();
pPRMResult->SetResourceId(mapResId ? mapResId->ToString() : L"");
@@ -1208,7 +1208,7 @@
{
//MgServerManager* serverManager = MgServerManager::GetInstance();
//STRING locale = (NULL == serverManager)? MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
- STRING locale = MgResources::DefaultMessageLocale;
+ STRING locale = MgResources::DefaultMessageLocale;
Ptr<MgResourceIdentifier> mapResId = map->GetMapDefinition();
pPRMResult->SetResourceId(mapResId ? mapResId->ToString() : L"");
@@ -1856,7 +1856,7 @@
// layer failed in addition to logging the error.
//MgServerManager* serverManager = MgServerManager::GetInstance();
//STRING locale = (NULL == serverManager)? MgResources::DefaultMessageLocale : serverManager->GetDefaultMessageLocale();
- STRING locale = MgResources::DefaultMessageLocale;
+ STRING locale = MgResources::DefaultMessageLocale;
//MG_LOG_EXCEPTION_ENTRY(mgException->GetExceptionMessage(locale).c_str(), mgException->GetStackTrace(locale).c_str());
#if defined(_DEBUG) || defined(_DEBUG_PNG8)
Modified: trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -15,7 +15,7 @@
namespace MdfModel
{
class FeatureTypeStyle;
- class ProfileRenderMapResult;
+ class ProfileRenderMapResult;
}
template class Ptr<MgdDrawingService>;
@@ -206,7 +206,7 @@
bool bKeepSelection,
bool renderWatermark,
MdfModel::ProfileRenderMapResult* pPRMResult = NULL);
-
+
MgByteReader* RenderMapInternal(MgdMap* map,
MgdSelection* selection,
MgReadOnlyLayerCollection* roLayers,
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -42,14 +42,14 @@
INT32 MgdResourceContentCache::GetCacheSize()
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, 0));
- return m_resourceContentCacheEntries.size();
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, 0));
+ return m_resourceContentCacheEntries.size();
}
void MgdResourceContentCache::Clear()
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
- m_resourceContentCacheEntries.clear();
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ m_resourceContentCacheEntries.clear();
}
void MgdResourceContentCache::RemoveContentEntry(MgResourceIdentifier* resource)
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -17,8 +17,8 @@
void RemoveContentEntry(MgResourceIdentifier* resource);
void PutContentEntry(MgResourceIdentifier* resource, CREFSTRING content);
- void Clear();
- INT32 GetCacheSize();
+ void Clear();
+ INT32 GetCacheSize();
protected:
virtual void Dispose() { delete this; }
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -24,10 +24,10 @@
MgdResourceService::MgdResourceService(CREFSTRING libraryContentRoot, CREFSTRING libraryDataRoot, CREFSTRING sessionContentRoot, CREFSTRING sessionDataRoot, CREFSTRING schemaPath)
: MgResourceService()
{
- m_libraryContentPath = libraryContentRoot;
- m_libraryDataPath = libraryDataRoot;
- m_sessionContentPath = sessionContentRoot;
- m_sessionDataPath = sessionDataRoot;
+ m_libraryContentPath = libraryContentRoot;
+ m_libraryDataPath = libraryDataRoot;
+ m_sessionContentPath = sessionContentRoot;
+ m_sessionDataPath = sessionDataRoot;
m_schemaPath = schemaPath;
}
@@ -35,42 +35,42 @@
MgByteReader* MgdResourceService::EnumerateRepositories(CREFSTRING repositoryType)
{
- NOT_IMPLEMENTED(L"MgdResourceService::EnumerateRepositories");
+ NOT_IMPLEMENTED(L"MgdResourceService::EnumerateRepositories");
}
void MgdResourceService::CreateRepository(MgResourceIdentifier* resource, MgByteReader* content, MgByteReader* header)
{
- NOT_IMPLEMENTED(L"MgdResourceService::CreateRepository");
+ NOT_IMPLEMENTED(L"MgdResourceService::CreateRepository");
}
void MgdResourceService::DeleteRepository(MgResourceIdentifier* resource)
{
- NOT_IMPLEMENTED(L"MgdResourceService::DeleteRepository");
+ NOT_IMPLEMENTED(L"MgdResourceService::DeleteRepository");
}
//PUBLISHED_API:
void MgdResourceService::UpdateRepository(MgResourceIdentifier* resource, MgByteReader* content, MgByteReader* header)
{
- NOT_IMPLEMENTED(L"MgdResourceService::UpdateRepository");
+ NOT_IMPLEMENTED(L"MgdResourceService::UpdateRepository");
}
STRING MgdResourceService::GetContentDirectory(MgResourceIdentifier* resId)
{
CHECKARGUMENTNULL(resId, L"MgdResourceService::ResolveContentPath");
- STRING type = resId->GetRepositoryType();
- STRING cntPath;
- if (type == L"Library")
- {
- // [ROOT]/Content/[path]/
+ STRING type = resId->GetRepositoryType();
+ STRING cntPath;
+ if (type == L"Library")
+ {
+ // [ROOT]/Content/[path]/
- STRING path = resId->GetPath();
- STRING type = resId->GetResourceType();
-
- cntPath = m_libraryContentPath;
- MgFileUtil::AppendSlashToEndOfPath(cntPath);
+ STRING path = resId->GetPath();
+ STRING type = resId->GetResourceType();
+
+ cntPath = m_libraryContentPath;
+ MgFileUtil::AppendSlashToEndOfPath(cntPath);
- cntPath += path;
+ cntPath += path;
MgFileUtil::AppendSlashToEndOfPath(cntPath);
if (MgResourceType::Folder == resId->GetResourceType())
@@ -79,23 +79,23 @@
MgFileUtil::AppendSlashToEndOfPath(cntPath);
}
- return cntPath;
- }
- else if (type == L"Session")
- {
- // [ROOT]/Content/[sessionID]/[path]/
+ return cntPath;
+ }
+ else if (type == L"Session")
+ {
+ // [ROOT]/Content/[sessionID]/[path]/
- STRING path = resId->GetPath();
- STRING type = resId->GetResourceType();
- STRING sessionId = resId->GetRepositoryName();
-
- cntPath = m_sessionContentPath;
- MgFileUtil::AppendSlashToEndOfPath(cntPath);
+ STRING path = resId->GetPath();
+ STRING type = resId->GetResourceType();
+ STRING sessionId = resId->GetRepositoryName();
+
+ cntPath = m_sessionContentPath;
+ MgFileUtil::AppendSlashToEndOfPath(cntPath);
- cntPath += sessionId;
- MgFileUtil::AppendSlashToEndOfPath(cntPath);
+ cntPath += sessionId;
+ MgFileUtil::AppendSlashToEndOfPath(cntPath);
- cntPath += path;
+ cntPath += path;
MgFileUtil::AppendSlashToEndOfPath(cntPath);
if (MgResourceType::Folder == resId->GetResourceType())
@@ -104,12 +104,12 @@
MgFileUtil::AppendSlashToEndOfPath(cntPath);
}
- return cntPath;
- }
- else
- {
- throw new MgInvalidArgumentException(L"MgdResourceService::ResolveContentPath", __LINE__, __WFILE__, NULL, L"", NULL);
- }
+ return cntPath;
+ }
+ else
+ {
+ throw new MgInvalidArgumentException(L"MgdResourceService::ResolveContentPath", __LINE__, __WFILE__, NULL, L"", NULL);
+ }
}
STRING MgdResourceService::ResolveContentPath(MgResourceIdentifier* resId)
@@ -120,7 +120,7 @@
CHECKARGUMENTNULL(resId, L"MgdResourceService::ResolveContentPath");
- path = GetContentDirectory(resId);
+ path = GetContentDirectory(resId);
STRING type = resId->GetResourceType();
if (MgResourceType::Folder != type)
{
@@ -146,61 +146,61 @@
STRING cntPath;
MG_RESOURCE_SERVICE_TRY()
- CHECKARGUMENTNULL(resId, L"MgdResourceService::ResolveDataPath");
+ CHECKARGUMENTNULL(resId, L"MgdResourceService::ResolveDataPath");
- STRING type = resId->GetRepositoryType();
- if (type == L"Library")
- {
- // [ROOT]/Data/[path]/[name].[resourceType]/
+ STRING type = resId->GetRepositoryType();
+ if (type == L"Library")
+ {
+ // [ROOT]/Data/[path]/[name].[resourceType]/
- STRING path = resId->GetPath();
- STRING type = resId->GetResourceType();
+ STRING path = resId->GetPath();
+ STRING type = resId->GetResourceType();
STRING resName = resId->GetName();
-
- cntPath = m_libraryDataPath;
- MgFileUtil::AppendSlashToEndOfPath(cntPath);
+
+ cntPath = m_libraryDataPath;
+ MgFileUtil::AppendSlashToEndOfPath(cntPath);
- cntPath += path;
+ cntPath += path;
MgFileUtil::AppendSlashToEndOfPath(cntPath);
cntPath += resName;
if (resId->GetResourceType() != MgResourceType::Folder)
{
- cntPath += L".";
- cntPath += type;
+ cntPath += L".";
+ cntPath += type;
}
- MgFileUtil::AppendSlashToEndOfPath(cntPath);
- }
- else if (type == L"Session")
- {
- // [ROOT]/Data/[sessionID]/[path].[resourceType]/
+ MgFileUtil::AppendSlashToEndOfPath(cntPath);
+ }
+ else if (type == L"Session")
+ {
+ // [ROOT]/Data/[sessionID]/[path].[resourceType]/
- STRING path = resId->GetPath();
- STRING type = resId->GetResourceType();
+ STRING path = resId->GetPath();
+ STRING type = resId->GetResourceType();
STRING resName = resId->GetName();
- STRING sessionId = resId->GetRepositoryName();
-
- cntPath = m_sessionDataPath;
- MgFileUtil::AppendSlashToEndOfPath(cntPath);
+ STRING sessionId = resId->GetRepositoryName();
+
+ cntPath = m_sessionDataPath;
+ MgFileUtil::AppendSlashToEndOfPath(cntPath);
- cntPath += sessionId;
- MgFileUtil::AppendSlashToEndOfPath(cntPath);
+ cntPath += sessionId;
+ MgFileUtil::AppendSlashToEndOfPath(cntPath);
- cntPath += path;
+ cntPath += path;
MgFileUtil::AppendSlashToEndOfPath(cntPath);
cntPath += resName;
if (resId->GetResourceType() != MgResourceType::Folder)
{
- cntPath += L".";
- cntPath += type;
+ cntPath += L".";
+ cntPath += type;
}
- MgFileUtil::AppendSlashToEndOfPath(cntPath);
- }
- else
- {
- throw new MgInvalidArgumentException(L"MgdResourceService::ResolveDataPath", __LINE__, __WFILE__, NULL, L"", NULL);
- }
+ MgFileUtil::AppendSlashToEndOfPath(cntPath);
+ }
+ else
+ {
+ throw new MgInvalidArgumentException(L"MgdResourceService::ResolveDataPath", __LINE__, __WFILE__, NULL, L"", NULL);
+ }
MgdLogDetail logDetail(MgServiceType::ResourceService, MgdLogDetail::InternalTrace, L"MgdResourceService::ResolveDataPath", mgStackParams);
logDetail.AddResourceIdentifier(L"resId", resId);
@@ -318,7 +318,7 @@
if (!MgFileUtil::IsDirectory(dir))
MgFileUtil::CreateDirectory(dir, false, true);
- STRING path = ResolveContentPath(resource);
+ STRING path = ResolveContentPath(resource);
if (NULL != content)
{
@@ -452,14 +452,14 @@
ReleasePotentialLocks(resource);
STRING contentPath = ResolveContentPath(resource);
- STRING dataPath = ResolveDataPath(resource);
- if (MgFileUtil::IsFile(contentPath))
- {
- MgFileUtil::DeleteFile(contentPath);
+ STRING dataPath = ResolveDataPath(resource);
+ if (MgFileUtil::IsFile(contentPath))
+ {
+ MgFileUtil::DeleteFile(contentPath);
- if (MgFileUtil::IsDirectory(dataPath))
- MgFileUtil::DeleteDirectory(dataPath);
- }
+ if (MgFileUtil::IsDirectory(dataPath))
+ MgFileUtil::DeleteDirectory(dataPath);
+ }
else if (MgFileUtil::IsDirectory(contentPath))
{
//For directory deletes, everything underneath
@@ -467,7 +467,7 @@
MgFileUtil::DeleteDirectory(contentPath, true);
if (MgFileUtil::IsDirectory(dataPath))
- MgFileUtil::DeleteDirectory(dataPath, true);
+ MgFileUtil::DeleteDirectory(dataPath, true);
}
}
// Successful operation
@@ -536,11 +536,11 @@
if (sourceResource->ToString() == destResource->ToString())
throw new MgInvalidArgumentException(L"MgdResourceService::CopyResource", __LINE__, __WFILE__, NULL, L"", NULL);
- if (!ResourceExists(sourceResource))
+ if (!ResourceExists(sourceResource))
{
MgStringCollection arguments;
arguments.Add(sourceResource->ToString());
- throw new MgResourceNotFoundException(L"MgdResourceService::CopyResource", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgResourceNotFoundException(L"MgdResourceService::CopyResource", __LINE__, __WFILE__, &arguments, L"", NULL);
}
if (ResourceExists(destResource) && !overwrite)
@@ -550,20 +550,20 @@
throw new MgDuplicateResourceException(L"MgdResourceService::CopyResource", __LINE__, __WFILE__, &arguments, L"", NULL);
}
- STRING srcContentPath = ResolveContentPath(sourceResource);
- STRING srcDataPath = ResolveDataPath(sourceResource);
- STRING dstContentPath = ResolveContentPath(destResource);
+ STRING srcContentPath = ResolveContentPath(sourceResource);
+ STRING srcDataPath = ResolveDataPath(sourceResource);
+ STRING dstContentPath = ResolveContentPath(destResource);
STRING dstContentDir = GetContentDirectory(destResource);
- STRING dstDataPath = ResolveDataPath(destResource);
+ STRING dstDataPath = ResolveDataPath(destResource);
- //Copy content
- if (!overwrite)
+ //Copy content
+ if (!overwrite)
{
if (!MgFileUtil::IsFile(dstContentPath))
{
if (!MgFileUtil::PathnameExists(dstContentDir))
MgFileUtil::CreateDirectory(dstContentDir, false, true);
- MgFileUtil::CopyFile(srcContentPath, dstContentPath, overwrite);
+ MgFileUtil::CopyFile(srcContentPath, dstContentPath, overwrite);
}
}
else
@@ -573,29 +573,29 @@
MgFileUtil::CreateDirectory(dstContentDir, false, true);
MgFileUtil::CopyFile(srcContentPath, dstContentPath, overwrite);
}
-
+
//Copy data files
if (MgFileUtil::IsDirectory(srcDataPath))
{
- Ptr<MgStringCollection> dataFiles = new MgStringCollection();
- MgFileUtil::GetFilesInDirectory(dataFiles, srcDataPath, false, true);
+ Ptr<MgStringCollection> dataFiles = new MgStringCollection();
+ MgFileUtil::GetFilesInDirectory(dataFiles, srcDataPath, false, true);
if (!MgFileUtil::IsDirectory(dstDataPath))
MgFileUtil::CreateDirectory(dstDataPath, false, true);
- for (int i = 0; i < dataFiles->GetCount(); i++)
- {
- STRING fileName = dataFiles->GetItem(i);
+ for (int i = 0; i < dataFiles->GetCount(); i++)
+ {
+ STRING fileName = dataFiles->GetItem(i);
- STRING src = srcDataPath + fileName;
- STRING dst = dstDataPath + fileName;
+ STRING src = srcDataPath + fileName;
+ STRING dst = dstDataPath + fileName;
//Overwrite flag not set and destination file exists
if (!overwrite && MgFileUtil::IsFile(dst))
continue;
- MgFileUtil::CopyFile(src, dst, overwrite);
- }
+ MgFileUtil::CopyFile(src, dst, overwrite);
+ }
}
// Successful operation
@@ -685,23 +685,23 @@
{
MgStringCollection arguments;
arguments.Add(sourceResource->ToString());
- throw new MgResourceNotFoundException(L"MgdResourceService::MoveResource", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgResourceNotFoundException(L"MgdResourceService::MoveResource", __LINE__, __WFILE__, &arguments, L"", NULL);
}
- STRING srcContentPath = ResolveContentPath(sourceResource);
- STRING srcDataPath = ResolveDataPath(sourceResource);
- STRING dstContentPath = ResolveContentPath(destResource);
+ STRING srcContentPath = ResolveContentPath(sourceResource);
+ STRING srcDataPath = ResolveDataPath(sourceResource);
+ STRING dstContentPath = ResolveContentPath(destResource);
STRING dstContentDir = GetContentDirectory(destResource);
- STRING dstDataPath = ResolveDataPath(destResource);
+ STRING dstDataPath = ResolveDataPath(destResource);
- //Copy content
+ //Copy content
if (!overwrite)
{
if (!MgFileUtil::IsFile(dstContentPath))
{
if (!MgFileUtil::PathnameExists(dstContentDir))
MgFileUtil::CreateDirectory(dstContentDir, false, true);
- MgFileUtil::CopyFile(srcContentPath, dstContentPath, overwrite);
+ MgFileUtil::CopyFile(srcContentPath, dstContentPath, overwrite);
}
}
else
@@ -711,29 +711,29 @@
MgFileUtil::CreateDirectory(dstContentDir, false, true);
MgFileUtil::CopyFile(srcContentPath, dstContentPath, overwrite);
}
-
+
//Copy data files
if (MgFileUtil::IsDirectory(srcDataPath))
{
- Ptr<MgStringCollection> dataFiles = new MgStringCollection();
- MgFileUtil::GetFilesInDirectory(dataFiles, srcDataPath, false, true);
+ Ptr<MgStringCollection> dataFiles = new MgStringCollection();
+ MgFileUtil::GetFilesInDirectory(dataFiles, srcDataPath, false, true);
if (!MgFileUtil::PathnameExists(dstDataPath))
MgFileUtil::CreateDirectory(dstDataPath, false, true);
- for (int i = 0; i < dataFiles->GetCount(); i++)
- {
- STRING fileName = dataFiles->GetItem(i);
+ for (int i = 0; i < dataFiles->GetCount(); i++)
+ {
+ STRING fileName = dataFiles->GetItem(i);
- STRING src = srcDataPath + fileName;
- STRING dst = dstDataPath + fileName;
+ STRING src = srcDataPath + fileName;
+ STRING dst = dstDataPath + fileName;
//Overwrite flag not set and destination file exists
if (!overwrite && MgFileUtil::IsFile(dst))
continue;
- MgFileUtil::CopyFile(src, dst, overwrite);
- }
+ MgFileUtil::CopyFile(src, dst, overwrite);
+ }
}
DeleteResource(sourceResource);
@@ -757,18 +757,18 @@
MgByteReader* MgdResourceService::GetResourceHeader(MgResourceIdentifier* resource)
{
- NOT_IMPLEMENTED(L"MgdResourceService::GetResourceHeader");
+ NOT_IMPLEMENTED(L"MgdResourceService::GetResourceHeader");
}
void MgdResourceService::ChangeResourceOwner(MgResourceIdentifier* resource,
CREFSTRING owner, bool includeDescendants)
{
- NOT_IMPLEMENTED(L"MgdResourceService::ChangeResourceOwner");
+ NOT_IMPLEMENTED(L"MgdResourceService::ChangeResourceOwner");
}
void MgdResourceService::InheritPermissionsFrom(MgResourceIdentifier* resource)
{
- NOT_IMPLEMENTED(L"MgdResourceService::InheritPermissionsFrom");
+ NOT_IMPLEMENTED(L"MgdResourceService::InheritPermissionsFrom");
}
void MgdResourceService::SetResourceData(MgResourceIdentifier* resource,
@@ -796,14 +796,14 @@
if (dataName.empty())
throw new MgNullArgumentException(L"MgdResourceService::SetResourceData", __LINE__, __WFILE__, NULL, L"", NULL);
- STRING path = ResolveDataPath(resource);
+ STRING path = ResolveDataPath(resource);
if (!MgFileUtil::IsDirectory(path))
MgFileUtil::CreateDirectory(path, false, true);
- path += dataName;
+ path += dataName;
- Ptr<MgByteSink> sink = new MgByteSink(data);
- sink->ToFile(path);
+ Ptr<MgByteSink> sink = new MgByteSink(data);
+ sink->ToFile(path);
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
@@ -844,10 +844,10 @@
throw new MgNullArgumentException(L"MgdResourceService::DeleteResourceData", __LINE__, __WFILE__, NULL, L"", NULL);
ReleasePotentialLocks(resource);
- STRING path = ResolveDataPath(resource);
- path += dataName;
+ STRING path = ResolveDataPath(resource);
+ path += dataName;
- if (!MgFileUtil::IsFile(path))
+ if (!MgFileUtil::IsFile(path))
throw new MgResourceDataNotFoundException(L"MgdResourceService::DeleteResourceData", __LINE__, __WFILE__, NULL, L"", NULL);
MgFileUtil::DeleteFile(path);
@@ -904,13 +904,13 @@
if (newDataName.empty())
throw new MgNullArgumentException(L"MgdResourceService::RenameResourceData", __LINE__, __WFILE__, NULL, L"", NULL);
- STRING path = ResolveDataPath(resource);
+ STRING path = ResolveDataPath(resource);
STRING src = path + oldDataName;
if (!MgFileUtil::IsFile(src))
throw new MgResourceDataNotFoundException(L"MgdResourceService::RenameResourceData", __LINE__, __WFILE__, NULL, L"", NULL);
- MgFileUtil::RenameFile(path, oldDataName, newDataName, overwrite);
+ MgFileUtil::RenameFile(path, oldDataName, newDataName, overwrite);
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
@@ -1340,30 +1340,30 @@
throw new MgResourceNotFoundException(L"MgdResourceService::EnumerateResourceData", __LINE__, __WFILE__, &arguments, L"", NULL);
}
- STRING path = ResolveDataPath(resource);
- STRING content = L"<ResourceDataList>\n";
+ STRING path = ResolveDataPath(resource);
+ STRING content = L"<ResourceDataList>\n";
if (MgFileUtil::IsDirectory(path))
{
Ptr<MgStringCollection> dataFiles = new MgStringCollection();
- MgFileUtil::GetFilesInDirectory(dataFiles, path, false, true);
- for (INT32 i = 0; i < dataFiles->GetCount(); i++)
- {
- content += L"\t<ResourceData>\n";
- content += L"\t\t<Name>";
- content += dataFiles->GetItem(i);
- content += L"</Name>\n";
- content += L"\t\t<Type>File</Type>\n";
- content += L"\t</ResourceData>\n";
- }
+ MgFileUtil::GetFilesInDirectory(dataFiles, path, false, true);
+ for (INT32 i = 0; i < dataFiles->GetCount(); i++)
+ {
+ content += L"\t<ResourceData>\n";
+ content += L"\t\t<Name>";
+ content += dataFiles->GetItem(i);
+ content += L"</Name>\n";
+ content += L"\t\t<Type>File</Type>\n";
+ content += L"\t</ResourceData>\n";
+ }
}
- content += L"</ResourceDataList>";
+ content += L"</ResourceDataList>";
std::string ccontent = MgUtil::WideCharToMultiByte(content);
- Ptr<MgByteSource> byteSource = new MgByteSource((unsigned char*)ccontent.c_str(), (INT32)ccontent.length());
+ Ptr<MgByteSource> byteSource = new MgByteSource((unsigned char*)ccontent.c_str(), (INT32)ccontent.length());
byteSource->SetMimeType(MgMimeType::Xml);
- reader = byteSource->GetReader();
+ reader = byteSource->GetReader();
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
@@ -1382,22 +1382,22 @@
MG_RESOURCE_SERVICE_THROW()
- return reader.Detach();
+ return reader.Detach();
}
MgByteReader* MgdResourceService::GetRepositoryContent(MgResourceIdentifier* resource)
{
- NOT_IMPLEMENTED(L"MgdResourceService::GetRepositoryContent");
+ NOT_IMPLEMENTED(L"MgdResourceService::GetRepositoryContent");
}
MgByteReader* MgdResourceService::GetRepositoryHeader(MgResourceIdentifier* resource)
{
- NOT_IMPLEMENTED(L"MgdResourceService::GetRepositoryHeader");
+ NOT_IMPLEMENTED(L"MgdResourceService::GetRepositoryHeader");
}
MgByteReader* MgdResourceService::EnumerateReferences(MgResourceIdentifier* resource)
{
- NOT_IMPLEMENTED(L"MgdResourceService::EnumerateReferences");
+ NOT_IMPLEMENTED(L"MgdResourceService::EnumerateReferences");
}
bool MgdResourceService::ResourceExists(MgResourceIdentifier* resource)
@@ -1416,13 +1416,13 @@
CHECKARGUMENTNULL(resource, L"MgdResourceService::ResourceExists");
- STRING path = ResolveContentPath(resource);
+ STRING path = ResolveContentPath(resource);
STRING type = resource->GetResourceType();
if (MgResourceType::Folder == type)
ret = MgFileUtil::IsDirectory(path);
else
- ret = MgFileUtil::IsFile(path);
+ ret = MgFileUtil::IsFile(path);
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
@@ -1511,7 +1511,7 @@
MG_LOG_TRACE_ENTRY(L"MgdResourceService::GetResourceContent()");
- CHECKARGUMENTNULL(resource, L"MgdResourceService::GetResourceContent");
+ CHECKARGUMENTNULL(resource, L"MgdResourceService::GetResourceContent");
STRING resType = resource->GetResourceType();
if (MgResourceType::Folder == resType ||
@@ -1584,7 +1584,7 @@
MG_RESOURCE_SERVICE_TRY()
- CHECKARGUMENTNULL(resource, L"MgdResourceService::GetResourceData");
+ CHECKARGUMENTNULL(resource, L"MgdResourceService::GetResourceData");
if (!ResourceExists(resource))
{
MgStringCollection arguments;
@@ -1595,13 +1595,13 @@
if (dataName.empty())
throw new MgNullArgumentException(L"MgdResourceService::GetResourceData", __LINE__, __WFILE__, NULL, L"", NULL);
- STRING path = ResolveDataPath(resource);
- path += dataName;
+ STRING path = ResolveDataPath(resource);
+ path += dataName;
- if (!MgFileUtil::IsFile(path))
- throw new MgResourceDataNotFoundException(L"MgdResourceService::GetResourceData", __LINE__, __WFILE__, NULL, L"", NULL);
+ if (!MgFileUtil::IsFile(path))
+ throw new MgResourceDataNotFoundException(L"MgdResourceService::GetResourceData", __LINE__, __WFILE__, NULL, L"", NULL);
- Ptr<MgByteSource> source;
+ Ptr<MgByteSource> source;
//As per MapGuide Server behaviour, if request is for MG_USER_CREDENTIALS return the decrypted username only
if (dataName == MgResourceDataName::UserCredentials)
@@ -1625,7 +1625,7 @@
else
{
source = new MgByteSource(path);
- reader = source->GetReader();
+ reader = source->GetReader();
if (preProcessTags == MgResourcePreProcessingType::Substitution)
{
@@ -1647,7 +1647,7 @@
MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgdResourceService::GetResourceData")
- return reader.Detach();
+ return reader.Detach();
}
MgByteReader* MgdResourceService::GetRawCredentials(MgResourceIdentifier* resource)
@@ -1667,8 +1667,8 @@
STRING path = ResolveDataPath(resource);
path += MgResourceDataName::UserCredentials;
- if (!MgFileUtil::IsFile(path))
- throw new MgResourceDataNotFoundException(L"MgdResourceService::GetResourceData", __LINE__, __WFILE__, NULL, L"", NULL);
+ if (!MgFileUtil::IsFile(path))
+ throw new MgResourceDataNotFoundException(L"MgdResourceService::GetResourceData", __LINE__, __WFILE__, NULL, L"", NULL);
Ptr<MgByteSource> source = new MgByteSource(path);
blob = source->GetReader();
@@ -1680,7 +1680,7 @@
MgDateTime* MgdResourceService::GetResourceModifiedDate(MgResourceIdentifier* resource)
{
- CHECKARGUMENTNULL(resource, L"MgdResourceService::GetResourceModifiedDate");
+ CHECKARGUMENTNULL(resource, L"MgdResourceService::GetResourceModifiedDate");
STRING path = ResolveContentPath(resource);
if (!MgFileUtil::IsFile(path))
@@ -1697,7 +1697,7 @@
MgSerializableCollection* MgdResourceService::EnumerateParentMapDefinitions(
MgSerializableCollection* resources)
{
- NOT_IMPLEMENTED(L"MgdResourceService::EnumerateParentMapDefinitions");
+ NOT_IMPLEMENTED(L"MgdResourceService::EnumerateParentMapDefinitions");
}
MgSerializableCollection* MgdResourceService::EnumerateParentTileSetDefinitions(MgSerializableCollection* resources)
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -89,8 +89,8 @@
virtual MgSerializableCollection* EnumerateParentTileSetDefinitions(MgSerializableCollection* resources);
STRING GetContentDirectory(MgResourceIdentifier* resId);
- STRING ResolveContentPath(MgResourceIdentifier* resId);
- STRING ResolveDataPath(MgResourceIdentifier* resId);
+ STRING ResolveContentPath(MgResourceIdentifier* resId);
+ STRING ResolveDataPath(MgResourceIdentifier* resId);
void DeleteSessionFiles();
void AddAliasMapping(CREFSTRING aliasName, CREFSTRING path);
@@ -102,7 +102,7 @@
virtual INT32 GetClassId() { return m_cls_id; }
protected:
- virtual void Dispose() { delete this; }
+ virtual void Dispose() { delete this; }
private:
MgByteReader* GetRawCredentials(MgResourceIdentifier* resource);
@@ -111,10 +111,10 @@
void WriteResourceFolderEntry(REFSTRING xml, INT32 maxDepth, STRING type, MgResourceIdentifier* resId, CREFSTRING enumeratedFolderId = L"");
void WriteResourceDocumentEntry(REFSTRING xml, MgResourceIdentifier* resId);
- STRING m_libraryContentPath;
- STRING m_libraryDataPath;
- STRING m_sessionContentPath;
- STRING m_sessionDataPath;
+ STRING m_libraryContentPath;
+ STRING m_libraryDataPath;
+ STRING m_sessionContentPath;
+ STRING m_sessionDataPath;
STRING m_schemaPath;
};
/// \}
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -8,7 +8,7 @@
MgdScrollableFeatureReader::MgdScrollableFeatureReader(MgdFeatureConnection* conn, FdoIScrollableFeatureReader* reader)
: MgdFeatureReader(conn, (FdoIFeatureReader*)reader)
{
- m_scrollReader = FDO_SAFE_ADDREF(reader);
+ m_scrollReader = FDO_SAFE_ADDREF(reader);
m_connection = SAFE_ADDREF(conn);
// The reader takes ownership of the FDO connection
@@ -17,7 +17,7 @@
MgdScrollableFeatureReader::~MgdScrollableFeatureReader()
{
- FDO_SAFE_RELEASE(m_scrollReader);
+ FDO_SAFE_RELEASE(m_scrollReader);
m_connection = NULL;
}
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -13,12 +13,12 @@
class MG_DESKTOP_API MgdScrollableFeatureReader : public MgdFeatureReader
{
INTERNAL_API:
- MgdScrollableFeatureReader(MgdFeatureConnection* conn, FdoIScrollableFeatureReader* reader);
+ MgdScrollableFeatureReader(MgdFeatureConnection* conn, FdoIScrollableFeatureReader* reader);
EXTERNAL_API:
- virtual ~MgdScrollableFeatureReader();
+ virtual ~MgdScrollableFeatureReader();
- //MgReader
+ //MgReader
PUBLISHED_API:
// --------- Scrollable API ----------- //
virtual INT32 Count();
@@ -36,13 +36,13 @@
virtual UINT32 IndexOf(MgPropertyCollection* key);
protected:
- virtual void Dispose() { delete this; }
+ virtual void Dispose() { delete this; }
INTERNAL_API:
FdoIScrollableFeatureReader* GetInternalReader();
private:
- FdoIScrollableFeatureReader* m_scrollReader;
+ FdoIScrollableFeatureReader* m_scrollReader;
};
/// \}
#endif
\ No newline at end of file
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ServiceFactory.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ServiceFactory.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ServiceFactory.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -75,8 +75,8 @@
return new MgdFeatureService();
case MgServiceType::MappingService:
return new MgdMappingService();
- case MgServiceType::ProfilingService:
- return new MgdProfilingService();
+ case MgServiceType::ProfilingService:
+ return new MgdProfilingService();
case MgServiceType::RenderingService:
return new MgdRenderingService();
case MgServiceType::ResourceService:
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -60,8 +60,8 @@
private:
static STRING sm_libContentPath;
static STRING sm_libDataPath;
- static STRING sm_sesContentPath;
- static STRING sm_sesDataPath;
+ static STRING sm_sesContentPath;
+ static STRING sm_sesDataPath;
static STRING sm_schemaPath;
};
/// \}
Modified: trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -5,7 +5,7 @@
MgdSqlDataReader::MgdSqlDataReader(MgdFeatureConnection* conn, FdoISQLDataReader* reader)
{
- m_reader = FDO_SAFE_ADDREF(reader);
+ m_reader = FDO_SAFE_ADDREF(reader);
m_connection = SAFE_ADDREF(conn);
// The reader takes ownership of the FDO connection
@@ -14,42 +14,42 @@
MgdSqlDataReader::~MgdSqlDataReader()
{
- FDO_SAFE_RELEASE(m_reader);
+ FDO_SAFE_RELEASE(m_reader);
m_connection = NULL;
}
bool MgdSqlDataReader::ReadNext()
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- ret = m_reader->ReadNext();
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::ReadNext")
- return ret;
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ ret = m_reader->ReadNext();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::ReadNext")
+ return ret;
}
INT32 MgdSqlDataReader::GetPropertyCount()
{
- INT32 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetColumnCount();
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetPropertyCount")
- return ret;
+ INT32 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ ret = m_reader->GetColumnCount();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetPropertyCount")
+ return ret;
}
STRING MgdSqlDataReader::GetPropertyName(INT32 index)
{
- STRING ret = L"";
- MG_FEATURE_SERVICE_TRY()
- FdoString* name = m_reader->GetColumnName(index);
- ret = STRING(name);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetPropertyName")
- return ret;
+ STRING ret = L"";
+ MG_FEATURE_SERVICE_TRY()
+ FdoString* name = m_reader->GetColumnName(index);
+ ret = STRING(name);
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetPropertyName")
+ return ret;
}
INT32 MgdSqlDataReader::GetPropertyType(CREFSTRING propertyName)
{
- INT32 type = MgPropertyType::Null;
+ INT32 type = MgPropertyType::Null;
MG_FEATURE_SERVICE_TRY()
@@ -69,27 +69,27 @@
INT32 MgdSqlDataReader::GetPropertyType(INT32 index)
{
- INT32 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- ret = m_reader->GetPropertyType(index);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetPropertyType")
- return ret;
+ INT32 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ ret = m_reader->GetPropertyType(index);
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetPropertyType")
+ return ret;
}
bool MgdSqlDataReader::IsNull(CREFSTRING propertyName)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- ret = m_reader->IsNull(propertyName.c_str());
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::IsNull")
- return ret;
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ ret = m_reader->IsNull(propertyName.c_str());
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::IsNull")
+ return ret;
}
bool MgdSqlDataReader::GetBoolean(CREFSTRING propertyName)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- try
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = m_reader->GetBoolean(propertyName.c_str());
}
@@ -106,15 +106,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetBoolean")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetBoolean")
+ return ret;
}
BYTE MgdSqlDataReader::GetByte(CREFSTRING propertyName)
{
- BYTE ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ BYTE ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (BYTE)m_reader->GetByte(propertyName.c_str());
}
@@ -131,15 +131,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetByte")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetByte")
+ return ret;
}
MgDateTime* MgdSqlDataReader::GetDateTime(CREFSTRING propertyName)
{
- Ptr<MgDateTime> mdt;
- MG_FEATURE_SERVICE_TRY()
- try
+ Ptr<MgDateTime> mdt;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
FdoDateTime val = m_reader->GetDateTime(propertyName.c_str());
mdt = new MgDateTime((INT16)val.year, (INT8)val.month, (INT8)val.day,
@@ -158,15 +158,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetByte")
- return mdt.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetByte")
+ return mdt.Detach();
}
float MgdSqlDataReader::GetSingle(CREFSTRING propertyName)
{
- float ret = 0.0f;
- MG_FEATURE_SERVICE_TRY()
- try
+ float ret = 0.0f;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = m_reader->GetSingle(propertyName.c_str());
}
@@ -183,15 +183,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetSingle")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetSingle")
+ return ret;
}
double MgdSqlDataReader::GetDouble(CREFSTRING propertyName)
{
- double ret = 0.0;
- MG_FEATURE_SERVICE_TRY()
- try
+ double ret = 0.0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = m_reader->GetDouble(propertyName.c_str());
}
@@ -208,15 +208,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetDouble")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetDouble")
+ return ret;
}
INT16 MgdSqlDataReader::GetInt16(CREFSTRING propertyName)
{
- INT16 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ INT16 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (INT16)m_reader->GetInt16(propertyName.c_str());
}
@@ -233,15 +233,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt16")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt16")
+ return ret;
}
INT32 MgdSqlDataReader::GetInt32(CREFSTRING propertyName)
{
- INT32 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ INT32 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (INT32)m_reader->GetInt32(propertyName.c_str());
}
@@ -258,15 +258,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt32")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt32")
+ return ret;
}
INT64 MgdSqlDataReader::GetInt64(CREFSTRING propertyName)
{
- INT64 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- try
+ INT64 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ try
{
ret = (INT64)m_reader->GetInt64(propertyName.c_str());
}
@@ -283,15 +283,15 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt64")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt64")
+ return ret;
}
STRING MgdSqlDataReader::GetString(CREFSTRING propertyName)
{
- STRING ret = L"";
- MG_FEATURE_SERVICE_TRY()
- try
+ STRING ret = L"";
+ MG_FEATURE_SERVICE_TRY()
+ try
{
INT32 length = 0;
const wchar_t* str = this->GetString(propertyName.c_str(), length);
@@ -313,14 +313,14 @@
else
throw;
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetString")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetString")
+ return ret;
}
MgByteReader* MgdSqlDataReader::GetBLOB(CREFSTRING propertyName)
{
- Ptr<MgByteReader> blob;
- MG_FEATURE_SERVICE_TRY()
+ Ptr<MgByteReader> blob;
+ MG_FEATURE_SERVICE_TRY()
FdoPtr<FdoLOBValue> fdoVal = m_reader->GetLOB(propertyName.c_str());
if (fdoVal != NULL)
{
@@ -333,14 +333,14 @@
blob = byteSource->GetReader();
}
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetBLOB")
- return blob.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetBLOB")
+ return blob.Detach();
}
MgByteReader* MgdSqlDataReader::GetCLOB(CREFSTRING propertyName)
{
- Ptr<MgByteReader> clob;
- MG_FEATURE_SERVICE_TRY()
+ Ptr<MgByteReader> clob;
+ MG_FEATURE_SERVICE_TRY()
FdoPtr<FdoLOBValue> fdoVal = m_reader->GetLOB(propertyName.c_str());
if (fdoVal != NULL)
{
@@ -353,14 +353,14 @@
clob = byteSource->GetReader();
}
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetCLOB")
- return clob.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetCLOB")
+ return clob.Detach();
}
MgByteReader* MgdSqlDataReader::GetGeometry(CREFSTRING propertyName)
{
- Ptr<MgByteReader> geom;
- MG_FEATURE_SERVICE_TRY()
+ Ptr<MgByteReader> geom;
+ MG_FEATURE_SERVICE_TRY()
FdoPtr<FdoByteArray> byteArray = m_reader->GetGeometry(propertyName.c_str());
INT32 len = (INT32)byteArray->GetCount();
const FdoByte* data = byteArray->GetData();
@@ -371,152 +371,152 @@
bSource->SetMimeType(MgMimeType::Agf);
geom = bSource->GetReader();
}
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetGeometry")
- return geom.Detach();
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetGeometry")
+ return geom.Detach();
}
INT32 MgdSqlDataReader::GetPropertyIndex(CREFSTRING propertyName)
{
- INT32 ret = -1;
- MG_FEATURE_SERVICE_TRY()
+ INT32 ret = -1;
+ MG_FEATURE_SERVICE_TRY()
ret = m_reader->GetColumnIndex(propertyName.c_str());
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetPropertyIndex")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetPropertyIndex")
+ return ret;
}
bool MgdSqlDataReader::IsNull(INT32 index)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = IsNull(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::IsNull")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::IsNull")
+ return ret;
}
bool MgdSqlDataReader::GetBoolean(INT32 index)
{
- bool ret = false;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ bool ret = false;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetBoolean(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetBoolean")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetBoolean")
+ return ret;
}
BYTE MgdSqlDataReader::GetByte(INT32 index)
{
- BYTE ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ BYTE ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetByte(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetByte")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetByte")
+ return ret;
}
MgDateTime* MgdSqlDataReader::GetDateTime(INT32 index)
{
- Ptr<MgDateTime> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgDateTime> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetDateTime(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetDateTime")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetDateTime")
+ return ret;
}
float MgdSqlDataReader::GetSingle(INT32 index)
{
- float ret = 0.0f;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ float ret = 0.0f;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetSingle(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetSingle")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetSingle")
+ return ret;
}
double MgdSqlDataReader::GetDouble(INT32 index)
{
- double ret = 0.0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ double ret = 0.0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetDouble(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetDouble")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetDouble")
+ return ret;
}
INT16 MgdSqlDataReader::GetInt16(INT32 index)
{
- INT16 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ INT16 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetInt16(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt16")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt16")
+ return ret;
}
INT32 MgdSqlDataReader::GetInt32(INT32 index)
{
- INT32 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ INT32 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetInt32(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt32")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt32")
+ return ret;
}
INT64 MgdSqlDataReader::GetInt64(INT32 index)
{
- INT64 ret = 0;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ INT64 ret = 0;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetInt64(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt64")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetInt64")
+ return ret;
}
STRING MgdSqlDataReader::GetString(INT32 index)
{
- STRING ret = L"";
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ STRING ret = L"";
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetString(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetString")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetString")
+ return ret;
}
MgByteReader* MgdSqlDataReader::GetBLOB(INT32 index)
{
- Ptr<MgByteReader> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgByteReader> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetBLOB(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetBLOB")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetBLOB")
+ return ret;
}
MgByteReader* MgdSqlDataReader::GetCLOB(INT32 index)
{
- Ptr<MgByteReader> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgByteReader> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetCLOB(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetCLOB")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetCLOB")
+ return ret;
}
MgByteReader* MgdSqlDataReader::GetGeometry(INT32 index)
{
- Ptr<MgByteReader> ret;
- MG_FEATURE_SERVICE_TRY()
- STRING propertyName = GetPropertyName(index);
+ Ptr<MgByteReader> ret;
+ MG_FEATURE_SERVICE_TRY()
+ STRING propertyName = GetPropertyName(index);
ret = GetGeometry(propertyName);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetGeometry")
- return ret;
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdSqlDataReader::GetGeometry")
+ return ret;
}
MgRaster* MgdSqlDataReader::GetRaster(INT32 index)
{
- throw new MgInvalidPropertyTypeException(L"MgdSqlDataReader::GetRaster",
+ throw new MgInvalidPropertyTypeException(L"MgdSqlDataReader::GetRaster",
__LINE__, __WFILE__, NULL, L"", NULL);
}
@@ -541,19 +541,19 @@
m_connection = NULL;
//MgdFdoConnectionUtil::CloseConnection(fdoConnection);
- MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::Close");
+ MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdDataReader::Close");
}
INT32 MgdSqlDataReader::GetReaderType()
{
- return MgReaderType::FeatureReader;
+ return MgReaderType::FeatureReader;
}
//EXTERNAL_API:
MgByteReader* MgdSqlDataReader::ToXml()
{
- throw new MgNotImplementedException(L"MgdSqlDataReader::ToXml", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNotImplementedException(L"MgdSqlDataReader::ToXml", __LINE__, __WFILE__, NULL, L"", NULL);
}
//INTERNAL_API:
@@ -643,10 +643,10 @@
void MgdSqlDataReader::Serialize(MgStream* stream)
{
- throw new MgNotImplementedException(L"MgdSqlDataReader::Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNotImplementedException(L"MgdSqlDataReader::Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
}
void MgdSqlDataReader::Deserialize(MgStream* stream)
{
- throw new MgNotImplementedException(L"MgdSqlDataReader::Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNotImplementedException(L"MgdSqlDataReader::Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
}
\ No newline at end of file
Modified: trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -10,7 +10,7 @@
class MG_DESKTOP_API MgdSqlDataReader : public MgSqlDataReader
{
INTERNAL_API:
- MgdSqlDataReader(MgdFeatureConnection* conn, FdoISQLDataReader* reader);
+ MgdSqlDataReader(MgdFeatureConnection* conn, FdoISQLDataReader* reader);
EXTERNAL_API:
virtual ~MgdSqlDataReader();
@@ -183,10 +183,10 @@
virtual void Deserialize(MgStream* stream);
protected:
- virtual void Dispose() { delete this; }
+ virtual void Dispose() { delete this; }
private:
- FdoISQLDataReader* m_reader;
+ FdoISQLDataReader* m_reader;
Ptr<MgdFeatureConnection> m_connection;
};
/// \}
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Transaction.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Transaction.cpp 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Transaction.cpp 2014-11-17 06:24:02 UTC (rev 8449)
@@ -11,14 +11,14 @@
m_conn = SAFE_ADDREF(conn);
FdoPtr<FdoIConnection> fdoConn = m_conn->GetConnection();
- m_trans = fdoConn->BeginTransaction();
- m_resource = SAFE_ADDREF(resource);
+ m_trans = fdoConn->BeginTransaction();
+ m_resource = SAFE_ADDREF(resource);
}
MgdTransaction::~MgdTransaction()
{
SAFE_RELEASE(m_conn);
- FDO_SAFE_RELEASE(m_trans);
- SAFE_RELEASE(m_resource);
+ FDO_SAFE_RELEASE(m_trans);
+ SAFE_RELEASE(m_resource);
}
FdoITransaction* MgdTransaction::GetFdoTransaction()
@@ -44,20 +44,20 @@
void MgdTransaction::Commit()
{
MG_FEATURE_SERVICE_TRY()
- m_trans->Commit();
+ m_trans->Commit();
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdTransaction::Commit")
}
void MgdTransaction::Rollback()
{
MG_FEATURE_SERVICE_TRY()
- m_trans->Rollback();
+ m_trans->Rollback();
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdTransaction::Rollback")
}
MgResourceIdentifier* MgdTransaction::GetFeatureSource()
{
- return SAFE_ADDREF(m_resource);
+ return SAFE_ADDREF(m_resource);
}
STRING MgdTransaction::AddSavePoint(CREFSTRING suggestName)
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Transaction.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Transaction.h 2014-11-14 09:48:43 UTC (rev 8448)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Transaction.h 2014-11-17 06:24:02 UTC (rev 8449)
@@ -10,8 +10,8 @@
class MG_DESKTOP_API MgdTransaction : public MgTransaction
{
INTERNAL_API:
- MgdTransaction(MgdFeatureConnection* conn, MgResourceIdentifier* resource);
- virtual ~MgdTransaction();
+ MgdTransaction(MgdFeatureConnection* conn, MgResourceIdentifier* resource);
+ virtual ~MgdTransaction();
FdoITransaction* GetFdoTransaction();
MgdFeatureConnection* GetConnection();
@@ -19,7 +19,7 @@
virtual void Deserialize(MgStream* stream);
PUBLISHED_API:
-
+
virtual STRING AddSavePoint(CREFSTRING suggestName);
virtual void ReleaseSavePoint(CREFSTRING savePointName);
@@ -33,11 +33,11 @@
virtual MgResourceIdentifier* GetFeatureSource();
protected:
- virtual void Dispose() { delete this; }
+ virtual void Dispose() { delete this; }
private:
- MgResourceIdentifier* m_resource;
- FdoITransaction* m_trans;
+ MgResourceIdentifier* m_resource;
+ FdoITransaction* m_trans;
MgdFeatureConnection* m_conn;
};
More information about the mapguide-commits
mailing list