SelectFeatures doesn't work if filter is secondary property

[christinebao]

Steps to reproduce:
(The following data names are for explanation and understanding. You can use any data as needed)
Open MapGuide Studio:

1. Connect to Primary.SDF, assuming it has properties: ID, Name.
   
2. Connect to Secondary.SDF, assuming it has properties: ID, Code.
   
3. Open Primary.FeatureSource, create a join with following conditions:
   

Extension name is: Join_Extension
Primary.ID = Secondary.ID
One-to-one

4. View the extension data in MapGuide FeatureSource editor, and there are properties: ID, Name, SecondaryID, SecondaryCode. Please note the last two, they are from secondary table, and the property name is formatted by "Secondary table name" + "Property name".
   
5. Use MapGuide agent to test FeatureService -> SelectFeatures:
   
   1. If use property from primary table as filter, for example "ID=1", the result is right.
      
   2. If use property from secondary table as filter, for example "SecondaryID=1", there is an exception: FDO can't execute query.

[christinebao]

Tech diagnosis:

In r3524 Bruce submitted a patch about "Selection against a joined feature source returns an extra feature", which is to fix ticket ​http://trac.osgeo.org/mapguide/ticket/614.

In this submission, there is a snippet of code added into ServerSelectFeatures.cpp:

            // Search the filter to see if it contains the extension name
            // If the extension name is not found it means that the filter involves attribute(s) only from the primary
            if(NULL != filter)
            {
                FdoString* filterText = filter->ToString();
                if(NULL != filterText)
                {
                    if(NULL == wcsstr(filterText, name.c_str()))
                    {
                        // Add the filter to the query because it only applies to the primary
                        query->SetFilter(filter);
                    }
                }
            }

And name is extension name, which is "Join_Extension" in this case.

The problem is: when property from secondary feature source(such as "SecondaryID") comes here, it doesn't contain extension name, so it's treated as from primary feature source, thus cause an exception.

[christinebao]

How to fix:

The purpose of the above comparison

if(NULL == wcsstr(filterText, name.c_str()))

should be whether the filter contains secondary name ("Secondary" in this case), not extension name ("Join_Extension" in this case).

Take "SecondaryID=1" for example, if it contains secondary feature source name, it shouldn't be treated from primary.

[christinebao]

Attach patch ​http://trac.osgeo.org/mapguide/attachment/ticket/1208/JoinSelect.patch for fixing this. Please review.

Use MapGuide agent test, and it works.

[chrisclaydon]

The patch looks good Christine. Please verify that the code still works for the case that Bruce's submission originally addressed before you check it in.

[christinebao]

Thanks Chris for reviewing :)

This submission won't break Bruce's fixing. It's submitted.

[brucedechant]

Submitted to trunk - r4446