[mapguide-commits] r7592 - in branches/2.4/MgDev: . Common/Stylization Desktop/MgDesktop/Services/Feature/Commands Server/src/Services/Feature Server/src/Services/Mapping Web/src/mapadmin/HelpDocs Web/src/mapviewerphp Web/src/viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Jun 9 08:43:05 PDT 2013
Author: jng
Date: 2013-06-09 08:43:05 -0700 (Sun, 09 Jun 2013)
New Revision: 7592
Modified:
branches/2.4/MgDev/
branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/DescribeSchema.cpp
branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/
branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
branches/2.4/MgDev/Web/src/viewerfiles/
branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js
Log:
Backport r7574 to 2.4
Property changes on: branches/2.4/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev:7349,7396,7531,7569-7570
/sandbox/rfc94:5099-5163
/trunk/MgDev:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev:7349,7396,7531,7569-7570,7574
/sandbox/rfc94:5099-5163
/trunk/MgDev:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Common/Stylization/SE_Renderer.cpp:7349,7396,7531,7569-7570
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Common/Stylization/SE_Renderer.cpp:7349,7396,7531,7569-7570,7574
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326,6611,6690,6746,7230-7231
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/DescribeSchema.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/DescribeSchema.cpp 2013-06-09 15:31:54 UTC (rev 7591)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Feature/Commands/DescribeSchema.cpp 2013-06-09 15:43:05 UTC (rev 7592)
@@ -1259,7 +1259,7 @@
///
bool MgdDescribeSchema::IsClassNameHintUsed(FdoIDescribeSchema* fdoCommand)
{
- CHECKNULL(fdoCommand, L"MgdDescribeSchema.IsClassNameHintUsed");
+ CHECKARGUMENTNULL(fdoCommand, L"MgdDescribeSchema.IsClassNameHintUsed");
FdoPtr<FdoStringCollection> classNames = fdoCommand->GetClassNames();
bool classNameHintUsed = (NULL != classNames.p);
@@ -1270,7 +1270,7 @@
///////////////////////////////////////////////////////////////////////////////
MgStringCollection* MgdDescribeSchema::GetSchemaNames(MgFeatureSchemaCollection* schemas)
{
- CHECKNULL(schemas, L"MgdDescribeSchema.GetSchemaNames");
+ CHECKARGUMENTNULL(schemas, L"MgdDescribeSchema.GetSchemaNames");
Ptr<MgStringCollection> schemaNames = new MgStringCollection();
INT32 schemaCount = schemas->GetCount();
@@ -1331,7 +1331,7 @@
///////////////////////////////////////////////////////////////////////////////
MgClassDefinition* MgdDescribeSchema::GetClassDefinition(MgFeatureSchemaCollection* schemas, CREFSTRING schemaName, CREFSTRING className)
{
- CHECKNULL(schemas, L"MgdDescribeSchema.GetClassDefinition");
+ CHECKARGUMENTNULL(schemas, L"MgdDescribeSchema.GetClassDefinition");
Ptr<MgClassDefinition> classDef;
INT32 schemaCount = schemas->GetCount();
@@ -1385,9 +1385,12 @@
FdoFeatureSchemaCollection* schemas, MgResourceIdentifier* resource,
CREFSTRING schemaName, CREFSTRING className)
{
- CHECKNULL(schemas, L"MgdDescribeSchema.GetIdentityProperties");
+ CHECKARGUMENTNULL(schemas, L"MgdDescribeSchema.GetIdentityProperties");
+ CHECKARGUMENTNULL(resource, L"MgdDescribeSchema.GetIdentityProperties");
+ Ptr<MgPropertyDefinitionCollection> idProps;
- Ptr<MgPropertyDefinitionCollection> idProps = new MgPropertyDefinitionCollection();
+ MG_FEATURE_SERVICE_TRY()
+ idProps = new MgPropertyDefinitionCollection();
INT32 schemaCount = schemas->GetCount();
// There should be at least one schema for the primary feature source.
@@ -1448,6 +1451,31 @@
}
}
+ MG_FEATURE_SERVICE_CATCH_WITH_FEATURE_SOURCE(L"MgdDescribeSchema.GetIdentityProperties", resource)
+
+ if (mgException != NULL)
+ {
+ //Sorry, if you're complaining about duplicate identity properties, then we need that thing called context
+ if (mgException->IsOfClass(Foundation_Exception_MgDuplicateObjectException))
+ {
+ STRING detail = mgException->GetDetails();
+ MgStringCollection args;
+ args.Add(resource->ToString());
+ STRING qualifiedClassName;
+ qualifiedClassName += schemaName;
+ qualifiedClassName += L":";
+ qualifiedClassName += className;
+ args.Add(qualifiedClassName);
+ args.Add(L"MgDuplicateObjectException"); //NOXLATE
+ args.Add(detail);
+
+ mgException = NULL;
+ mgException = new MgFeatureServiceException(L"MgdDescribeSchema.GetIdentityProperties", __LINE__, __WFILE__, NULL, L"MgFeatureSourceFormatInnerExceptionMessage", &args);
+ }
+ }
+
+ MG_FEATURE_SERVICE_THROW()
+
return idProps.Detach();
}
Property changes on: branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:7349,7396,7531,7569-7570
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:7349,7396,7531,7569-7570,7574
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326,6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:7349,7396,7531,7569-7570
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:7349,7396,7531,7569-7570,7574
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326,6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/mapadmin/HelpDocs
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs:7349,7396,7531,7569-7570
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs:7349,7396,7531,7569-7570,7574
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:7349,7396,7531,7569-7570
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:7349,7396,7531,7569-7570,7574
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326,6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:7349,7396,7531,7569-7570
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
/trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:7349,7396,7531,7569-7570,7574
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
/trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/viewerfiles
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/viewerfiles:7349,7396,7531,7569-7570
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
/trunk/MgDev/Web/src/viewerfiles:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/viewerfiles:7349,7396,7531,7569-7570,7574
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
/trunk/MgDev/Web/src/viewerfiles:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/viewerfiles/quickplot.js:7349,7396,7531,7569-7570
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/viewerfiles/quickplot.js:7349,7396,7531,7569-7570,7574
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326,6611,6690,6746,7230-7231
More information about the mapguide-commits
mailing list