sql formatting tweaks

[id3fs.git] / lib / ID3FS / Path / Node.pm

diff --git a/lib/ID3FS/Path/Node.pm b/lib/ID3FS/Path/Node.pm
index eb703c2..6254600 100644 (file)
--- a/lib/ID3FS/Path/Node.pm
+++ b/lib/ID3FS/Path/Node.pm
@@ -71,20 +71,18 @@ sub to_sql
     my($self, $hasvals, $not, @joins)=@_;
     $not=0 unless(defined($not));
     my @outjoins=();
-    my $str='';
-    # init
     unless(@joins)
     {
        @outjoins = @joins = ("INNER");
     }
+    my $str='';
 
     if($self->type() != $TYPE_BOOL)
     {
-       my $cnt=scalar(@joins)+1;
        $str .= "t" . scalar(@joins) . ".id='" . $self->{id} . "'";
        if($not && !$hasvals)
        {
-           $str .= " AND fxt" . scalar(@joins) . ".files_id IS NULL";
+           $str = "(" . $str . " AND fxt" . scalar(@joins) . ".files_id IS NULL)";
        }
        return ($str, @outjoins);
     }
@@ -152,7 +150,7 @@ sub to_sql
     $str=$leftstr;
     $str .= " $op " if($op && !$not);
     $str .= $rightstr;
-    if($op || ($left && $right))
+    if($op && $left && $right)
     {
        $str="(" . $str . ")";
     }