[mapguide-commits] r5360 - trunk/MgDev/Server/src/Services/Feature

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2010-10-28 20:11:03 -0700 (Thu, 28 Oct 2010)
New Revision: 5360

Modified:
   trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp
Log:
Fix ticket #1511
https://trac.osgeo.org/mapguide/ticket/1511

Modified: trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp	2010-10-28 16:09:48 UTC (rev 5359)
+++ trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.cpp	2010-10-29 03:11:03 UTC (rev 5360)
@@ -60,7 +60,7 @@
 
         classNameHintUsed = IsClassNameHintUsed(fdoCommand);
 
-        if (!schemaName.empty())
+ /*       if (!schemaName.empty())
         {
             fdoCommand->SetSchemaName(schemaName.c_str());
         }
@@ -70,7 +70,7 @@
         if (NULL != fdoClassNames.p && fdoClassNames->GetCount() > 0)
         {
             fdoCommand->SetClassNames(fdoClassNames.p);
-        }
+        }*/
 
         // Execute the command
         ffsc = fdoCommand->Execute();
@@ -136,23 +136,36 @@
                         FdoPtr<FdoIDescribeSchema> fdoCommand2 = (FdoIDescribeSchema*)fdoConn2->CreateCommand(FdoCommandType_DescribeSchema);
                         CHECKNULL((FdoIDescribeSchema*)fdoCommand2, L"MgDescribeSchema.DescribeFdoSchema");
 
-                        if (!secSchemaName.empty())
-                        {
-                            fdoCommand2->SetSchemaName(secSchemaName.c_str());
-                        }
+                        //if (!secSchemaName.empty())
+                        //{
+                        //    fdoCommand2->SetSchemaName(secSchemaName.c_str());
+                        //}
 
-                        if (!secClassName.empty())
-                        {
-                            FdoPtr<FdoStringCollection> fdoClassNames2 = FdoStringCollection::Create();
+                        //if (!secClassName.empty())
+                        //{
+                        //    FdoPtr<FdoStringCollection> fdoClassNames2 = FdoStringCollection::Create();
 
-                            fdoClassNames2->Add(secClassName.c_str());
-                            fdoCommand2->SetClassNames(fdoClassNames2.p);
-                        }
+                        //    fdoClassNames2->Add(secClassName.c_str());
+                        //    fdoCommand2->SetClassNames(fdoClassNames2.p);
+                        //}
 
                         // Execute the command
                         ffsc2 = fdoCommand2->Execute();
                         CHECKNULL((FdoFeatureSchemaCollection*)ffsc2, L"MgServerDescribeSchema.DescribeFdoSchema");
 
+                        //if (!secSchemaName.empty())
+                        //{
+                        //    fdoCommand2->SetSchemaName(secSchemaName.c_str());
+                        //}
+
+                        //if (!secClassName.empty())
+                        //{
+                        //    FdoPtr<FdoStringCollection> fdoClassNames2 = FdoStringCollection::Create();
+
+                        //    fdoClassNames2->Add(secClassName.c_str());
+                        //    fdoCommand2->SetClassNames(fdoClassNames2.p);
+                        //}
+
                         // Extract the schemas from the secondary collection and add them to the main collection
                         // Get schema count
                         FdoInt32 cnt = ffsc2->GetCount();
@@ -438,18 +451,18 @@
                             FdoPtr<FdoIDescribeSchema> fdoCommand2  = (FdoIDescribeSchema*)fdoConn2->CreateCommand(FdoCommandType_DescribeSchema);
                             CHECKNULL((FdoIDescribeSchema*)fdoCommand2, L"MgDescribeSchema.DescribeSchema");
 
-                            if (!secSchemaName.empty())
-                            {
-                                fdoCommand2->SetSchemaName(secSchemaName.c_str());
-                            }
+                            //if (!secSchemaName.empty())
+                            //{
+                            //    fdoCommand2->SetSchemaName(secSchemaName.c_str());
+                            //}
 
-                            if (!secClassName.empty())
-                            {
-                                FdoPtr<FdoStringCollection> fdoClassNames2 = FdoStringCollection::Create();
+                            //if (!secClassName.empty())
+                            //{
+                            //    FdoPtr<FdoStringCollection> fdoClassNames2 = FdoStringCollection::Create();
 
-                                fdoClassNames2->Add(secClassName.c_str());
-                                fdoCommand2->SetClassNames(fdoClassNames2.p);
-                            }
+                            //    fdoClassNames2->Add(secClassName.c_str());
+                            //    fdoCommand2->SetClassNames(fdoClassNames2.p);
+                            //}
 
                             // Execute the command
                             ffsc2 = fdoCommand2->Execute();