[mapguide-commits] r9342 - in trunk/MgDev: . Server/src/Services/Feature

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-03-03 05:04:01 -0800 (Sat, 03 Mar 2018)
New Revision: 9342

Modified:
   trunk/MgDev/
   trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp
Log:
Merged revision(s) 9140 from sandbox/adsk/3.2o.AIMS:
Ignore abstract classes when DescribeSchema because they should not be visible to consumer.
........


Index: trunk/MgDev
===================================================================
--- trunk/MgDev	2018-03-03 13:03:09 UTC (rev 9341)
+++ trunk/MgDev	2018-03-03 13:04:01 UTC (rev 9342)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -6,7 +6,7 ##
 /sandbox/adsk/2.6l:8727
 /sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
 /sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
-/sandbox/adsk/3.2o.AIMS:9135-9139
+/sandbox/adsk/3.2o.AIMS:9135-9140
 /sandbox/jng/clean_json:8818-9180
 /sandbox/jng/cmake_v2:9259-9317
 /sandbox/jng/cmdline:9199-9217
Modified: trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp	2018-03-03 13:03:09 UTC (rev 9341)
+++ trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp	2018-03-03 13:04:01 UTC (rev 9342)
@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2004-2011 by Autodesk, Inc.
+//  Copyright (C) 2017 by Autodesk, Inc.
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of version 2.1 of the GNU Lesser
@@ -283,8 +283,9 @@
 
                 FdoStringP qname = fc->GetQualifiedName();
                 FdoStringP name = fc->GetName();
+                FdoBoolean isAbstract = fc->GetIsAbstract();
 
-                if (name != NULL && qname != NULL)
+                if (name != NULL && qname != NULL && !isAbstract)
                 {
                     Ptr<MgClassDefinition> classDefinition = MgServerFeatureUtil::GetMgClassDefinition(fc, serialize);
                     classCol->Add(classDefinition);
@@ -564,6 +565,9 @@
 
             }  // Repeat for all extensions
 
+            if (classCol->GetCount() == 0)
+                continue;
+
             // Add the schema to the MgFeatureSchemaCollection
             fsCollection->Add(schema);