From: Ian Beckwith <ianb@erislabs.net>
Date: Tue, 19 Oct 2010 21:16:15 +0000 (+0100)
Subject: join stack tweaking
X-Git-Tag: debian/1.0-1~14
X-Git-Url: http://erislabs.net/gitweb/?p=id3fs.git;a=commitdiff_plain;h=718b120fd81446b15dcf83bc16ab8af5cb642fb1

join stack tweaking
---

diff --git a/lib/ID3FS/Path/Node.pm b/lib/ID3FS/Path/Node.pm
index 720d12f..b71406d 100644
--- a/lib/ID3FS/Path/Node.pm
+++ b/lib/ID3FS/Path/Node.pm
@@ -98,29 +98,26 @@ sub to_sql
     my $op=$self->name();
     if(defined($op))
     {
-	my $left_is_not =($left  && $left->name()  && $left->name()  eq "NOT");
-	my $right_is_not=($right && $right->name() && $right->name() eq "NOT");
 	my $join=undef;
-	# 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")
+	# 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")
 	{
-	    # 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
-	    $join= "INNER" unless($right_is_not);
-	}
-	elsif($op eq "NOT")
-	{
-	    $not=1;
-	    # as above - 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
-	    $join = ($hasvals ? "INNER" : "LEFT") unless($right_is_not);
-	}
-	elsif($op eq "OR")
-	{
-	    # if left child is a NOT, we need an extra (inner) join
-	    # unless right child is also a NOT
-	    $join="INNER" if($left_is_not && ! $right_is_not)
+	    # if we are ANDing or ORing, add an inner join
+	    # also if we are NOTing, but we are looking for a tag *value*
+	    if($op eq "AND")
+	    {
+		$join= "INNER";
+	    }
+	    elsif($op eq "NOT")
+	    {
+		$not=1;
+		$join = ($hasvals ? "INNER" : "LEFT");
+	    }
+	    elsif($op eq "OR")
+	    {
+		$join="INNER" unless($left && $left->name() && $left->name() eq "NOT")
+	    }
 	}
 	if($join)
 	{