Bug in FdoFilter::ToString - filter NOT(a AND b) returns L"NOT a AND b"

[ijarm]

An FdoFilter representing NOT(a AND b) returns L"NOT a AND b" when its ToString is called.

This code:

FdoFilter *NOTaANDb;//NOT(a AND b)
FdoFilter *newFlt = FdoFilter::Parse(NOTaANDb->ToString());

makes newFlt that is not equal to the original.

I tested this in FDO 3.4 but as far as I could see parsing code in FDO 3.5 hasn't changed at all.

The following is a sample code used to produce the error:

//a
  FdoPtr<FdoFilter> flt1 = FdoFilter::Parse(L"Geometry INTERSECTS GeomFromText('POLYGON ((461848 100030, 462399 100892, 463039 100544, 462697 99882, 462545 99926, 462652 100525, 462539 100612, 462075 99911, 461848 100030))')");

//b
  FdoPtr<FdoFilter> flt2 = FdoFilter::Parse(L"POVRSINA < 200");

//a AND b
  FdoPtr<FdoFilter> fltand = FdoFilter::Combine(flt1, FdoBinaryLogicalOperations_And, flt2);

//NOT(a AND b)
  FdoPtr<FdoFilter> fltnot = FdoUnaryLogicalOperator::Create(fltand, FdoUnaryLogicalOperations_Not);

//the same filter can be parsed directly from string
//  fltnot = FdoFilter::Parse(L"NOT(Geometry INTERSECTS GeomFromText('POLYGON ((461848 100030, 462399 100892, 463039 100544, 462697 99882, 462545 99926, 462652 100525, 462539 100612, 462075 99911, 461848 100030))') AND POVRSINA < 200)");

//WRONG: filterStr equals L"NOT Geometry INTERSECTS GeomFromText('POLYGON ((461848 100030, 462399 100892, 463039 100544, 462697 99882, 462545 99926, 462652 100525, 462539 100612, 462075 99911, 461848 100030))') AND POVRSINA < 200"
//SHOULD BE: L"NOT ( Geometry INTERSECTS GeomFromText('POLYGON ((461848 100030, 462399 100892, 463039 100544, 462697 99882, 462545 99926, 462652 100525, 462539 100612, 462075 99911, 461848 100030))') AND POVRSINA < 200 )"
  FdoString *filterStr = fltnot->ToString();

[gregboone]

Refer to -- Ticket #664: FdoUnaryLogicalOperator::ToString generates an invalid filter