Changeset 1886

Timestamp:

04/14/08 09:36:18 (19 months ago)

Author:

fumiakiy

Message:

NOT and "+/-" query now works as it should. BugId:79274, BugId:79260

Files:

• branches/release-34/lib/MT/App/Search.pm (modified) (2 diffs)

branches/release-34/lib/MT/App/Search.pm

@@ -642 +642 @@
     my $rvalue = sub {
         my %rvalues = (
+            REQUIREDlike => { like => '%' . $_[1] . '%' },
+            REQUIRED1    => $_[1],
             NORMALlike => { like => '%' . $_[1] . '%' },
             NORMAL1    => $_[1],
@@ -688 +690 @@
                         $term->{term}
                     );
-                    push @tmp, { $cols[$i] => $test };
-                    unless ( $i == $number - 1 ) {
-                        push @tmp, '-or';
+                    if ( 'PROHIBITED' eq $term->{type} ) {
+                        my @this_term; 
+                        push @this_term, { $cols[$i] => $test };
+                        push @this_term, '-or';
+                        push @this_term, { $cols[$i] => \' IS NULL' };
+                        push @tmp, \@this_term;
+                        unless ( $i == $number - 1 ) {
+                            push @tmp, '-and';
+                        }
+                    }
+                    else {
+                        push @tmp, { $cols[$i] => $test };
+                        unless ( $i == $number - 1 ) {
+                            push @tmp, '-or';
+                        }
                     }
                 }