[mapguide-commits] r7321 - in branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine: . inc
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Jan 19 19:18:52 PST 2013
Author: jng
Date: 2013-01-19 19:18:52 -0800 (Sat, 19 Jan 2013)
New Revision: 7321
Modified:
branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureQueryResults.cpp
branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureSourceQuery.cpp
branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsPreparedFeatureQuery.cpp
branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/inc/GwsQuery.h
Log:
Replace all references to SdfIScrollableFeatureReader and ShpIScrollableFeatureReader with FdoIScrollableFeatureReader (that both readers already implement). Similarly with SdfIExtendedSelect and ShpIExtendedSelect with FdoIExtendedSelect (again implemented by both)
This way, we can build the GwsQueryEngine just against the FDO core headers, where previously we also needed the SDF and SHP provider headers as well.
Modified: branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureQueryResults.cpp
===================================================================
--- branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureQueryResults.cpp 2013-01-20 00:54:30 UTC (rev 7320)
+++ branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureQueryResults.cpp 2013-01-20 03:18:52 UTC (rev 7321)
@@ -24,8 +24,6 @@
#include "stdafx.h"
#include "GwsQueryEngineImp.h"
#include "GwsBinaryFeatureWriter.h"
-#include "SDF/IScrollableFeatureReader.h"
-#include "SHP/IScrollableFeatureReader.h"
/////////////////////////////////////////////////////////////////////
@@ -75,13 +73,9 @@
if(dynamic_cast<FdoIScrollableFeatureReader*>(pReader) != NULL)
m_extProviderType = eFDO;
- else if(dynamic_cast<SdfIScrollableFeatureReader*>(pReader) != NULL)
- m_extProviderType = eSDF;
- else if(dynamic_cast<ShpIScrollableFeatureReader*>(pReader) != NULL)
- m_extProviderType = eSHP;
else if(dynamic_cast<CGwsFeatureIterator*>(pReader) != NULL)
m_extProviderType = eCGFI;
- else
+ else
m_bScrollableReader = false;
if (pReader)
@@ -714,10 +708,8 @@
CheckReader();
if(!m_bScrollableReader) GWS_THROW(eGwsNotSupported);
- if(dynamic_cast<SdfIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((SdfIScrollableFeatureReader*)m_reader.p)->Count();
- if(dynamic_cast<ShpIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((ShpIScrollableFeatureReader*)m_reader.p)->Count();
+ if(dynamic_cast<FdoIScrollableFeatureReader*>(m_reader.p) != NULL)
+ return ((FdoIScrollableFeatureReader*)m_reader.p)->Count();
if(dynamic_cast<CGwsFeatureIterator*>(m_reader.p) != NULL)
return ((CGwsFeatureIterator*)m_reader.p)->Count();
assert(false);
@@ -734,10 +726,8 @@
m_bMutableFeatureSet = false;
m_bGeometryConverted = false;
- if(dynamic_cast<SdfIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((SdfIScrollableFeatureReader*)m_reader.p)->ReadFirst();
- if(dynamic_cast<ShpIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((ShpIScrollableFeatureReader*)m_reader.p)->ReadFirst();
+ if(dynamic_cast<FdoIScrollableFeatureReader*>(m_reader.p) != NULL)
+ return ((FdoIScrollableFeatureReader*)m_reader.p)->ReadFirst();
if(dynamic_cast<CGwsFeatureIterator*>(m_reader.p) != NULL)
return ((CGwsFeatureIterator*)m_reader.p)->ReadFirst();
assert(false);
@@ -754,10 +744,8 @@
m_bMutableFeatureSet = false;
m_bGeometryConverted = false;
- if(dynamic_cast<SdfIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((SdfIScrollableFeatureReader*)m_reader.p)->ReadLast();
- if(dynamic_cast<ShpIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((ShpIScrollableFeatureReader*)m_reader.p)->ReadLast();
+ if(dynamic_cast<FdoIScrollableFeatureReader*>(m_reader.p) != NULL)
+ return ((FdoIScrollableFeatureReader*)m_reader.p)->ReadLast();
if(dynamic_cast<CGwsFeatureIterator*>(m_reader.p) != NULL)
return ((CGwsFeatureIterator*)m_reader.p)->ReadLast();
assert(false);
@@ -774,10 +762,8 @@
m_bMutableFeatureSet = false;
m_bGeometryConverted = false;
- if(dynamic_cast<SdfIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((SdfIScrollableFeatureReader*)m_reader.p)->ReadPrevious();
- if(dynamic_cast<ShpIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((ShpIScrollableFeatureReader*)m_reader.p)->ReadPrevious();
+ if(dynamic_cast<FdoIScrollableFeatureReader*>(m_reader.p) != NULL)
+ return ((FdoIScrollableFeatureReader*)m_reader.p)->ReadPrevious();
if(dynamic_cast<CGwsFeatureIterator*>(m_reader.p) != NULL)
return ((CGwsFeatureIterator*)m_reader.p)->ReadPrevious();
assert(false);
@@ -794,10 +780,8 @@
m_bMutableFeatureSet = false;
m_bGeometryConverted = false;
- if(dynamic_cast<SdfIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((SdfIScrollableFeatureReader*)m_reader.p)->ReadAt(key);
- if(dynamic_cast<ShpIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((ShpIScrollableFeatureReader*)m_reader.p)->ReadAt(key);
+ if(dynamic_cast<FdoIScrollableFeatureReader*>(m_reader.p) != NULL)
+ return ((FdoIScrollableFeatureReader*)m_reader.p)->ReadAt(key);
if(dynamic_cast<CGwsFeatureIterator*>(m_reader.p) != NULL)
return ((CGwsFeatureIterator*)m_reader.p)->ReadAt(key);
assert(false);
@@ -814,10 +798,8 @@
m_bMutableFeatureSet = false;
m_bGeometryConverted = false;
- if(dynamic_cast<SdfIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((SdfIScrollableFeatureReader*)m_reader.p)->ReadAtIndex(recordindex);
- if(dynamic_cast<ShpIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((ShpIScrollableFeatureReader*)m_reader.p)->ReadAtIndex(recordindex);
+ if(dynamic_cast<FdoIScrollableFeatureReader*>(m_reader.p) != NULL)
+ return ((FdoIScrollableFeatureReader*)m_reader.p)->ReadAtIndex(recordindex);
if(dynamic_cast<CGwsFeatureIterator*>(m_reader.p) != NULL)
return ((CGwsFeatureIterator*)m_reader.p)->ReadAtIndex(recordindex);
assert(false);
@@ -831,10 +813,8 @@
CheckReader();
if(!m_bScrollableReader) GWS_THROW(eGwsNotSupported);
- if(dynamic_cast<SdfIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((SdfIScrollableFeatureReader*)m_reader.p)->IndexOf(key);
- if(dynamic_cast<ShpIScrollableFeatureReader*>(m_reader.p) != NULL)
- return ((ShpIScrollableFeatureReader*)m_reader.p)->IndexOf(key);
+ if(dynamic_cast<FdoIScrollableFeatureReader*>(m_reader.p) != NULL)
+ return ((FdoIScrollableFeatureReader*)m_reader.p)->IndexOf(key);
if(dynamic_cast<CGwsFeatureIterator*>(m_reader.p) != NULL)
return ((CGwsFeatureIterator*)m_reader.p)->IndexOf(key);
assert(false);
@@ -848,8 +828,7 @@
CheckReader();
if(NULL == m_reader || !m_bScrollableReader)
return false;
- if( (NULL == dynamic_cast<SdfIScrollableFeatureReader*>(m_reader.p)) &&
- (NULL == dynamic_cast<ShpIScrollableFeatureReader*>(m_reader.p)) &&
+ if( (NULL == dynamic_cast<FdoIScrollableFeatureReader*>(m_reader.p)) &&
(NULL == dynamic_cast<CGwsFeatureIterator*>(m_reader.p)))
return false;
Modified: branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureSourceQuery.cpp
===================================================================
--- branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureSourceQuery.cpp 2013-01-20 00:54:30 UTC (rev 7320)
+++ branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureSourceQuery.cpp 2013-01-20 03:18:52 UTC (rev 7321)
@@ -23,8 +23,6 @@
#include "stdafx.h"
#include "GwsQueryEngineImp.h"
-#include <SDF/SdfCommandType.h>
-#include <SHP/ShpCommandType.h>
//Uncomment to see what join algorithm is used for the join operation
//
@@ -52,9 +50,7 @@
bool bSupportsExtendedSelect = false;
for(int i = 0; i < size; i++ )
{
- if( pTypes[i] == SdfCommandType_ExtendedSelect ||
- pTypes[i] == ShpCommandType_ExtendedSelect ||
- pTypes[i] == FdoCommandType_ExtendedSelect)
+ if( pTypes[i] == FdoCommandType_ExtendedSelect)
{
bSupportsExtendedSelect = true;
break;
Modified: branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsPreparedFeatureQuery.cpp
===================================================================
--- branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsPreparedFeatureQuery.cpp 2013-01-20 00:54:30 UTC (rev 7320)
+++ branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/GwsPreparedFeatureQuery.cpp 2013-01-20 03:18:52 UTC (rev 7321)
@@ -23,10 +23,6 @@
#include "stdafx.h"
#include "GwsQueryEngineImp.h"
-#include <SDF/IExtendedSelect.h>
-#include <SDF/SdfCommandType.h>
-#include <SHP/IExtendedSelect.h>
-#include <SHP/ShpCommandType.h>
#include "FdoExpressionEngineCopyFilter.h"
#include "FdoExpressionEngineFilterProcessor.h"
@@ -212,20 +208,6 @@
mExSelProv = eFDO;
break;
}
- if( pTypes[i] == SdfCommandType_ExtendedSelect)
- {
- m_bExtendedQuerySupported = true;
- selcmd = (SdfIExtendedSelect *) m_connection->CreateCommand (SdfCommandType_ExtendedSelect);
- mExSelProv = eSDF;
- break;
- }
- if( pTypes[i] == ShpCommandType_ExtendedSelect)
- {
- m_bExtendedQuerySupported = true;
- selcmd = (ShpIExtendedSelect *) m_connection->CreateCommand (ShpCommandType_ExtendedSelect);
- mExSelProv = eSHP;
- break;
- }
}
if(!m_bExtendedQuerySupported)
@@ -245,16 +227,6 @@
FdoIExtendedSelect* pExSelCmd = (FdoIExtendedSelect*)selcmd;
pExSelCmd->SetOrderingOption(orderBy->GetString(0), orderingOption);
}
- else if(mExSelProv == eSDF)
- {
- SdfIExtendedSelect* pExSelCmd = (SdfIExtendedSelect*)selcmd;
- pExSelCmd->SetOrderingOption(orderBy->GetString(0), orderingOption);
- }
- else if(mExSelProv == eSHP)
- {
- ShpIExtendedSelect* pExSelCmd = (ShpIExtendedSelect*)selcmd;
- pExSelCmd->SetOrderingOption(orderBy->GetString(0), orderingOption);
- }//etc.
}
else
{
@@ -426,10 +398,6 @@
{
if (mExSelProv == eFDO)
reader = ((FdoIExtendedSelect *)m_pCommand.p)->ExecuteScrollable();
- else if(mExSelProv == eSDF)
- reader = ((SdfIExtendedSelect *)m_pCommand.p)->ExecuteScrollable();
- else if(mExSelProv == eSHP)
- reader = ((ShpIExtendedSelect *)m_pCommand.p)->ExecuteScrollable();
}
//If extended query failed or was skipped, do standard query
if(NULL == reader)
Modified: branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/inc/GwsQuery.h
===================================================================
--- branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/inc/GwsQuery.h 2013-01-20 00:54:30 UTC (rev 7320)
+++ branches/2.5/MgDev/Server/src/Gws/GwsQueryEngine/inc/GwsQuery.h 2013-01-20 03:18:52 UTC (rev 7321)
@@ -269,7 +269,7 @@
GWSCoordinateSystem m_csname;
};
-typedef enum _GwsExtendedSelProvider { eSDF, eSHP, eCGFI, eFDO } EGwsExtendedSelProvider;
+typedef enum _GwsExtendedSelProvider { eCGFI, eFDO } EGwsExtendedSelProvider;
///////////////////////////////////////////////////////////////////////////////
More information about the mapguide-commits
mailing list