[Rt-commit] [svn] r1279 - rt/branches/3.2-RELEASE/html/Search

[leira at pallas.eruditorum.org]

Author: leira
Date: Thu Jul 22 23:02:15 2004
New Revision: 1279

Modified:
   rt/branches/3.2-RELEASE/html/Search/Build.html
Log:
RT-Ticket: 5880
RT-Status: resolved
RT-Action: correspond
NULL values can now be chosen, and the TicketSQL query is constructed properly.


Modified: rt/branches/3.2-RELEASE/html/Search/Build.html
==============================================================================
--- rt/branches/3.2-RELEASE/html/Search/Build.html	(original)
+++ rt/branches/3.2-RELEASE/html/Search/Build.html	Thu Jul 22 23:02:15 2004
@@ -248,7 +248,7 @@
     if ( $arg =~ m/ValueOf(.+)/ && $ARGS{$arg} ) {
 	# We're adding a $1 clause
 	my $field = $1;
-	my $keyword;
+	my ($keyword, $op, $value);
 
 	#figure out if it's a grouping
 	if ( $ARGS{ $field . "Field" } ) {
@@ -257,10 +257,27 @@
 	else {
 	    $keyword = $field;
 	}
+
+        $value = $ARGS{'ValueOf' . $field};
+        $op = $ARGS{ $field . 'Op' };
+	if ( $value eq 'NULL' && $op =~ /=/) {
+            if ($op eq '=') {
+                $op = "IS";
+            } elsif ($op eq '!=') {
+                $op = "IS NOT";
+            }
+
+            # This isn't "right", but...
+            # It has to be this way until #5182 is fixed
+            $value = "'NULL'";
+	} else {
+            $value = "'NULL'";
+        }
+
 	my $clause = {
             Key   => $keyword,
-            Op    => $ARGS{ $field . 'Op' },
-            Value => "'$ARGS{'ValueOf' . $field}'"
+            Op    => $op,
+            Value => $value
         };
 	    
 	my $newnode = Tree::Simple->new($clause);