[mapguide-commits] r7306 - in trunk/MgDev/Desktop/MgDesktop/Services: . Feature
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Jan 12 10:51:12 PST 2013
Author: jng
Date: 2013-01-12 10:51:11 -0800 (Sat, 12 Jan 2013)
New Revision: 7306
Modified:
trunk/MgDev/Desktop/MgDesktop/Services/DataReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/DataReader.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProxyDataReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProxyDataReader.h
trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.h
trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.h
trunk/MgDev/Desktop/MgDesktop/Services/TileService.cpp
Log:
Fix mg-desktop build post-RFC130
Modified: trunk/MgDev/Desktop/MgDesktop/Services/DataReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/DataReader.cpp 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/DataReader.cpp 2013-01-12 18:51:11 UTC (rev 7306)
@@ -671,6 +671,22 @@
//INTERNAL_API:
+string MgdDataReader::GetResponseElementName() { NOT_IMPLEMENTED(L"MgdDataReader::GetResponseElementName"); }
+
+string MgdDataReader::GetBodyElementName() { NOT_IMPLEMENTED(L"MgdDataReader::GetResponseElementName"); }
+
+void MgdDataReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdDataReader::GetResponseElementName"); }
+
+void MgdDataReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdDataReader::GetResponseElementName"); }
+
+void MgdDataReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdDataReader::GetResponseElementName"); }
+
+void MgdDataReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdDataReader::GetResponseElementName"); }
+
+void MgdDataReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdDataReader::CurrentToStringUtf8"); }
+
+void MgdDataReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdDataReader::HeaderToStringUtf8"); }
+
const wchar_t* MgdDataReader::GetString(CREFSTRING propertyName, INT32& length)
{
FdoString* retVal;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/DataReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/DataReader.h 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/DataReader.h 2013-01-12 18:51:11 UTC (rev 7306)
@@ -95,6 +95,86 @@
INTERNAL_API:
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetResponseElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the body starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetBodyElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the header in this reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void HeaderToStringUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the current record/feature in the reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void CurrentToStringUtf8(string& str);
+
virtual const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
virtual void Serialize(MgStream* stream);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.cpp 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.cpp 2013-01-12 18:51:11 UTC (rev 7306)
@@ -729,24 +729,79 @@
{
// TODO: define a schema for this XML
// TODO: rename FeatureSet element to avoid conflict with FeatureSet-1.0.0.xsd?
- str += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
- str += "<FeatureSet>";
- classDef->ToXml(str);
- str += "<Features>";
+ ResponseStartUtf8(str);
+ HeaderToStringUtf8(str);
+ BodyStartUtf8(str);
while ( this->ReadNext() )
{
- Ptr<MgPropertyCollection> propCol = m_set->GetFeatureAt(m_currRecord-1);
- INT32 cnt = propCol->GetCount();
- if (propCol != NULL && cnt > 0)
- {
- propCol->ToFeature(str);
- }
+ CurrentToStringUtf8(str);
}
- str += "</Features>";
- str += "</FeatureSet>";
+ BodyEndUtf8(str);
+ ResponseEndUtf8(str);
}
}
+string MgdFeatureSetReader::GetResponseElementName()
+{
+ return "FeatureSet";
+}
+
+string MgdFeatureSetReader::GetBodyElementName()
+{
+ return "Features";
+}
+
+void MgdFeatureSetReader::ResponseStartUtf8(string& str)
+{
+ str += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+ str += "<";
+ str += GetResponseElementName();
+ str += ">";
+}
+
+void MgdFeatureSetReader::ResponseEndUtf8(string& str)
+{
+ str += "</";
+ str += GetResponseElementName();
+ str += ">";
+}
+
+void MgdFeatureSetReader::BodyStartUtf8(string& str)
+{
+ str += "<";
+ str += GetBodyElementName();
+ str += ">";
+}
+
+void MgdFeatureSetReader::BodyEndUtf8(string& str)
+{
+ str += "</";
+ str += GetBodyElementName();
+ str += ">";
+}
+
+void MgdFeatureSetReader::HeaderToStringUtf8(string& str)
+{
+ Ptr<MgClassDefinition> classDef = this->GetClassDefinition();
+ if (classDef != NULL)
+ {
+ classDef->ToXml(str);
+ }
+}
+
+void MgdFeatureSetReader::CurrentToStringUtf8(string& str)
+{
+ if (NULL != (MgFeatureSet*)m_set)
+ {
+ Ptr<MgPropertyCollection> propCol = m_set->GetFeatureAt(m_currRecord-1);
+ INT32 cnt = propCol->GetCount();
+ if (propCol != NULL && cnt > 0)
+ {
+ propCol->ToFeature(str);
+ }
+ }
+}
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// Releases all the resources of feature reader.
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h 2013-01-12 18:51:11 UTC (rev 7306)
@@ -81,6 +81,86 @@
INTERNAL_API:
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetResponseElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the body starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetBodyElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the header in this reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void HeaderToStringUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the current record/feature in the reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void CurrentToStringUtf8(string& str);
+
virtual const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
virtual const wchar_t* GetString(INT32 index, INT32& length);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.cpp 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.cpp 2013-01-12 18:51:11 UTC (rev 7306)
@@ -1262,7 +1262,22 @@
__LINE__, __WFILE__, NULL, L"", NULL);
}
+string MgdGwsFeatureReader::GetResponseElementName() { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
+string MgdGwsFeatureReader::GetBodyElementName() { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
+
+void MgdGwsFeatureReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
+
+void MgdGwsFeatureReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
+
+void MgdGwsFeatureReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
+
+void MgdGwsFeatureReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
+
+void MgdGwsFeatureReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::CurrentToStringUtf8"); }
+
+void MgdGwsFeatureReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::HeaderToStringUtf8"); }
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// Releases all the resources of feature reader.
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h 2013-01-12 18:51:11 UTC (rev 7306)
@@ -410,6 +410,86 @@
INTERNAL_API:
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetResponseElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the body starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetBodyElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the header in this reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void HeaderToStringUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the current record/feature in the reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void CurrentToStringUtf8(string& str);
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// Gets the definition of the object currently being read. If the user
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp 2013-01-12 18:51:11 UTC (rev 7306)
@@ -331,6 +331,22 @@
//INTERNAL_API:
+string MgdProjectedFeatureReader::GetResponseElementName() { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
+
+string MgdProjectedFeatureReader::GetBodyElementName() { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
+
+void MgdProjectedFeatureReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
+
+void MgdProjectedFeatureReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
+
+void MgdProjectedFeatureReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
+
+void MgdProjectedFeatureReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
+
+void MgdProjectedFeatureReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::CurrentToStringUtf8"); }
+
+void MgdProjectedFeatureReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::HeaderToStringUtf8"); }
+
const wchar_t* MgdProjectedFeatureReader::GetString(CREFSTRING propertyName, INT32& length)
{
return m_reader->GetString(propertyName, length);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h 2013-01-12 18:51:11 UTC (rev 7306)
@@ -79,6 +79,86 @@
INTERNAL_API:
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetResponseElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the body starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetBodyElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the header in this reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void HeaderToStringUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the current record/feature in the reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void CurrentToStringUtf8(string& str);
+
virtual const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
virtual void Serialize(MgStream* stream);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProxyDataReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProxyDataReader.cpp 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProxyDataReader.cpp 2013-01-12 18:51:11 UTC (rev 7306)
@@ -701,6 +701,68 @@
str += "</PropertySet>";
}
+string MgdProxyDataReader::GetResponseElementName()
+{
+ return "PropertySet";
+}
+
+string MgdProxyDataReader::GetBodyElementName()
+{
+ return "Properties";
+}
+
+void MgdProxyDataReader::ResponseStartUtf8(string& str)
+{
+ str += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+ str += "<";
+ str += GetResponseElementName();
+ str += ">";
+}
+
+void MgdProxyDataReader::ResponseEndUtf8(string& str)
+{
+ str += "</";
+ str += GetResponseElementName();
+ str += ">";
+}
+
+void MgdProxyDataReader::BodyStartUtf8(string& str)
+{
+ str += "<";
+ str += GetBodyElementName();
+ str += ">";
+}
+
+void MgdProxyDataReader::BodyEndUtf8(string& str)
+{
+ str += "</";
+ str += GetBodyElementName();
+ str += ">";
+}
+
+void MgdProxyDataReader::HeaderToStringUtf8(string& str)
+{
+ if (NULL != (MgPropertyDefinitionCollection*)m_propDefCol)
+ {
+ m_propDefCol->ToXml(str);
+ }
+}
+
+void MgdProxyDataReader::CurrentToStringUtf8(string& str)
+{
+ if (NULL != (MgBatchPropertyCollection*)m_set)
+ {
+ Ptr<MgPropertyCollection> propCol = m_set->GetItem(m_currRecord-1);
+ INT32 cnt = propCol->GetCount();
+ if (propCol != NULL && cnt > 0)
+ {
+ str += "<PropertyCollection>";
+ propCol->ToXml(str, false);
+ str += "</PropertyCollection>";
+ }
+ }
+}
+
void MgdProxyDataReader::SetService(MgFeatureService* service)
{
CHECKNULL(service, L"MgdProxyDataReader.SetService");
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProxyDataReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProxyDataReader.h 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/ProxyDataReader.h 2013-01-12 18:51:11 UTC (rev 7306)
@@ -516,6 +516,86 @@
INTERNAL_API:
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetResponseElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the body starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetBodyElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the header in this reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void HeaderToStringUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the current record/feature in the reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void CurrentToStringUtf8(string& str);
+
//////////////////////////////////////////////////////////////////
/// \brief
/// Gets the string value of the specified property. No conversion is
Modified: trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.cpp 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.cpp 2013-01-12 18:51:11 UTC (rev 7306)
@@ -647,6 +647,22 @@
//INTERNAL_API:
+string MgdFeatureReader::GetResponseElementName() { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+
+string MgdFeatureReader::GetBodyElementName() { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+
+void MgdFeatureReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+
+void MgdFeatureReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+
+void MgdFeatureReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+
+void MgdFeatureReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+
+void MgdFeatureReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+
+void MgdFeatureReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+
const wchar_t* MgdFeatureReader::GetString(CREFSTRING propertyName, INT32& length)
{
CHECKNULL(m_reader, L"MgdFeatureReader::GetString");
Modified: trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.h 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/FeatureReader.h 2013-01-12 18:51:11 UTC (rev 7306)
@@ -88,6 +88,86 @@
INTERNAL_API:
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetResponseElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the body starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetBodyElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the header in this reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void HeaderToStringUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the current record/feature in the reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void CurrentToStringUtf8(string& str);
+
virtual const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
virtual void Serialize(MgStream* stream);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.cpp 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.cpp 2013-01-12 18:51:11 UTC (rev 7306)
@@ -558,6 +558,22 @@
//INTERNAL_API:
+string MgdSqlDataReader::GetResponseElementName() { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
+
+string MgdSqlDataReader::GetBodyElementName() { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
+
+void MgdSqlDataReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
+
+void MgdSqlDataReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
+
+void MgdSqlDataReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
+
+void MgdSqlDataReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
+
+void MgdSqlDataReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::CurrentToStringUtf8"); }
+
+void MgdSqlDataReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::HeaderToStringUtf8"); }
+
MgByteReader* MgdSqlDataReader::GetLOB(CREFSTRING propertyName)
{
Ptr<MgByteReader> byteReader;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.h 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/SqlReader.h 2013-01-12 18:51:11 UTC (rev 7306)
@@ -94,6 +94,86 @@
INTERNAL_API:
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetResponseElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the body starting element name as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual string GetBodyElementName();
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void ResponseEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the start of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyStartUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the end of the response body as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void BodyEndUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the header in this reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void HeaderToStringUtf8(string& str);
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
+ /// Returns the contents of the current record/feature in the reader as a UTF-8 string. The mime
+ /// type must be a text type, for example text/xml.
+ ///
+ /// \param str
+ /// Destination string.
+ ///
+ virtual void CurrentToStringUtf8(string& str);
+
MgByteReader* GetLOB(CREFSTRING propertyName);
virtual const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/TileService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/TileService.cpp 2013-01-12 17:28:02 UTC (rev 7305)
+++ trunk/MgDev/Desktop/MgDesktop/Services/TileService.cpp 2013-01-12 18:51:11 UTC (rev 7306)
@@ -75,7 +75,7 @@
bool MgdTileService::DetectTileLockFile(CREFSTRING lockPathname)
{
bool found = false;
- struct _stat lockFileInfo;
+ struct _stat64 lockFileInfo;
// Check the lock file to see if another thread/process is writing the tile file.
while (MgFileUtil::GetFileStatus(lockPathname, lockFileInfo))
More information about the mapguide-commits
mailing list