diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-10-29 17:09:04 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-10-29 17:09:04 +0000 |
| commit | 48d3c5efda426e8d5e158733a5f7c6ccad06a7cc (patch) | |
| tree | d7eb28b88c1ef2da0c8f8be82e6be262e042dee2 | |
| parent | d8566f33ad60f020de294ac60400b14dbe359391 (diff) | |
| download | ATCD-48d3c5efda426e8d5e158733a5f7c6ccad06a7cc.tar.gz | |
ChangeLogTag:Fri Oct 29 17:03:46 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 18 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/TT_Info.cpp | 6 |
3 files changed, 24 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c4773c12269..f163632dc97 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,21 @@ +Fri Oct 29 17:03:46 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp: + + Applied a patch from Bill Somerville <bill@classdesign.com> + which fixes an incorrect implementation of ~ (twiddle) option. + + a ~ b + + should be true if a is a substring of b, it is implemented as + true if b is a substring of a. The OMG spec is no help, but the + TAO TradingService docs, code comments, and other sources all + seem to agree with this interpretation. + + * orbsvcs/tests/Trading/TT_Info.cpp: + + Enhanced the test for the above. + Fri Oct 29 10:09:56 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/ast/ast_union.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index bc01e59425f..26f50946f68 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -357,7 +357,7 @@ visit_twiddle (TAO_Binary_Constraint* binary_twiddle) TAO_Constraint* left = binary_twiddle->left_operand (), *right = binary_twiddle->right_operand (); - // Determine if the left operand is a subTAO_String_Hash_Key of the right. + // Determine if the left operand is a substring of the right. if (left->accept (this) == 0) { @@ -367,8 +367,8 @@ visit_twiddle (TAO_Binary_Constraint* binary_twiddle) TAO_Literal_Constraint& right_operand = this->queue_.get_right_operand (); CORBA::Boolean result = (CORBA::Boolean) - (ACE_OS::strstr ((const char*)left_operand, - (const char*)right_operand) != 0); + (ACE_OS::strstr ((const char*)right_operand, + (const char*)left_operand) != 0); this->queue_.dequeue_operand (); this->queue_.dequeue_operand (); diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp index acf42e8b9bc..7412d010a25 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp +++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp @@ -131,12 +131,12 @@ const int TT_Info::NUM_QUERIES = 7; const char* TT_Info::QUERIES[][3] = { {INTERFACE_NAMES[REMOTE_IO], "", ""}, - {INTERFACE_NAMES[REMOTE_IO], "Location ~ 'Cupples'", ""}, + {INTERFACE_NAMES[REMOTE_IO], "'Cupples' ~ 'Location'", ""}, {INTERFACE_NAMES[PLOTTER], "'sbw1' in User_Queue", "min Cost_Per_Page"}, - {INTERFACE_NAMES[PLOTTER], "Num_Colors > 1 and Location ~ 'Cupples'", "min Cost_Per_Page"}, + {INTERFACE_NAMES[PLOTTER], "Num_Colors > 1 and 'Cupples' ~ 'Location'", "min Cost_Per_Page"}, {INTERFACE_NAMES[PRINTER], "Pages_Per_Sec > 3 and Color == TRUE", "with 'sbw1' in User_Queue"}, {INTERFACE_NAMES[PRINTER], "Color == TRUE or Double_Sided == TRUE", "random"}, - {INTERFACE_NAMES[PRINTER], "(Color or Double_Sided) and 'sbw1' in User_Queue", "with Location ~ 'Cupples'"} + {INTERFACE_NAMES[PRINTER], "(Color or Double_Sided) and 'sbw1' in User_Queue", "with 'Cupples' ~ 'Location'"} }; void |