my($self, $hasvals, $not, @joins)=@_;
$not=0 unless(defined($not));
my @outjoins=();
+ my $str='';
# init
unless(@joins)
{
@outjoins = @joins = ("INNER");
}
- my $left=$self->left();
- my $right=$self->right();
- return ("", @outjoins) unless($left || $right);
- my ($leftstr, @leftjoins) = $self->node_to_sql($left, $hasvals, $not, @joins);
- push(@joins, @leftjoins);
- push(@outjoins, @leftjoins);
- my $op=$self->name();
- if(defined($op) && $self->type() eq "boolean")
+ if($self->type() ne "boolean")
{
- # if we are ANDing, add an inner join
- # also if we are NOTing, but we are looking for a tag *value*
- if( ($op eq "AND") || ($hasvals && ($op eq "NOT")))
+ my $cnt=scalar(@joins)+1;
+ $str .= "t" . scalar(@joins) . ".id='" . $self->{id} . "'";
+ if($not && !$hasvals)
{
- # hack - if right child is a NOT, we don't need extra join/brackets
- # NOT will do the same and we will end up with an extra one
- unless($right && $right->name() && $right->name() eq "NOT")
+ $str .= " AND fxt" . scalar(@joins) . ".files_id IS NULL";
+ }
+ return ($str, @outjoins);
+ }
+ else
+ {
+ my $left=$self->left();
+ my $right=$self->right();
+ return ("", @outjoins) unless($left || $right);
+ my ($leftstr, @leftjoins) = $left->to_sql($hasvals, $not, @joins) if($left);
+ push(@joins, @leftjoins);
+ push(@outjoins, @leftjoins);
+ my $op=$self->name();
+ if(defined($op) && $self->type() eq "boolean")
+ {
+ # if we are ANDing, add an inner join
+ # also if we are NOTing, but we are looking for a tag *value*
+ if( ($op eq "AND") || ($hasvals && ($op eq "NOT")))
+ {
+ # hack - if right child is a NOT, we don't need extra join/brackets
+ # NOT will do the same and we will end up with an extra one
+ unless($right && $right->name() && $right->name() eq "NOT")
+ {
+ push(@joins, "INNER");
+ push(@outjoins, "INNER");
+ }
+ }
+ elsif($op eq "NOT")
{
- push(@joins, "INNER");
- push(@outjoins, "INNER");
+ $not=1;
+ push(@joins, "LEFT");
+ push(@outjoins, "LEFT");
+# print("LEFT: ", $left->print(), "\n") if ($left);
+# print("RIGHT: ", $right->print(), "\n") if($right);
}
}
- elsif($op eq "NOT")
+ my ($rightstr, @rightjoins) = $right->to_sql($hasvals, $not, @joins) if($right);
+ push(@outjoins, @rightjoins);
+# print "LEFT (", scalar(@leftjoins), "): $leftstr\n";
+# print "RIGHT (", scalar(@rightjoins), "): $rightstr\n";
+ my $str=$leftstr;
+ $str .= " $op " if($op && !$not);
+ $str .= $rightstr;
+ if($op || ($left && $right))
{
- $not=1;
- push(@joins, "LEFT");
- push(@outjoins, "LEFT");
-# print("LEFT: ", $left->print(), "\n") if ($left);
-# print("RIGHT: ", $right->print(), "\n") if($right);
+ $str="(" . $str . ")";
}
+# print "STR: $str\n";
+ return($str, @outjoins);
}
- my ($rightstr, @rightjoins) = $self->node_to_sql($right, $hasvals, $not, @joins);
- push(@outjoins, @rightjoins);
-# print "LEFT (", scalar(@leftjoins), "): $leftstr\n";
-# print "RIGHT (", scalar(@rightjoins), "): $rightstr\n";
- my $str=$leftstr;
- $str .= " $op " if($op && !$not);
- $str .= $rightstr;
- if($op || ($left && $right))
- {
- $str="(" . $str . ")";
- }
-# print "STR: $str\n";
- return($str, @outjoins);
-}
-
-sub node_to_sql
-{
- my($self, $node, $hasvals, $not, @joins)=@_;
- return ("", ()) unless(defined($node));
- return $node->to_sql($hasvals, $not, @joins) if($node->type() eq "boolean");
- my $sql;
- my $cnt=scalar(@joins)+1;
- $sql .= "t" . scalar(@joins) . ".id='" . $node->{id} . "'";
- if($not && !$hasvals)
- {
- $sql .= " AND fxt" . scalar(@joins) . ".files_id IS NULL";
- }
- return ($sql, ());
}
sub used_tags