@@ -696,32 +696,36 @@ private void loadSourceTerms() // Load the source terms list on the left side of
696
696
reader . Close ( ) ;
697
697
698
698
string textFilter = "" ;
699
+ string wordFilter = "" ;
700
+
699
701
if ( ! sourceFilter . Text . Equals ( "" ) )
700
702
{
701
703
string [ ] words = sourceFilter . Text . Split ( ' ' ) ;
702
704
for ( int a = 0 ; a < words . Length ; a ++ )
703
705
{
706
+ wordFilter = "" ;
704
707
String sWord = words [ a ] . ToUpper ( ) ;
705
708
if ( ! sWord . Contains ( "%" ) )
706
709
{
707
710
sWord = "%" + sWord + "%" ;
708
711
}
709
712
710
713
if ( searchSource . Checked )
711
- textFilter = textFilter + " upper(source_code) SIMILAR TO'" + sWord + "' " ;
714
+ wordFilter = wordFilter + " upper(source_code) " ;
715
+
716
+ if ( searchTarget . Checked )
717
+ wordFilter = wordFilter + " upper(target_code) " ;
712
718
713
719
if ( searchInfo . Checked )
714
- textFilter = textFilter + " upper(source_desc) SIMILAR TO '" + sWord + "' ";
720
+ wordFilter = wordFilter + " upper(source_desc) " ;
715
721
716
722
if ( searchDoku . Checked )
717
- textFilter = textFilter + " upper(documentation) SIMILAR TO '" + sWord + "' " ;
718
-
719
- if ( searchTarget . Checked )
720
- textFilter = textFilter + " upper(target_code) SIMILAR TO '" + sWord + "' " ;
721
-
722
- if ( ! textFilter . Equals ( "" ) )
723
- textFilter = "AND (" + textFilter . Trim ( ) . Replace ( " " , " OR " ) + ")" ;
723
+ wordFilter = wordFilter + " upper(documentation) " ;
724
724
725
+ if ( ! wordFilter . Equals ( "" ) )
726
+ wordFilter = "AND " + wordFilter . Trim ( ) . Replace ( " " , " || " ) + " SIMILAR TO '" + sWord + "' " ;
727
+
728
+ textFilter = textFilter + wordFilter ;
725
729
}
726
730
}
727
731
0 commit comments